From 61d5624c2d4c64e34184dc2ade69a8bdeae711c7 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Tue, 11 Oct 2011 23:25:14 -0500 Subject: [PATCH 01/14] Update translation files for recent changes in the code. --- Languages/po/ar.po | 295 +++++++++++++++++++++++++++++ Languages/po/ca.po | 248 ++++++++++++++++++++++++ Languages/po/cs.po | 263 ++++++++++++++++++++++++++ Languages/po/de.po | 245 ++++++++++++++++++++++++ Languages/po/dolphin-emu.pot | 243 ++++++++++++++++++++++++ Languages/po/el.po | 353 +++++++++++++++++++++++++++++++++++ Languages/po/en.po | 243 ++++++++++++++++++++++++ Languages/po/es.po | 319 +++++++++++++++++++++++++++++++ Languages/po/fr.po | 312 +++++++++++++++++++++++++++++++ Languages/po/he.po | 243 ++++++++++++++++++++++++ Languages/po/hu.po | 272 +++++++++++++++++++++++++++ Languages/po/it.po | 245 ++++++++++++++++++++++++ Languages/po/ja.po | 263 ++++++++++++++++++++++++++ Languages/po/ko.po | 245 ++++++++++++++++++++++++ Languages/po/nb.po | 245 ++++++++++++++++++++++++ Languages/po/nl.po | 245 ++++++++++++++++++++++++ Languages/po/pl.po | 276 +++++++++++++++++++++++++++ Languages/po/pt.po | 248 ++++++++++++++++++++++++ Languages/po/pt_BR.po | 276 +++++++++++++++++++++++++++ Languages/po/ru.po | 245 ++++++++++++++++++++++++ Languages/po/sr.po | 243 ++++++++++++++++++++++++ Languages/po/tr.po | 245 ++++++++++++++++++++++++ Languages/po/zh_CN.po | 245 ++++++++++++++++++++++++ Languages/po/zh_TW.po | 245 ++++++++++++++++++++++++ 24 files changed, 6302 insertions(+) diff --git a/Languages/po/ar.po b/Languages/po/ar.po index 845b571a9a..322a2c504f 100644 --- a/Languages/po/ar.po +++ b/Languages/po/ar.po @@ -7,9 +7,15 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< 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" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +"PO-Revision-Date: 2011-07-20 13:33+0300\n" +"Last-Translator: \n" +>>>>>>> Update translation files for recent changes in the code. "Language-Team: \n" "Language: \n" "MIME-Version: 1.0\n" @@ -418,6 +424,10 @@ msgid "Accurate VBeam emulation" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +<<<<<<< HEAD +======= +#, fuzzy +>>>>>>> Update translation files for recent changes in the code. msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -529,9 +539,15 @@ msgstr "أضف باتش" msgid "Add new pane" msgstr "إضافة جزء جديد" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "أضف" @@ -585,8 +601,13 @@ msgstr "" msgid "All Gamecube GCM files (gcm)" msgstr "جميع ملفات الجيم كيوب (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "حفظ جميع الحالات (sav, s##)" @@ -615,8 +636,14 @@ msgstr "" "إذا لم تكن متأكدا اترك هذا غير محددة." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +<<<<<<< HEAD msgid "Alternate Wiimote Timing" msgstr "بديل ويموت" +======= +#, fuzzy +msgid "Alternate Wiimote Timing" +msgstr "محاكاة ويموت" +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -671,7 +698,11 @@ msgstr "هل أنت متأكد أنك تريد حذف هذه الملف؟ " msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "هل أنت متأكد أنك تريد حذف هذه الملفات؟" +<<<<<<< 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/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "نسبة العرض :" @@ -692,7 +723,11 @@ msgstr "صوت الخلفية :" msgid "AudioCommon: Error opening AO device.\n" msgstr "" +<<<<<<< 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/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "تلقائي" @@ -807,7 +842,11 @@ msgid "Blue Right" msgstr "اليمين أزرق" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "أسفل" @@ -840,7 +879,11 @@ msgstr "لاستعراض الدليل الإخراج" msgid "Buffer:" msgstr "العازلة :" +<<<<<<< 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/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1082,7 +1125,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< 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/VideoConfigDiag.cpp:592 msgid "Close" msgstr "إغلاق" @@ -1191,7 +1238,11 @@ msgstr "توصيل ويموت 3" msgid "Connect Wiimote 4" msgstr "توصيل ويموت 4" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "توصيل" @@ -1384,7 +1435,11 @@ msgid "DSP Emulator Engine" msgstr "محرك محاكي الصوت" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulation (سريع)" @@ -1613,7 +1668,11 @@ msgstr "" msgid "Divide" msgstr "انقسام" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "هل تريد اغلق اللعبة الحالية؟" @@ -1642,12 +1701,21 @@ msgstr "إعدادات تحكم الوي" msgid "Dolphin FIFO" msgstr "دولفين" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "إعدادات تحكم الجيم كيوب" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1741,9 +1809,15 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "Dutch" @@ -1879,15 +1953,22 @@ msgstr "BAT تمكين" msgid "Enable Block Merging" msgstr "تمكين منع الدمج" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "تمكين التخزين المؤقت" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "تمكين الاسرار " @@ -2035,9 +2116,15 @@ msgstr "" msgid "End" msgstr "نهاية" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "English" @@ -2066,6 +2153,7 @@ msgstr "المساواة" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "خطأ" @@ -2077,6 +2165,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "خطأ" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "خطأ في تحميل اللغة المختارة. يتراجع إلى النظام الافتراضية." @@ -2511,9 +2605,15 @@ msgstr "إطارات لتسجيل" msgid "Free Look" msgstr "تحكم بكاميرا اللعبة" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "French" @@ -2580,7 +2680,11 @@ msgid "Gamecube &Pad Settings" msgstr "إعدادات تحكم جيم كيوب" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "بطاقه ذاكره الجيم كيوب (*.raw,*.gcp) " @@ -2603,8 +2707,12 @@ msgstr "" "(إما غير رمز سيئة أو نوع رمز غير مدعومة حتى الآن.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< 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/VideoConfigDiag.cpp:204 msgid "General" msgstr "عام" @@ -2613,9 +2721,15 @@ msgstr "عام" msgid "General Settings" msgstr "الإعدادات العامة" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "German" @@ -2637,6 +2751,10 @@ msgid "Greater Than" msgstr "أكبر من" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +<<<<<<< HEAD +======= +#, fuzzy +>>>>>>> Update translation files for recent changes in the code. msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2745,8 +2863,12 @@ msgid "Hotkey Configuration" msgstr "إعدادات الاختصارات" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< 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. msgid "Hotkeys" msgstr "الاختصارات" @@ -2955,7 +3077,11 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "wad تثبيت" @@ -3034,9 +3160,15 @@ msgstr "تسجيل الملف غير صالح" msgid "Invalid state" msgstr "غير صالح حالة" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "Italian" @@ -3189,11 +3321,19 @@ msgstr "8 تحميل حالة" msgid "Load State..." msgstr "تحميل حالة" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "تحميل قائمة نظام الوي" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "تحميل قائمة نظام الوي" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "تحميل قائمة نظام الوي %d%c" @@ -3273,7 +3413,11 @@ msgstr "MMU سرعة هاك" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" +<<<<<<< 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/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "العصا الأيسر" @@ -3304,7 +3448,11 @@ msgid "Memory Byte" msgstr "ذاكرة بايت" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "بطاقة الذاكرة" @@ -3500,7 +3648,11 @@ msgstr "التبويب" msgid "NP Up" msgstr "فوق" +<<<<<<< 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/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3587,7 +3739,11 @@ msgstr "لا يساوي" msgid "Not Set" msgstr "غير مجموعة" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "غير متصل" @@ -3648,7 +3804,10 @@ msgstr "فقط %d كتل متاحة" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "فتح" @@ -3779,8 +3938,13 @@ msgstr "باتش" msgid "Paths" msgstr "مسارات" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: 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/WXInputBase.cpp:48 msgid "Pause" msgstr "وقفة" @@ -3800,8 +3964,13 @@ msgstr "مشهد %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< 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. msgid "Play" msgstr "بدأ اللعبه" @@ -3827,7 +3996,11 @@ msgstr "خيارات التشغيل" msgid "Players" msgstr "لاعبين" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "يرجى تأكيد" @@ -4038,10 +4211,17 @@ msgstr "تحديث قائمة" msgid "Refresh game list" msgstr "تحديث القائمة" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "إزالة" @@ -4060,7 +4240,10 @@ msgid "Render to Main Window" msgstr "تقدم إلى الشاشة الرئيسية" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "إعادة ضبط" @@ -4103,7 +4286,11 @@ msgstr "حفظ الحالة" msgid "Safe" msgstr "آمنة" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "معدل العينة :" @@ -4185,9 +4372,15 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Scaled EFB Copy" +<<<<<<< HEAD msgstr "EFB Copia a escala" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +msgstr "" + +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Scanning %s" msgstr "فحص %s" @@ -4227,12 +4420,21 @@ msgstr "" msgid "Select" msgstr "حدد" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "اختر ملف تسجيل" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "لتثبيت wad حدد ملف" @@ -4258,6 +4460,7 @@ msgstr "اختر النوافذ العائمة" msgid "Select the file to load" msgstr "حدد الملف لتحميل" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "حدد حفظ الملف" @@ -4267,6 +4470,17 @@ msgid "Select the state to load" msgstr "حدد حالة التحميل" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "حدد حفظ الملف" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "حدد حالة التحميل" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "حدد حالة الحفظ" @@ -4640,9 +4854,15 @@ msgstr "فشل إنشاء المخزن المؤقت الصوت : %s" msgid "Space" msgstr "مجال" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "Spanish" @@ -4686,7 +4906,11 @@ msgstr "" msgid "Standard Controller" msgstr "وحدة تحكم القياسية" +<<<<<<< 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/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4721,7 +4945,10 @@ msgstr "عصا" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "اغلق اللعبه" @@ -4798,7 +5025,10 @@ msgstr "الجدول الأيمن" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "اخذ لقطه من الشاشه" @@ -4811,12 +5041,23 @@ msgid "Test" msgstr "اختبار" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +<<<<<<< HEAD msgid "Texture" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 msgid "Texture Cache" msgstr "" +======= +#, fuzzy +msgid "Texture" +msgstr "Texturesتعطيل " + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 +#, fuzzy +msgid "Texture Cache" +msgstr "إزالة التخزين المؤقت" +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Texture Format Overlay" @@ -5031,12 +5272,19 @@ msgstr "تبديل جميع أنواع السجل" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "اللعب بالشاشة كاملة" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "أعلى" @@ -5143,6 +5391,18 @@ msgstr "تلقى رسالة مجهولة مع معرف : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"مؤشر غير معروف %#08x\n" +"مواصلة?" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5365,7 +5625,11 @@ msgstr "" msgid "Wii Save Import" msgstr "استيراد حفظ الوي" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "ملفات حفظ الوي (*.bin)|*.bin" @@ -5396,7 +5660,11 @@ msgstr "" "أو ربما هو بسبب الخمول وقت مستقطع أو لسبب آخر.\n" "هل تريد إعادة الاتصال على الفور?" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "ويموت متصل" @@ -5428,9 +5696,15 @@ msgstr "نوافذ اليمين" msgid "Word Wrap" msgstr "كلمة ختامية" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "العمل" @@ -5661,10 +5935,13 @@ msgstr "أو" #~ msgid "< as Default Profile >" #~ msgstr "< الوضع الافتراضي >" +<<<<<<< HEAD #, fuzzy #~ msgid "AOSound" #~ msgstr "&الصوت" +======= +>>>>>>> Update translation files for recent changes in the code. #~ msgid "Accurate Texture Cache" #~ msgstr "دقة المظهر السطحي المؤقت" @@ -5702,6 +5979,7 @@ msgstr "أو" #~ "the EFB scale.\n" #~ "ومن الأفضل ل تعيين نسبة العرض إلى الارتفاع لتمتد عند استخدامه." +<<<<<<< HEAD #~ msgid "Bad gameini filename" #~ msgstr "Nombre de archivo gameini incorrecto" @@ -5736,6 +6014,8 @@ msgstr "أو" #~ msgid "Config..." #~ msgstr "إعدادات" +======= +>>>>>>> Update translation files for recent changes in the code. #~ msgid "Configuration profile" #~ msgstr "التكوين الشخصي" @@ -5836,6 +6116,7 @@ msgstr "أو" #~ msgid "Enable CPU Access" #~ msgstr "CPU Access تمكين" +<<<<<<< HEAD #~ msgid "Enable Copy to EFB" #~ msgstr "Habilitar Copiado al EFB" @@ -5851,12 +6132,15 @@ msgstr "أو" #~ msgid "Enable JIT Dynarec" #~ msgstr "تمكين صفحات" +======= +>>>>>>> Update translation files for recent changes in the code. #~ msgid "Enable OpenCL" #~ msgstr "OpenCL تمكين " #~ msgid "Enable Screen Saver (burn-in reduction)" #~ msgstr "تمكين شاشة التوقف" +<<<<<<< HEAD #, fuzzy #~ msgid "" #~ "Enables dynamic recompilation of DSP code.\n" @@ -5930,6 +6214,8 @@ msgstr "أو" #~ msgid "Force Bi/Trilinear Filtering" #~ msgstr "Forzar Filtro Bi/Tri-linear" +======= +>>>>>>> Update translation files for recent changes in the code. #~ msgid "Fractional" #~ msgstr "جزئي" @@ -6072,6 +6358,7 @@ msgstr "أو" #~ msgid "Required for using the Japanese ROM font." #~ msgstr "اللازمة لاستعمال الخط القرص اليابانية." +<<<<<<< HEAD #, fuzzy #~ msgid "Run" #~ msgstr "Enter" @@ -6079,6 +6366,8 @@ msgstr "أو" #~ msgid "Running script...\n" #~ msgstr "Ejecutando script...\n" +======= +>>>>>>> Update translation files for recent changes in the code. #~ msgid "Scale:" #~ msgstr "النطاق :" @@ -6136,6 +6425,7 @@ msgstr "أو" #~ "عرض إحصاءات مختلفة.\n" #~ "وهذا مفيد فقط لأغراض التصحيح." +<<<<<<< HEAD #~ msgid "Skies of Arcadia" #~ msgstr "Skies of Arcadia" @@ -6175,12 +6465,15 @@ msgstr "أو" #~ msgid "Specify an audio plugin" #~ msgstr "حدد الخلفية ملف فيديو" +======= +>>>>>>> Update translation files for recent changes in the code. #~ msgid "Start Renderer in Fullscreen" #~ msgstr "بدء في كمال ملء الشاشة" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "بدء التقديم في إطار وضع ملء الشاشة." +<<<<<<< HEAD #~ msgid "The file " #~ msgstr "El archivo " @@ -6201,6 +6494,8 @@ msgstr "أو" #~ "مؤشر غير معروف %#08x\n" #~ "مواصلة?" +======= +>>>>>>> Update translation files for recent changes in the code. #~ msgid "Use FPS For Limiting" #~ msgstr "لحد عدد الاطارات" diff --git a/Languages/po/ca.po b/Languages/po/ca.po index f78b52303b..bb6dd4f690 100644 --- a/Languages/po/ca.po +++ b/Languages/po/ca.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< 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. "PO-Revision-Date: 2011-08-19 08:36-0500\n" "Last-Translator: Jordi Coma \n" "Language-Team: Catalan \n" @@ -564,9 +568,15 @@ msgstr "Afegeix Pegat" msgid "Add new pane" msgstr "Afegeix un nou panell" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "Afegir ..." @@ -634,8 +644,13 @@ msgstr "Totes les imatges GC / Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Tots els fitxers GameCube GCM (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Tots els Estats (savi, s##\")" @@ -724,7 +739,11 @@ 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 #: 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/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Relació d'aspecte:" @@ -745,7 +764,11 @@ msgstr "Suport d'àudio:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error en obrir el dispositiu AO \n" +<<<<<<< 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/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -861,7 +884,11 @@ msgid "Blue Right" msgstr "Blau dret" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "Abaix" @@ -894,7 +921,11 @@ msgstr "Examineu el directori de sortida" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< 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/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1151,7 +1182,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< 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/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Tancar" @@ -1260,7 +1295,11 @@ msgstr "Connectar Wiimote 3" msgid "Connect Wiimote 4" msgstr "Connectar Wiimote 4" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "Connectant ..." @@ -1451,7 +1490,11 @@ msgid "DSP Emulator Engine" msgstr "Motor d'emulació DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulació DSP HLE (ràpid)" @@ -1682,7 +1725,11 @@ msgstr "" msgid "Divide" msgstr "Divideix" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Voleu aturar l'emulació actual?" @@ -1711,12 +1758,21 @@ msgstr "Configuració de Wiimote emulat" msgid "Dolphin FIFO" msgstr "FIFO Dolphin" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +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. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin Pel·lícules TAS (*.dtm)" @@ -1813,9 +1869,15 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "Holandès" @@ -1960,15 +2022,22 @@ msgstr "Habilitar les millors tècniques disponibles" msgid "Enable Block Merging" msgstr "Habilitar fusió de Bloc" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Habilitar memòria cau" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "Activar Trucs" @@ -2121,9 +2190,15 @@ msgstr "" msgid "End" msgstr "Fi" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "Anglès" @@ -2152,6 +2227,7 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Error" @@ -2163,6 +2239,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Error" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2621,9 +2703,15 @@ msgstr "Imatges a Enregistrar" msgid "Free Look" msgstr "Visió lliure" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "Francès" @@ -2690,7 +2778,11 @@ msgid "Gamecube &Pad Settings" msgstr "Configuració control «&Gamecube»" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Targetes de memòria per GameCube (*.raw, *.gcp)" @@ -2713,8 +2805,12 @@ msgstr "" "(Pot ser un codi incorrecte o el tipus de codi encara no està suportat.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< 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/VideoConfigDiag.cpp:204 msgid "General" msgstr "General" @@ -2723,9 +2819,15 @@ msgstr "General" msgid "General Settings" msgstr "Configuració General" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "Alemany" @@ -2859,8 +2961,12 @@ msgid "Hotkey Configuration" msgstr "Tecla d'accés de configuració" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< 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. msgid "Hotkeys" msgstr "Tecles d'accés" @@ -3085,7 +3191,11 @@ msgstr "" "InstallExceptionHandler cridat, però aquesta plataforma no està suportada " "encara." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "Instal·lant WAD ..." @@ -3167,9 +3277,15 @@ msgstr "Enregistrament de fitxer invàlid" msgid "Invalid state" msgstr "Estat invàlid" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "Italià" @@ -3327,11 +3443,19 @@ msgstr "Carregar ranura d'estat 8" msgid "Load State..." msgstr "Carregar Estat..." +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "Carregar el menú del sistema Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar menú del sistema Wii %d%c" @@ -3413,7 +3537,11 @@ msgstr "Modificació de velocitat MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Arxius MadCatz Gameshark (*.gcs)" +<<<<<<< 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/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Palanca principal" @@ -3444,7 +3572,11 @@ msgid "Memory Byte" msgstr "Byte de memòria" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "Targeta de memòria" @@ -3644,7 +3776,11 @@ msgstr "NP Tabulador" msgid "NP Up" msgstr "NP Amunt" +<<<<<<< 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/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3731,7 +3867,11 @@ msgstr "No igual" msgid "Not Set" msgstr "Sense establir" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "No està connectat" @@ -3792,7 +3932,10 @@ msgstr "Només queden %d blocs disponibles" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Obrir" @@ -3923,8 +4066,13 @@ msgstr "Pegats" msgid "Paths" msgstr "Camins" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: 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/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -3944,8 +4092,13 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< 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. msgid "Play" msgstr "Executar" @@ -3971,7 +4124,11 @@ msgstr "Opcions de reproducció" msgid "Players" msgstr "Jugadors" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "Confirmeu ..." @@ -4183,10 +4340,17 @@ msgstr "Actualitzar llista" msgid "Refresh game list" msgstr "Actualitza la llista de jocs" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "Treure" @@ -4205,7 +4369,10 @@ msgid "Render to Main Window" msgstr "Renderitzar a la finestra principal" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reiniciar" @@ -4248,7 +4415,11 @@ msgstr "&Desa l'estat" msgid "Safe" msgstr "Segur" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Freqüència de mostreig:" @@ -4332,7 +4503,11 @@ msgstr "La pal·lícula guardada %s és corrupta, s'atura la gravació..." msgid "Scaled EFB Copy" msgstr "Copia EFB escalada" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Escanejant %s" @@ -4372,12 +4547,21 @@ msgstr "La secció %s no trobada a SYSCONF" msgid "Select" msgstr "Seleccionar" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Seleccionar el fitxer de gravació" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Seleccionar un fitxer WAD de Wii per instal·lar" @@ -4402,6 +4586,7 @@ msgstr "Seleccioneu finestres flotants" msgid "Select the file to load" msgstr "Seleccioneu el fitxer a carregar" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Seleccioneu el fitxer de partida desada" @@ -4411,6 +4596,17 @@ msgid "Select the state to load" msgstr "Seleccioneu l'estat a carregar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Seleccioneu el fitxer de partida desada" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Seleccioneu l'estat a carregar" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Seleccioneu l'estat a desar" @@ -4793,9 +4989,15 @@ msgstr "Ha fallat la creació del buffer de so: %s" msgid "Space" msgstr "Espai" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "Espanyol" @@ -4840,7 +5042,11 @@ msgstr "Palanca quadrada" msgid "Standard Controller" msgstr "Control estàndard" +<<<<<<< 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/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4875,7 +5081,10 @@ msgstr "Palanca" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Aturar" @@ -4952,7 +5161,10 @@ msgstr "Taula dreta" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "Capturar pantalla" @@ -5198,12 +5410,19 @@ msgstr "Activar tots els tipus de registre de Log" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "Activar pantalla completa" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "Dalt" @@ -5313,6 +5532,18 @@ 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 +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"Punter desconegud %#08x\n" +"Voleu continuar?" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5538,7 +5769,11 @@ msgstr "Arrel de la NAND:" msgid "Wii Save Import" msgstr "Importar partida guardada Wii" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Arxius de partida guardada Wii (*.bin)|*.bin" @@ -5569,7 +5804,11 @@ msgstr "" "o potser és perquè l'esteu fent servir fora de temps o una altra raó. \n" "Vols tornar a connectar-lo immediatament?" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiimote connectat" @@ -5601,9 +5840,15 @@ msgstr "Finestra dreta" msgid "Word Wrap" msgstr "Envoltant de paraula" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "Treballant ..." @@ -6175,6 +6420,7 @@ msgstr "| O" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Iniciar la finestra de renderitzat a pantalla completa." +<<<<<<< HEAD #~ msgid "" #~ "Unknown pointer %#08x\n" #~ "Continue?" @@ -6182,6 +6428,8 @@ msgstr "| O" #~ "Punter desconegud %#08x\n" #~ "Voleu continuar?" +======= +>>>>>>> Update translation files for recent changes in the code. #~ msgid "Use FPS For Limiting" #~ msgstr "Limitar imatges/s (FPS)" diff --git a/Languages/po/cs.po b/Languages/po/cs.po index 1937128a37..b441cc4434 100644 --- a/Languages/po/cs.po +++ b/Languages/po/cs.po @@ -7,8 +7,13 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-10-15 14:50+0100\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +"PO-Revision-Date: 2011-08-10 20:37+0100\n" +>>>>>>> Update translation files for recent changes in the code. "Last-Translator: Zbyněk Schwarz \n" "Language-Team: \n" "Language: Czech\n" @@ -427,6 +432,10 @@ msgid "Accurate VBeam emulation" msgstr "Precizní emulace VBeam" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +<<<<<<< HEAD +======= +#, fuzzy +>>>>>>> Update translation files for recent changes in the code. msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -552,9 +561,15 @@ msgstr "Přidat Záplatu" msgid "Add new pane" msgstr "Přidat nový panel" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "Přidat..." @@ -622,8 +637,13 @@ msgstr "Všechny obrazy GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Všechny soubory Gamecube GCM )gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Všechny Uložené Stavy (sav, s##)" @@ -652,8 +672,14 @@ msgstr "" "Pokud si nejste jisti, nechejte toto odškrtnuté." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +<<<<<<< HEAD msgid "Alternate Wiimote Timing" msgstr "Střídat časování Wiimote" +======= +#, fuzzy +msgid "Alternate Wiimote Timing" +msgstr "Emulovaný Wiimote" +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -710,7 +736,11 @@ 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 #: 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/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Poměr Stran:" @@ -731,7 +761,11 @@ 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 #: 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/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -846,7 +880,11 @@ msgid "Blue Right" msgstr "Modrá vpravo" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "Dole" @@ -879,7 +917,11 @@ msgstr "Procházet pro výstupní adresář" msgid "Buffer:" msgstr "Vyrovnávací paměť:" +<<<<<<< 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/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1122,7 +1164,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< 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/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Zavřít" @@ -1231,7 +1277,11 @@ msgstr "Připojit Wiimote 3" msgid "Connect Wiimote 4" msgstr "Připojit Wiimote 4" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "Připojuji..." @@ -1421,7 +1471,11 @@ msgid "DSP Emulator Engine" msgstr "Jádro Emulátoru DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulace (rychlé)" @@ -1652,7 +1706,11 @@ msgstr "" msgid "Divide" msgstr "Rozdělit" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Chcete současnou emulaci zastavit?" @@ -1681,12 +1739,21 @@ msgstr "Nastavení Emulovaného Dolphin Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GCPad Nastavení" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Doplhin Filmy TAS (*.dtm)" @@ -1782,9 +1849,15 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "Nizozemština" @@ -1927,15 +2000,22 @@ msgstr "Zapnout BAT" msgid "Enable Block Merging" msgstr "Zapnout Slučování Bloků" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Povolit vyrovnávací paměť" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "Povolit Cheaty" @@ -2091,9 +2171,15 @@ msgstr "" msgid "End" msgstr "End" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "Angličtina" @@ -2122,6 +2208,7 @@ msgstr "Rovná se" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Chyba" @@ -2133,6 +2220,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Chyba" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2589,9 +2682,15 @@ msgstr "Snímky k Nahrání" msgid "Free Look" msgstr "Rozhlížení pomocí myši" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "Francouzština" @@ -2658,7 +2757,11 @@ msgid "Gamecube &Pad Settings" msgstr "Nastavení Gamecube &Pad" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Paměťové karty Gamecube (*.raw,*.gcp)" @@ -2681,8 +2784,12 @@ msgstr "" "(buď špatný kód, nebo typ kódu není ještě podporován.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< 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/VideoConfigDiag.cpp:204 msgid "General" msgstr "Obecné" @@ -2691,9 +2798,15 @@ msgstr "Obecné" msgid "General Settings" msgstr "Obecná Nastavení" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "Němčina" @@ -2715,6 +2828,10 @@ msgid "Greater Than" msgstr "Větší než" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +<<<<<<< HEAD +======= +#, fuzzy +>>>>>>> Update translation files for recent changes in the code. msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2823,8 +2940,12 @@ msgid "Hotkey Configuration" msgstr "Nastavení klávesových zkratek" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< 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. msgid "Hotkeys" msgstr "Klávesové zkratky" @@ -3045,7 +3166,11 @@ msgstr "" "Byl zavolán InstallExceptionHandler, ale tato platforma toto ještě " "nepodporuje." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "Instaluji WAD..." @@ -3127,9 +3252,15 @@ msgstr "Neplatný soubor s nahrávkou" msgid "Invalid state" msgstr "Neplatný stav" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "Italština" @@ -3287,11 +3418,19 @@ msgstr "Nahrát Slot Stavu 8" msgid "Load State..." msgstr "Nahrát Stav..." +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "Nahrát Systémové Menu Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Nahrát Systémové Menu Wii %d%c" @@ -3373,7 +3512,11 @@ msgstr "MMU Hack Rychlosti" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Soubory MadCatz Gameshark (*.gcs)" +<<<<<<< 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/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Hlavní Stick" @@ -3404,7 +3547,11 @@ msgid "Memory Byte" msgstr "Bajt Paměti" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "Paměťová karta" @@ -3602,7 +3749,11 @@ msgstr "NK Tab" msgid "NP Up" msgstr "NK Nahoru" +<<<<<<< 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/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3689,7 +3840,11 @@ msgstr "Nerovná se" msgid "Not Set" msgstr "Nenastaven" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "Nepřipojen" @@ -3750,7 +3905,10 @@ msgstr "Pouze bloky %d jsou dostupné" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Otevřít" @@ -3880,8 +4038,13 @@ msgstr "Záplaty" msgid "Paths" msgstr "Cesty" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: 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/WXInputBase.cpp:48 msgid "Pause" msgstr "Pozastavit" @@ -3901,8 +4064,13 @@ msgstr "Perspektiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< 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. msgid "Play" msgstr "Spustit" @@ -3928,7 +4096,11 @@ msgstr "Možnosti Přehrávání" msgid "Players" msgstr "Hráči" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "Prosím potvrďte..." @@ -4139,10 +4311,17 @@ msgstr "Obnovit Seznam" msgid "Refresh game list" msgstr "Obnovit seznam her" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "Odstranit" @@ -4161,7 +4340,10 @@ msgid "Render to Main Window" msgstr "Vykreslit do Hlavního okna" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Resetovat" @@ -4204,7 +4386,11 @@ msgstr "Uložit Sta&v" msgid "Safe" msgstr "Bezpečná" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Vzorkovací frekvence:" @@ -4288,7 +4474,11 @@ 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 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Skenuji %s" @@ -4328,12 +4518,21 @@ msgstr "Sekce %s nebyla v SYSCONF nalezena" msgid "Select" msgstr "Vybrat" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Vyberte Soubor s Nahrávkou" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Vyberte soubor Wii WAD k instalování" @@ -4359,6 +4558,7 @@ msgstr "Vybrat plovoucí okna" msgid "Select the file to load" msgstr "Vyberte soubor k nahrání" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Vyberte soubor s uloženou hrou" @@ -4368,6 +4568,17 @@ msgid "Select the state to load" msgstr "Vyberte stav k nahrání" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Vyberte soubor s uloženou hrou" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Vyberte stav k nahrání" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Vyberte stav k uložení" @@ -4746,9 +4957,15 @@ msgstr "Vytvoření vyrovnávací paměti zvuku selhalo: %s" msgid "Space" msgstr "Mezerník" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "Španělština" @@ -4792,7 +5009,11 @@ msgstr "Čtvercový Stick" msgid "Standard Controller" msgstr "Standardní Ovladač" +<<<<<<< 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/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4827,7 +5048,10 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Zastavit" @@ -4904,7 +5128,10 @@ msgstr "Deska vpravo" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "Vytvořit Snímek Obrazovky" @@ -5148,12 +5375,19 @@ msgstr "Zapnout Všechny Typy Záznamů" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "Přepnout na Celou Obrazovku" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "Nahoře" @@ -5262,6 +5496,18 @@ 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 +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"Neznámý ukazatel %#08x\n" +"Pokračovat?" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5484,7 +5730,11 @@ msgstr "Wii Kořen NAND:" msgid "Wii Save Import" msgstr "Import uložených pozic Wii" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii soubory s uložením (*.bin)|*.bin" @@ -5515,7 +5765,11 @@ msgstr "" "nebo je to vypršení limitu neaktivity, nebo z jiného důvodu.\n" "Chcete ho hned znovu připojit?" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiimote Připojen" @@ -5547,9 +5801,15 @@ msgstr "Klávesa Windows Vpravo" msgid "Word Wrap" msgstr "Zalamování textu" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "Pracuji..." @@ -6163,6 +6423,7 @@ msgstr "| NEBO" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Spustí vykreslovací okno v režimu celé obrazovky." +<<<<<<< HEAD #~ msgid "" #~ "Unknown pointer %#08x\n" #~ "Continue?" @@ -6170,6 +6431,8 @@ msgstr "| NEBO" #~ "Neznámý ukazatel %#08x\n" #~ "Pokračovat?" +======= +>>>>>>> Update translation files for recent changes in the code. #~ msgid "Use FPS For Limiting" #~ msgstr "Použít SzS pro Omezení" diff --git a/Languages/po/de.po b/Languages/po/de.po index e33919c10f..8772af3d05 100644 --- a/Languages/po/de.po +++ b/Languages/po/de.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< 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. "PO-Revision-Date: 2011-02-17 01:23+0100\n" "Last-Translator: LucasX \n" "Language-Team: \n" @@ -551,9 +555,15 @@ msgstr "Patch hinzufügen" msgid "Add new pane" msgstr "Neue Palette hinzufügen" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "Hinzufügen..." @@ -622,8 +632,13 @@ msgstr "Alle GC/Wii Images (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Alle Gamecube GCM Dateien (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Alle Speicherstände (sav, s##)" @@ -706,7 +721,11 @@ 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 #: 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/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Seitenverhältnis:" @@ -727,7 +746,11 @@ msgstr "Audio Backend:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Fehler beim öffnen des AO-Gerätes.\n" +<<<<<<< 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/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automatisch" @@ -841,7 +864,11 @@ msgid "Blue Right" msgstr "Blau rechts" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "Unten" @@ -874,7 +901,11 @@ msgstr "Ausgabeverzeichnis auswählen" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< 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/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1113,7 +1144,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< 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/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Schließen" @@ -1223,7 +1258,11 @@ msgstr "Wiimote 3 verbinden" msgid "Connect Wiimote 4" msgstr "Wiimote 4 verbinden" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "Verbinden..." @@ -1415,7 +1454,11 @@ msgid "DSP Emulator Engine" msgstr "DSP Emulator Engine" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE Emulation (schnell)" @@ -1632,7 +1675,11 @@ msgstr "" msgid "Divide" msgstr "Dividieren" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Laufende Emulation stoppen?" @@ -1662,12 +1709,21 @@ msgstr "Dolphin Emulierte-Wiimote Einstellungen" msgid "Dolphin FIFO" msgstr "Dolphin" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +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. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Filme (*.dtm)" @@ -1755,9 +1811,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "Holländisch" @@ -1885,16 +1947,23 @@ msgstr "BAT aktivieren" msgid "Enable Block Merging" msgstr "Blockvereinigung aktivieren" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "Cache verwenden" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "Cheats aktivieren" @@ -2033,9 +2102,15 @@ msgstr "" msgid "End" msgstr "Ende" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "Englisch" @@ -2064,6 +2139,7 @@ msgstr "Gleich" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Fehler" @@ -2075,6 +2151,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Fehler" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2535,9 +2617,15 @@ msgstr "" msgid "Free Look" msgstr "Frei Umsehen" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "Französisch" @@ -2606,7 +2694,11 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube-&Pad Einstellungen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube Memory Cards (*.raw,*.gcp)" @@ -2630,8 +2722,12 @@ msgstr "" "unterstützt.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< 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/VideoConfigDiag.cpp:204 msgid "General" msgstr "Allgemein" @@ -2641,9 +2737,15 @@ msgstr "Allgemein" msgid "General Settings" msgstr "Interface Einstellungen" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "Deutsch" @@ -2768,8 +2870,12 @@ msgid "Hotkey Configuration" msgstr "Tastenkürzel Einstellungen" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< 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. msgid "Hotkeys" msgstr "Tastenkürzel" @@ -2984,7 +3090,11 @@ msgstr "" "InstallExceptionHandler aufgerufen, aber diese Platform unterstüzt diesn " "noch nicht." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Installing WAD..." msgstr "WAD ins Wii-Menü installieren..." @@ -3070,9 +3180,15 @@ msgstr "Ungültige Aufnahmedatei" msgid "Invalid state" msgstr "Ungültiger Status" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "Italienisch" @@ -3231,12 +3347,20 @@ msgstr "Status aus Slot 8 laden" msgid "Load State..." msgstr "Status laden..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "Wii-Menü laden (%d %c)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii-Menü laden (%d %c)" @@ -3321,7 +3445,11 @@ msgstr "MMU Speed Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark Dateien(*.gcs)" +<<<<<<< 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/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Main Stick" @@ -3353,7 +3481,11 @@ msgid "Memory Byte" msgstr "Speicher" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "Memory Card" @@ -3540,7 +3672,11 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Hoch" +<<<<<<< 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/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3628,7 +3764,11 @@ msgstr "Ungleich" msgid "Not Set" msgstr "Nicht Festgelegt" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "Nicht Verbunden" @@ -3689,7 +3829,10 @@ msgstr "Nur %d Blöcke verfügbar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Öffnen" @@ -3821,8 +3964,13 @@ msgstr "Patches" msgid "Paths" msgstr "Pfade" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: 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/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -3843,8 +3991,13 @@ msgstr "Perspektive %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< 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. msgid "Play" msgstr "Start" @@ -3871,7 +4024,11 @@ msgstr "Optionen" msgid "Players" msgstr "Spieler" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "Bitte Bestätigen..." @@ -4087,10 +4244,17 @@ msgstr "Liste aktualisieren" msgid "Refresh game list" msgstr "Spieleliste aktualisieren" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "Entfernen" @@ -4109,7 +4273,10 @@ msgid "Render to Main Window" msgstr "Im Hauptfenster Rendern" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Zurücksetzen" @@ -4152,7 +4319,11 @@ msgstr "S&tatus speichern" msgid "Safe" msgstr "Sicher" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Abtastrate:" @@ -4237,7 +4408,11 @@ msgstr "Film-Status %s ist fehlerhaft, breche die Filmaufnahme ab..." msgid "Scaled EFB Copy" msgstr "EFB Scaled Copy" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "Suche..." @@ -4277,12 +4452,21 @@ msgstr "Ausgewähltes %s nicht gefunden in SYSCONF" msgid "Select" msgstr "Auswählen" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Aufnahmedatei auswählen" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Speicherdatei zum Importieren auswählen" @@ -4309,6 +4493,7 @@ msgstr "Wähle unverankerte Fenster" msgid "Select the file to load" msgstr "Datei zum Laden auswählen" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Wii-Spielstand auswählen" @@ -4318,6 +4503,17 @@ msgid "Select the state to load" msgstr "Status zum Laden auswählen" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Wii-Spielstand auswählen" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Status zum Laden auswählen" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Status zum Speichern auswählen" @@ -4673,9 +4869,15 @@ msgstr "Erstellen des Sound-Buffer fehlgeschlagen: %s" msgid "Space" msgstr "Leertaste" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "Spanisch" @@ -4711,7 +4913,11 @@ msgstr "" msgid "Standard Controller" msgstr "Standard-Controller" +<<<<<<< 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/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4746,7 +4952,10 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Stopp" @@ -4819,7 +5028,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "Screenshot erstellen" @@ -5065,12 +5277,19 @@ msgstr "Alle umschalten" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "Vollbildmodus wechseln" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "Oben" @@ -5175,6 +5394,18 @@ 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 +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"Unbekanter Pointer %#08x\n" +"Fortfahren?" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5385,7 +5616,11 @@ msgstr "DVD Laufwerk:" msgid "Wii Save Import" msgstr "Wii Spielstand importieren" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii Speicherdateien (*.bin)|*.bin" @@ -5416,7 +5651,11 @@ msgstr "" "oder die Wiimote war zulange inaktiv oder andere Ursachen.\n" "Soll die Wiimote jetzt wieder verbunden werden?" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiimote Verbunden" @@ -5449,9 +5688,15 @@ msgstr "Windows Rechts" msgid "Word Wrap" msgstr "Zeilenumbruch" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "Arbeite..." diff --git a/Languages/po/dolphin-emu.pot b/Languages/po/dolphin-emu.pot index ea882faa37..dd44453140 100644 --- a/Languages/po/dolphin-emu.pot +++ b/Languages/po/dolphin-emu.pot @@ -8,7 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< 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. "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -506,9 +510,15 @@ msgstr "" msgid "Add new pane" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "" @@ -562,8 +572,13 @@ msgstr "" msgid "All Gamecube GCM files (gcm)" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "" @@ -641,7 +656,11 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" +<<<<<<< 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/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -662,7 +681,11 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" +<<<<<<< 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/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "" @@ -770,7 +793,11 @@ msgid "Blue Right" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "" @@ -803,7 +830,11 @@ msgstr "" msgid "Buffer:" msgstr "" +<<<<<<< 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/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1025,7 +1056,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< 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/VideoConfigDiag.cpp:592 msgid "Close" msgstr "" @@ -1134,7 +1169,11 @@ msgstr "" msgid "Connect Wiimote 4" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "" @@ -1309,7 +1348,11 @@ msgid "DSP Emulator Engine" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "" @@ -1519,7 +1562,11 @@ msgstr "" msgid "Divide" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "" @@ -1548,12 +1595,21 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1636,9 +1692,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "" @@ -1761,15 +1823,22 @@ msgstr "" msgid "Enable Block Merging" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "" @@ -1895,9 +1964,15 @@ msgstr "" msgid "End" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "" @@ -1926,6 +2001,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "" @@ -1937,6 +2013,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2351,9 +2433,15 @@ msgstr "" msgid "Free Look" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "" @@ -2419,7 +2507,11 @@ msgid "Gamecube &Pad Settings" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2440,8 +2532,12 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< 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/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2450,9 +2546,15 @@ msgstr "" msgid "General Settings" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "" @@ -2567,8 +2669,12 @@ msgid "Hotkey Configuration" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< 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. msgid "Hotkeys" msgstr "" @@ -2758,7 +2864,11 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "" @@ -2835,9 +2945,15 @@ msgstr "" msgid "Invalid state" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "" @@ -2988,11 +3104,19 @@ msgstr "" msgid "Load State..." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -3069,7 +3193,11 @@ msgstr "" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" +<<<<<<< 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/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3100,7 +3228,11 @@ msgid "Memory Byte" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "" @@ -3277,7 +3409,11 @@ msgstr "" msgid "NP Up" msgstr "" +<<<<<<< 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/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3364,7 +3500,11 @@ msgstr "" msgid "Not Set" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "" @@ -3425,7 +3565,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "" @@ -3551,8 +3694,13 @@ msgstr "" msgid "Paths" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: 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/WXInputBase.cpp:48 msgid "Pause" msgstr "" @@ -3572,8 +3720,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< 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. msgid "Play" msgstr "" @@ -3599,7 +3752,11 @@ msgstr "" msgid "Players" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "" @@ -3805,10 +3962,17 @@ msgstr "" msgid "Refresh game list" msgstr "" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "" @@ -3824,7 +3988,10 @@ msgid "Render to Main Window" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "" @@ -3867,7 +4034,11 @@ msgstr "" msgid "Safe" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "" @@ -3951,7 +4122,11 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Scanning %s" msgstr "" @@ -3991,12 +4166,21 @@ msgstr "" msgid "Select" msgstr "" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "" @@ -4019,6 +4203,7 @@ msgstr "" msgid "Select the file to load" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "" @@ -4028,6 +4213,17 @@ msgid "Select the state to load" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "" @@ -4361,9 +4557,15 @@ msgstr "" msgid "Space" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "" @@ -4399,7 +4601,11 @@ msgstr "" msgid "Standard Controller" msgstr "" +<<<<<<< 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/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4434,7 +4640,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "" @@ -4506,7 +4715,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "" @@ -4718,12 +4930,19 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "" @@ -4825,6 +5044,16 @@ msgstr "" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5026,7 +5255,11 @@ msgstr "" msgid "Wii Save Import" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5053,7 +5286,11 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "" @@ -5085,9 +5322,15 @@ msgstr "" msgid "Word Wrap" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "" diff --git a/Languages/po/el.po b/Languages/po/el.po index 81814c796e..30b56b762f 100644 --- a/Languages/po/el.po +++ b/Languages/po/el.po @@ -7,8 +7,13 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +"PO-Revision-Date: 2011-09-13 17:28+0200\n" +>>>>>>> Update translation files for recent changes in the code. "Last-Translator: Linktothepast \n" "Language-Team: Gpower2 \n" "Language: Greek\n" @@ -426,13 +431,21 @@ msgstr "Επιτάχυνση" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Accuracy:" +<<<<<<< HEAD msgstr "Ακρίβεια:" +======= +msgstr "" +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Accurate VBeam emulation" msgstr "Ακριβής VBeam εξομοίωση" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +<<<<<<< HEAD +======= +#, fuzzy +>>>>>>> Update translation files for recent changes in the code. msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -560,9 +573,15 @@ msgstr "Προσθήκη Patch" msgid "Add new pane" msgstr "Προσθήκη νέου pane" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "Προσθήκη..." @@ -618,8 +637,13 @@ msgstr "Όλες οι εικόνες GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Όλα τα αρχεία Gamecube GCM (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Όλα τα Σημεία Αποθήκευσης(sav, s##)" @@ -648,8 +672,14 @@ msgstr "" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +<<<<<<< HEAD msgid "Alternate Wiimote Timing" msgstr "Εναλλακτικός Χρονισμός Wiimote" +======= +#, fuzzy +msgid "Alternate Wiimote Timing" +msgstr "Εξομοιωμένο Wiimote" +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -708,7 +738,11 @@ msgstr "" "Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το αρχείο; Θα εξαφανιστεί για " "πάντα!" +<<<<<<< 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/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Αναλογία Οθόνης:" @@ -729,7 +763,11 @@ msgstr "Backend Ήχου:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Σφάλμα ανοίγματος AO συσκευής.\n" +<<<<<<< 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/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Αυτόματα" @@ -764,11 +802,14 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" +<<<<<<< HEAD "Δημιουργεί αυτόματα τα mipmaps αντί να τα αποκωδικοποιεί από την μνήμη.\n" "Αυξάνει λίγο τις επιδόσεις, αλλά μπορεί να προκαλέσει μικρά ελαττώματα στις " "υφές.\n" "\n" "Αν δεν είστε σίγουροι, αφήστε το επιλεγμένο." +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:27 msgid "Back" @@ -846,7 +887,11 @@ msgid "Blue Right" msgstr "Δεξί Μπλε" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "Βάση" @@ -879,7 +924,11 @@ msgstr "Εύρεση φακέλου προορισμού" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< 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/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1082,7 +1131,11 @@ msgstr "Επιλέξτε ένα αρχείο για άνοιγμα" msgid "Choose a memory card:" msgstr "Επιλέξτε μια κάρτα μνήμης:" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1124,7 +1177,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< 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/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Κλείσιμο" @@ -1233,7 +1290,11 @@ msgstr "Σύνδεση Wiimote 3" msgid "Connect Wiimote 4" msgstr "Σύνδεση Wiimote 4" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "Γίνεται Σύνδεση..." @@ -1352,7 +1413,11 @@ msgstr "Δημιουργία νέας οπτικής" msgid "Created by KDE-Look.org" msgstr "Δημιουργήθηκε από KDE-Look.org" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" @@ -1429,7 +1494,11 @@ msgid "DSP Emulator Engine" msgstr "Μηχανή Εξομοίωσης DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE εξομοίωση (γρήγορη)" @@ -1660,7 +1729,11 @@ msgstr "" msgid "Divide" msgstr "Divide" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Θέλετε να σταματήσετε την τρέχουσα εξομοίωση;" @@ -1689,12 +1762,21 @@ msgstr "Ρυθμίσεις Εξοιμοιωμένου Dolphin Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +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. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Ταινίες (*.dtm)" @@ -1706,7 +1788,11 @@ msgstr "Ρυθμίσεις Dolphin Wiimote" msgid "Dolphin at &Google Code" msgstr "Dolphin στο &Google Code" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1714,7 +1800,11 @@ msgstr "" "Το Dolphin δεν μπόρεσε να βρει GC/Wii ISO. Κάντε διπλό κλίκ εδώ για εύρεση " "αρχείων..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1792,9 +1882,15 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "Ολλανδικά" @@ -1939,6 +2035,7 @@ msgstr "Ενεργοποίηση BAT" msgid "Enable Block Merging" msgstr "Ενεργοποίηση Block Merging" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" @@ -1948,6 +2045,14 @@ msgid "Enable Cache" msgstr "Ενεργοποίηση Cache" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#, fuzzy +msgid "Enable Cache" +msgstr "Ενεργοποίηση Cheat" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "Ενεργοποίηση Cheat" @@ -2048,7 +2153,11 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2104,9 +2213,15 @@ msgstr "" msgid "End" msgstr "Τέλος" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "Αγγλικά" @@ -2135,6 +2250,7 @@ msgstr "Ίσο" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Σφάλμα" @@ -2146,11 +2262,18 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Σφάλμα" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "Αποτυχία φόρτωσης της επιλεγμένης γλώσσας. Επαναφορά στην προεπιλογή " "συστήματος." +<<<<<<< HEAD #: Source/Core/Common/Src/ChunkFile.h:180 #, c-format @@ -2158,6 +2281,8 @@ msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format @@ -2431,11 +2556,19 @@ msgstr "Αποτυχία εγγραφής της κεφαλίδας για το #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 msgid "Fast" +<<<<<<< HEAD msgstr "Γρήγορη" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Fast Mipmaps" msgstr "Γρήγορα Mipmaps" +======= +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +msgid "Fast Mipmaps" +msgstr "" +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Fast version of the MMU. Does not work for every game." @@ -2605,9 +2738,15 @@ msgstr "Καρέ Προς Εγγραφή" msgid "Free Look" msgstr "Ελεύθερη Ματιά" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "Γαλλικά" @@ -2674,7 +2813,11 @@ msgid "Gamecube &Pad Settings" msgstr "Ρυθμίσεις Gamecube &Pad" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Κάρτες Μνήμης Gamecube (*.raw,*.gcp)" @@ -2697,8 +2840,12 @@ msgstr "" "(ή είναι ένας κακός κωδικός ή ο τύπος του κωδικού δεν υποστηρίζεται.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< 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/VideoConfigDiag.cpp:204 msgid "General" msgstr "Γενικά" @@ -2707,9 +2854,15 @@ msgstr "Γενικά" msgid "General Settings" msgstr "Γενικές Ρυθμίσεις" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "Γερμανικά" @@ -2733,6 +2886,10 @@ msgid "Greater Than" msgstr "Μεγαλύτερο από" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +<<<<<<< HEAD +======= +#, fuzzy +>>>>>>> Update translation files for recent changes in the code. msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2843,8 +3000,12 @@ msgid "Hotkey Configuration" msgstr "Ρυθμίσεις Πλήκτρων Συντόμευσης" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< 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. msgid "Hotkeys" msgstr "Πλήκτρα Συντόμευσης" @@ -2925,7 +3086,11 @@ msgstr "" "Αν τα FPS διακυμαίνονται, αυτή η επιλογή μπορείο να βοηθήσει. (Ενεργό = " "Συμβατό, Ανενεργό = Γρήγορο)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 +>>>>>>> Update translation files for recent changes in the code. 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." @@ -3071,7 +3236,11 @@ msgstr "" "InstallExceptionHandler καλέστηκε, αλλά αυτή η πλατφόρμα δεν το υποστηρίζει " "ακόμα." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "Γίνεται εγκατάσταση WAD..." @@ -3153,9 +3322,15 @@ msgstr "Μη έγκυρο αρχείο εγγραφής" msgid "Invalid state" msgstr "Μη έγκυρο κατάσταση" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "Ιταλικά" @@ -3313,11 +3488,19 @@ msgstr "Φόρτωση Σημείου Αποθήκευσης 8" msgid "Load State..." msgstr "Φόρτωση Σημείου Αποθήκευσης..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Φόρτωση Μενού Συστήματος Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "Φόρτωση Μενού Συστήματος Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Φόρτωση Μενού Συστήματος Wii %d%c" @@ -3399,7 +3582,11 @@ msgstr "MMU Speed Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Αρχεία MadCatz Gameshark (*.gcs)" +<<<<<<< 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/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Κύριο Stick" @@ -3430,7 +3617,11 @@ msgid "Memory Byte" msgstr "Memory Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "Κάρτα Μνήμης" @@ -3630,7 +3821,11 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< 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/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3717,7 +3912,11 @@ msgstr "Όχι ίσο" msgid "Not Set" msgstr "Μη Ορισμένο" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "Μη Συνδεδεμένο" @@ -3778,7 +3977,10 @@ msgstr "Διαθέσιμα μόνο %d μπλοκ" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Άνοιγμα" @@ -3910,8 +4112,13 @@ msgstr "Patches" msgid "Paths" msgstr "Φάκελοι" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: 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/WXInputBase.cpp:48 msgid "Pause" msgstr "Παύση" @@ -3931,8 +4138,13 @@ msgstr "Οπτική %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< 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. msgid "Play" msgstr "Αναπαραγωγή" @@ -3958,7 +4170,11 @@ msgstr "Ρυθμίσεις Αναπαραγωγής" msgid "Players" msgstr "Παίχτες" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "Παρακαλώ επιβεβαιώστε..." @@ -4169,10 +4385,17 @@ msgstr "Ανανέωση Λίστας" msgid "Refresh game list" msgstr "Ανανέωση λίστας παιχνιδιών" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "Αφαίρεση" @@ -4191,7 +4414,10 @@ msgid "Render to Main Window" msgstr "Αναπαραγωγή στο Κεντρικό Παράθυρο" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Επανεκκίνηση" @@ -4232,9 +4458,15 @@ msgstr "Απ&οθήκευση Σημείου Αποθήκευσης" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 msgid "Safe" +<<<<<<< HEAD msgstr "Ασφαλής" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Ρυθμός Δειγματοληψίας:" @@ -4318,7 +4550,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Scaled EFB Copy" +<<<<<<< HEAD msgstr "Κλιμακούμενα EFB Αντίγραφα" +======= +msgstr "" +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 #, c-format @@ -4360,12 +4596,21 @@ msgstr "Η ενότητα %s δε βρέθηκε στο SYSCONF" msgid "Select" msgstr "Επιλογή" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Επιλέξτε το Αρχείο Εγγραφής" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Επιλέξτε ένα Wii WAD αρχείο για εγκατάσταση" @@ -4391,6 +4636,7 @@ msgstr "Επιλέξτε αιωρούμενα παράθυρα" msgid "Select the file to load" msgstr "Επιλέξτε το αρχείο για φόρτωση" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Επιλέξτε αρχείο αποθήκευσης" @@ -4400,6 +4646,17 @@ msgid "Select the state to load" msgstr "Επιλέξτε το σημείο φόρτωσης" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Επιλέξτε αρχείο αποθήκευσης" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Επιλέξτε το σημείο φόρτωσης" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Επιλέξτε το σημείο αποθήκευσης" @@ -4475,7 +4732,11 @@ msgstr "Διαχωριστής" msgid "Serbian" msgstr "Σερβικά" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4704,6 +4965,7 @@ msgid "Skip EFB Access from CPU" msgstr "Παράλειψη EFB Πρόσβασης από τη CPU" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +<<<<<<< HEAD msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4729,9 +4991,29 @@ msgstr "" "Μερικές φορές μπορεί να βελτιώσει την οπτική ποιότητα.\n" "Αν αντιμετωπίζετε προβλήματα, δοκιμάστε να αυξήσετε την ακρίβεια της cache " "υφών ή απενεργοποιήστε αυτήν την επιλογή.\n" +======= +msgid "" +"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" +>>>>>>> Update translation files for recent changes in the code. "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +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" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:387 #: Source/Core/DolphinWX/Src/FrameTools.cpp:399 #, c-format @@ -4785,9 +5067,15 @@ msgstr "Αποτυχία δημιουργίας buffer ήχου: %s" msgid "Space" msgstr "Space" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "Ισπανικά" @@ -4832,7 +5120,11 @@ msgstr "Τετράγωνο Stick" msgid "Standard Controller" msgstr "Τυπικός Controller" +<<<<<<< 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/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4867,7 +5159,10 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Διακοπή" @@ -4880,11 +5175,14 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" +<<<<<<< HEAD "Αποθήκευση των EFB αντιγράφων σε GPU αντικείμενα υφών.\n" "Αυτό δεν είναι τόσο ακριβές, αλλά δουλεύει αρκετά καλά για τα περισσότερα " "παιχνίδια και προσφέρει μεγάλη επιτάχυνση σε σχέση με EFB σε RAM.\n" "\n" "Αν δεν είστε σίγουροι, αφήστε το επιλεγμένο." +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Stretch to Window" @@ -4944,7 +5242,10 @@ msgstr "Δεξί Table" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "Δημιουργία Στιγμιότυπου" @@ -4957,12 +5258,23 @@ msgid "Test" msgstr "Τέστ" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +<<<<<<< HEAD msgid "Texture" msgstr "Υφή" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 msgid "Texture Cache" msgstr "Cache Υφών" +======= +#, fuzzy +msgid "Texture" +msgstr "Εξαγωγή Υφών" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 +#, fuzzy +msgid "Texture Cache" +msgstr "Καθαρισμός Cache" +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Texture Format Overlay" @@ -5034,10 +5346,13 @@ msgid "" "\n" "If unsure, use the second-fastest value from the right." msgstr "" +<<<<<<< HEAD "Όσο πιο ασφαλής είναι αυτή η ρύθμιση, τόσο λιγότερο πιθανό ο εξομοιωτής να " "χάσει ανανεώσεις των υφών από την RAM.\n" "\n" "Αν δεν είστε σίγουροι, χρησιμοποιήστε την δεύτερη γρηγορότερη τιμή από δεξιά." +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 msgid "The save you are trying to copy has an invalid file size" @@ -5199,12 +5514,19 @@ msgstr "Εναλλαγή Όλων Τύπων Καταγραφής " #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "Εναλλαγή Πλήρους Οθόνης" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "Κορυφή" @@ -5314,6 +5636,18 @@ msgstr "Ελήφθη άγνωστο μήνυμα με id : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Ελήφθη άγνωστο μήνυμα με:%d από τον παίκτη:%d Αποσύνδεση παίκτη!" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"Άγνωστος δείκτης %#08x\n" +"Συνέχεια;" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5540,7 +5874,11 @@ msgstr "Wii NAND Ρίζα:" msgid "Wii Save Import" msgstr "Εισαγωγή Αποθήκευσης Wii" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Αρχεία αποθήκευσης Wii (*.bin)|*.bin" @@ -5571,7 +5909,11 @@ msgstr "" "ή πιθανόν να οφείλεται σε χρόνο αδράνειας ή κάποιον άλλο λόγο.\n" "Θέλετε να γίνει άμεση επανασύνδεση;" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Συνδεδεμένο Wiimote" @@ -5603,9 +5945,15 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "Αναδίπλωση Λέξεων" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "Σε εργασία..." @@ -5817,6 +6165,7 @@ msgstr "zNear Διόρθωση: " msgid "| OR" msgstr "| OR" +<<<<<<< HEAD #~ msgid "Cannot record movies in read-only mode." #~ msgstr "" #~ "Δεν μπορεί να γίνει εγγραφή ταινιών σε λειτουργία μόνο για ανάγνωση." @@ -5827,3 +6176,7 @@ msgstr "| OR" #~ msgstr "" #~ "Άγνωστος δείκτης %#08x\n" #~ "Συνέχεια;" +======= +#~ msgid "Disable Wiimote Speaker" +#~ msgstr "Απενεργοποίηση Ηχείου Wiimote" +>>>>>>> Update translation files for recent changes in the code. diff --git a/Languages/po/en.po b/Languages/po/en.po index f08b1e1cdf..2563333e4e 100644 --- a/Languages/po/en.po +++ b/Languages/po/en.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< 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. "PO-Revision-Date: 2011-01-06 14:53+0100\n" "Last-Translator: BhaaL \n" "Language-Team: \n" @@ -505,9 +509,15 @@ msgstr "" msgid "Add new pane" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "" @@ -561,8 +571,13 @@ msgstr "" msgid "All Gamecube GCM files (gcm)" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "" @@ -640,7 +655,11 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" +<<<<<<< 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/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -661,7 +680,11 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" +<<<<<<< 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/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "" @@ -769,7 +792,11 @@ msgid "Blue Right" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "" @@ -802,7 +829,11 @@ msgstr "" msgid "Buffer:" msgstr "" +<<<<<<< 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/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1024,7 +1055,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< 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/VideoConfigDiag.cpp:592 msgid "Close" msgstr "" @@ -1133,7 +1168,11 @@ msgstr "" msgid "Connect Wiimote 4" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "" @@ -1308,7 +1347,11 @@ msgid "DSP Emulator Engine" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "" @@ -1518,7 +1561,11 @@ msgstr "" msgid "Divide" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "" @@ -1547,12 +1594,21 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1635,9 +1691,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "" @@ -1760,15 +1822,22 @@ msgstr "" msgid "Enable Block Merging" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "" @@ -1894,9 +1963,15 @@ msgstr "" msgid "End" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "" @@ -1925,6 +2000,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "" @@ -1936,6 +2012,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2350,9 +2432,15 @@ msgstr "" msgid "Free Look" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "" @@ -2418,7 +2506,11 @@ msgid "Gamecube &Pad Settings" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2439,8 +2531,12 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< 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/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2449,9 +2545,15 @@ msgstr "" msgid "General Settings" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "" @@ -2566,8 +2668,12 @@ msgid "Hotkey Configuration" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< 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. msgid "Hotkeys" msgstr "" @@ -2757,7 +2863,11 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "" @@ -2834,9 +2944,15 @@ msgstr "" msgid "Invalid state" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "" @@ -2987,11 +3103,19 @@ msgstr "" msgid "Load State..." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -3068,7 +3192,11 @@ msgstr "" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" +<<<<<<< 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/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3099,7 +3227,11 @@ msgid "Memory Byte" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "" @@ -3276,7 +3408,11 @@ msgstr "" msgid "NP Up" msgstr "" +<<<<<<< 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/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3363,7 +3499,11 @@ msgstr "" msgid "Not Set" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "" @@ -3424,7 +3564,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "" @@ -3550,8 +3693,13 @@ msgstr "" msgid "Paths" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: 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/WXInputBase.cpp:48 msgid "Pause" msgstr "" @@ -3571,8 +3719,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< 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. msgid "Play" msgstr "" @@ -3598,7 +3751,11 @@ msgstr "" msgid "Players" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "" @@ -3804,10 +3961,17 @@ msgstr "" msgid "Refresh game list" msgstr "" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "" @@ -3823,7 +3987,10 @@ msgid "Render to Main Window" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "" @@ -3866,7 +4033,11 @@ msgstr "" msgid "Safe" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "" @@ -3950,7 +4121,11 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Scanning %s" msgstr "" @@ -3990,12 +4165,21 @@ msgstr "" msgid "Select" msgstr "" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "" @@ -4018,6 +4202,7 @@ msgstr "" msgid "Select the file to load" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "" @@ -4027,6 +4212,17 @@ msgid "Select the state to load" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "" @@ -4360,9 +4556,15 @@ msgstr "" msgid "Space" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "" @@ -4398,7 +4600,11 @@ msgstr "" msgid "Standard Controller" msgstr "" +<<<<<<< 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/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4433,7 +4639,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "" @@ -4505,7 +4714,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "" @@ -4717,12 +4929,19 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "" @@ -4824,6 +5043,16 @@ msgstr "" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5025,7 +5254,11 @@ msgstr "" msgid "Wii Save Import" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5052,7 +5285,11 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "" @@ -5084,9 +5321,15 @@ msgstr "" msgid "Word Wrap" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "" diff --git a/Languages/po/es.po b/Languages/po/es.po index f989ce37bf..10b8c05209 100644 --- a/Languages/po/es.po +++ b/Languages/po/es.po @@ -7,8 +7,13 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-12-09 00:28+0100\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +"PO-Revision-Date: 2011-08-11 15:30+0100\n" +>>>>>>> Update translation files for recent changes in the code. "Last-Translator: Petiso Carambanal \n" "Language-Team: DARIO_FF \n" "Language: Spanish\n" @@ -431,6 +436,10 @@ msgid "Accurate VBeam emulation" msgstr "Emulación de VBeam Precisa" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +<<<<<<< HEAD +======= +#, fuzzy +>>>>>>> Update translation files for recent changes in the code. msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -559,9 +568,15 @@ msgstr "Añadir Parche" msgid "Add new pane" msgstr "Añadir nueva ventana" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "Añadir..." @@ -630,8 +645,13 @@ 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 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Todos los estados guardados (sav, s##)" @@ -660,8 +680,14 @@ msgstr "" "Si está inseguro, déjelo sin marcar." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +<<<<<<< HEAD msgid "Alternate Wiimote Timing" msgstr "Sincronización alternativa del Wiimote" +======= +#, fuzzy +msgid "Alternate Wiimote Timing" +msgstr "Wiimote emulado" +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -718,7 +744,11 @@ msgstr "" 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!" +<<<<<<< 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/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Relación de aspecto:" @@ -739,7 +769,11 @@ msgstr "Motor de Audio:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error al abrir dispositivo AO.\n" +<<<<<<< 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/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automático" @@ -855,7 +889,11 @@ msgid "Blue Right" msgstr "Azul derecha" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "Inferior" @@ -888,7 +926,11 @@ msgstr "Busca un directorio de salida" msgid "Buffer:" msgstr "Búfer" +<<<<<<< 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/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1095,7 +1137,11 @@ msgstr "Escoge un archivo a abrir" msgid "Choose a memory card:" msgstr "Escoge una tarjeta de memoria:" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1137,7 +1183,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< 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/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Cerrar" @@ -1246,7 +1296,11 @@ msgstr "Conectar Wiimote 3" msgid "Connect Wiimote 4" msgstr "Conectar Wiimote 4" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "Conectando..." @@ -1364,7 +1418,11 @@ msgstr "Crear nueva perspectiva" msgid "Created by KDE-Look.org" msgstr "Creado por KDE-Look.org" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" @@ -1438,7 +1496,11 @@ msgid "DSP Emulator Engine" msgstr "Motor de emulación DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulación DSP HLE (rápido)" @@ -1669,7 +1731,11 @@ msgstr "" msgid "Divide" msgstr "Dividir" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "¿Quieres detener la emulación actual?" @@ -1698,12 +1764,21 @@ msgstr "Configuración de wiimote emulado de Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +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. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Películas TAS de Dolphin (*.dtm)" @@ -1715,7 +1790,11 @@ msgstr "Configuración de wiimote de Dolphin" msgid "Dolphin at &Google Code" msgstr "Dolphin en &Google Code" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1723,7 +1802,11 @@ msgstr "" "Dolphin no pudo encontrar ninguna ISO de GC/Wii. Haz doble clic aquí para " "buscar..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1799,9 +1882,15 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "Holandés" @@ -1940,15 +2029,22 @@ msgstr "Habilitar BAT" msgid "Enable Block Merging" msgstr "Habilitar asociación de bloques" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Habilitar caché" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "Habilitar trucos" @@ -2048,7 +2144,11 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2103,9 +2203,15 @@ msgstr "" msgid "End" msgstr "Fin" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "Inglés" @@ -2134,6 +2240,7 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Error" @@ -2145,6 +2252,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Error" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2153,6 +2266,7 @@ msgstr "" #: Source/Core/Common/Src/ChunkFile.h:180 #, c-format msgid "" +<<<<<<< HEAD "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" @@ -2160,6 +2274,8 @@ msgstr "" #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format msgid "" +======= +>>>>>>> Update translation files for recent changes in the code. "Error: Trying to access %s fonts but they are not loaded. Games may not show " "fonts correctly, or crash." msgstr "" @@ -2603,9 +2719,15 @@ msgstr "Frames a grabar" msgid "Free Look" msgstr "Cámara libre" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "Francés" @@ -2672,7 +2794,11 @@ msgid "Gamecube &Pad Settings" msgstr "&Configuración del mando Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Tarjetas de memoria de Gamecube (*.raw,*.gcp)" @@ -2695,8 +2821,12 @@ msgstr "" "(puede ser un código incorrecto o su tipo no es soportado todavía.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< 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/VideoConfigDiag.cpp:204 msgid "General" msgstr "General" @@ -2705,9 +2835,15 @@ msgstr "General" msgid "General Settings" msgstr "Ajustes generales" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "Alemán" @@ -2730,6 +2866,10 @@ msgid "Greater Than" msgstr "Mayor que" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +<<<<<<< HEAD +======= +#, fuzzy +>>>>>>> Update translation files for recent changes in the code. msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2739,10 +2879,17 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" +<<<<<<< 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" "Reduce ligeramente el desempeño y posiblemente cause fallos (altamente " +======= +"Aumenta bastante la calidad de las texturas generadas utilizando los efectos " +"de renderización para la textura.\n" +"Aumentar la resolución interna va a mejorar el efecto de esta definición.\n" +"Diminuye ligeramente el desempenño y probablemente provoca fallos (aunque es " +>>>>>>> Update translation files for recent changes in the code. "improbable).\n" "\n" "Si está inseguro, déjelo marcado." @@ -2840,8 +2987,12 @@ msgid "Hotkey Configuration" msgstr "Configuración de atajos" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< 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. msgid "Hotkeys" msgstr "Atajos" @@ -2922,7 +3073,11 @@ msgstr "" "Si los FPS son erróneos, esta opción puede ayudar. (ON = Compatible, OFF = " "Rápido)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 +>>>>>>> Update translation files for recent changes in the code. 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." @@ -3066,7 +3221,11 @@ msgstr "" "Se ha llamado InstallExceptionHandler, pero esta plataforma no lo soporta " "todavía." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "Instalando WAD..." @@ -3148,9 +3307,15 @@ msgstr "Archivo de grabación no válido" msgid "Invalid state" msgstr "Estado no válido" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "Italiano" @@ -3308,11 +3473,19 @@ msgstr "&Cargar estado 8" msgid "Load State..." msgstr "Cargar estado..." +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "Cargar Menú de sistema Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Cargar Menú de sistema Wii %d %c" @@ -3394,7 +3567,11 @@ msgstr "Hack de velocidad MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Archivos MadCatz Gameshark (*.gcs)" +<<<<<<< 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/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Stick principal" @@ -3425,7 +3602,11 @@ msgid "Memory Byte" msgstr "Byte de memoria" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "Tarjeta de memoria" @@ -3523,9 +3704,12 @@ msgid "" msgstr "" "Mueva el puntero del ratón sobre una opción para obtener una descripción " "detallada.\n" +<<<<<<< HEAD "\n" "\n" "\n" +======= +>>>>>>> Update translation files for recent changes in the code. "\n" "\n" "\n" @@ -3626,7 +3810,11 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Arriba" +<<<<<<< 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/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3713,7 +3901,11 @@ msgstr "No Igual" msgid "Not Set" msgstr "No Definido" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "Sin conectar" @@ -3774,7 +3966,10 @@ msgstr "Solo %d bloques disponibles" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Abrir" @@ -3906,8 +4101,13 @@ msgstr "Parches" msgid "Paths" msgstr "Directorios" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: 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/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -3927,8 +4127,13 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< 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. msgid "Play" msgstr "Reproducir" @@ -3954,7 +4159,11 @@ msgstr "Opciones de reproducción" msgid "Players" msgstr "Jugadores" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "Confirme, por favor..." @@ -4165,10 +4374,17 @@ msgstr "Actualizar lista" msgid "Refresh game list" msgstr "Actualizar lista de juegos" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "Eliminar" @@ -4187,7 +4403,10 @@ msgid "Render to Main Window" msgstr "Renderizar a ventana principal" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reiniciar" @@ -4230,7 +4449,11 @@ msgstr "Guardar estado" msgid "Safe" msgstr "Seguro" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Frecuencia del sonido:" @@ -4356,12 +4579,21 @@ msgstr "No se ha encontrado la sección %s en SYSCONF" msgid "Select" msgstr "Seleccionar" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Seleccionar archivo de grabación" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Elige un WAD de Wii para instalar" @@ -4387,6 +4619,7 @@ msgstr "Selecciona las ventanas flotantes" msgid "Select the file to load" msgstr "Selecciona el archivo para cargar" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Selecciona el archivo de guardado" @@ -4396,6 +4629,17 @@ msgid "Select the state to load" msgstr "Selecciona el estado para cargar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Selecciona el archivo de guardado" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Selecciona el estado para cargar" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Selecciona el estado para guardar" @@ -4470,7 +4714,11 @@ msgstr "Separador" msgid "Serbian" msgstr "Serbio" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4699,6 +4947,7 @@ msgid "Skip EFB Access from CPU" msgstr "Saltar el acceso al EFB desde la CPU" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +<<<<<<< HEAD msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4719,6 +4968,28 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +======= +msgid "" +"Skip the destination alpha pass used in many games for various graphical " +"effects.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"Salta el destino del pase alfa usado en muchos juegos para varios efectos " +"gráficos.\n" +"\n" +"Si está inseguro, déjelo sin marcar." + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +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" +"\n" +"If unsure, leave this unchecked." +msgstr "" +>>>>>>> Update translation files for recent changes in the code. "Aumenta ligeramente las copias de EFB a la RAM al sacrificar exactitud de " "emulación.\n" "A veces también aumenta la calidad visual.\n" @@ -4779,9 +5050,15 @@ msgstr "Falló la creación del búfer de sonido: %s" msgid "Space" msgstr "Espacio" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "Español" @@ -4825,7 +5102,11 @@ msgstr "Stick cuadrado" msgid "Standard Controller" msgstr "Control estándar" +<<<<<<< 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/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4860,7 +5141,10 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Detener" @@ -4940,7 +5224,10 @@ msgstr "Tabla derecha" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "Captura de pantalla" @@ -5191,12 +5478,19 @@ msgstr "Alternar todos los tipos de registro" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "Cambiar a pantalla completa" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "Superior" @@ -5303,6 +5597,17 @@ msgstr "Se recibió un mensaje desconocido de id: %d" #: Source/Core/Core/Src/NetPlayServer.cpp:504 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" +<<<<<<< HEAD +======= +msgstr "" +"Mensaje desconocido con id:%d recibido del jugador:%d ¡Echando al jugador!" + +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +>>>>>>> Update translation files for recent changes in the code. msgstr "" "Mensaje desconocido con id:%d recibido del jugador:%d ¡Echando al jugador!" @@ -5532,7 +5837,11 @@ msgstr "Raíz de la NAND de Wii:" msgid "Wii Save Import" msgstr "Importar guardado de Wii" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Archivos de guardado Wii (*.bin)|*.bin" @@ -5563,7 +5872,11 @@ msgstr "" "o mucho tiempo de espera, o alguna otra razón.\n" "¿Desea reconectarlo inmediatamente?" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiimote conectado" @@ -5595,9 +5908,15 @@ msgstr "Windows Derecha" msgid "Word Wrap" msgstr "Word Wrap" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "Trabajando..." diff --git a/Languages/po/fr.po b/Languages/po/fr.po index fcd5a4244f..56cb368da8 100644 --- a/Languages/po/fr.po +++ b/Languages/po/fr.po @@ -7,8 +7,13 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-10-28 23:40+0100\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +"PO-Revision-Date: 2011-08-10 17:42+0100\n" +>>>>>>> Update translation files for recent changes in the code. "Last-Translator: Pascal\n" "Language-Team: \n" "Language: French\n" @@ -429,6 +434,10 @@ msgid "Accurate VBeam emulation" msgstr "Emulation fidèle VBeam" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +<<<<<<< HEAD +======= +#, fuzzy +>>>>>>> Update translation files for recent changes in the code. msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -556,9 +565,15 @@ msgstr "Ajouter un patch" msgid "Add new pane" msgstr "Ajouter un nouveau panneau" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "Ajouter..." @@ -627,8 +642,13 @@ msgstr "Toutes les images GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Tous les fichiers GameCube GCM (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Tous les états sauvegardés (sav, s##)" @@ -657,8 +677,14 @@ msgstr "" "Dans le doute, décochez cette case." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +<<<<<<< HEAD msgid "Alternate Wiimote Timing" msgstr "Délai alternatif de communication avec la Wiimote" +======= +#, fuzzy +msgid "Alternate Wiimote Timing" +msgstr "Wiimote émulée" +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -718,7 +744,11 @@ msgstr "" "Êtes-vous sûr de vouloir supprimer ce fichier ? Il sera supprimé " "définitivement !" +<<<<<<< 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/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Format d'écran :" @@ -739,7 +769,11 @@ msgstr "Moteur audio :" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon : impossible d'ouvrir le périphérique AO.\n" +<<<<<<< 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/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -858,7 +892,11 @@ msgid "Blue Right" msgstr "Bleu Droite" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "Bas" @@ -891,7 +929,11 @@ msgstr "Parcourir un dossier de destination" msgid "Buffer:" msgstr "Buffer :" +<<<<<<< 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/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1099,7 +1141,11 @@ msgstr "Choisir un fichier à ouvrir" msgid "Choose a memory card:" msgstr "Choisir une carte mémoire :" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1141,7 +1187,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< 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/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Fermer" @@ -1250,7 +1300,11 @@ msgstr "Connecter la 3è Wiimote" msgid "Connect Wiimote 4" msgstr "Connecter la 4è Wiimote" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "Connexion..." @@ -1369,7 +1423,11 @@ msgstr "Créer une nouvelle perspective" msgid "Created by KDE-Look.org" msgstr "Créé par KDE-Look.org" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" @@ -1443,7 +1501,11 @@ msgid "DSP Emulator Engine" msgstr "Moteur d'émulation du DSP (Audio)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulation du DSP en HLE (rapide)" @@ -1674,7 +1736,11 @@ msgstr "" msgid "Divide" msgstr "Diviser" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Voulez-vous arrêter l'émulation en cours ?" @@ -1703,12 +1769,21 @@ msgstr "Configuration de la Wiimote pour Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "Configuration de la manette GC pour Dolphin" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Films TAS Dolphin (*.dtm)" @@ -1720,7 +1795,11 @@ msgstr "Configuration de la Wiimote pour Dolphin" msgid "Dolphin at &Google Code" msgstr "Dolphin dans &Google Code" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1728,7 +1807,11 @@ msgstr "" "Dolphin n'a pas trouvé d'ISO GC/Wii. Double-cliquez ici pour chercher des " "fichiers..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1805,9 +1888,15 @@ msgstr "" "\n" "Dans le doute, décochez cette case." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "Néerlandais" @@ -1951,15 +2040,22 @@ msgstr "Activer BAT" msgid "Enable Block Merging" msgstr "Activer l'assemblage de blocs" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Activer le cache" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "Activer les Cheats" @@ -2060,7 +2156,11 @@ msgstr "" "\n" "Dans le doute, décochez cette case." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2116,9 +2216,15 @@ msgstr "" msgid "End" msgstr "Fin" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "Anglais" @@ -2147,6 +2253,7 @@ msgstr "Egal" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Erreur" @@ -2158,6 +2265,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Erreur" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2167,6 +2280,7 @@ msgstr "" #: Source/Core/Common/Src/ChunkFile.h:180 #, c-format msgid "" +<<<<<<< HEAD "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" @@ -2174,6 +2288,8 @@ msgstr "" #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format msgid "" +======= +>>>>>>> Update translation files for recent changes in the code. "Error: Trying to access %s fonts but they are not loaded. Games may not show " "fonts correctly, or crash." msgstr "" @@ -2619,9 +2735,15 @@ msgstr "Images à enregistrer :" msgid "Free Look" msgstr "Vue libre" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "Français" @@ -2688,7 +2810,11 @@ msgid "Gamecube &Pad Settings" msgstr "Paramètres de la &manette GameCube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Carte mémoires de GameCube (*.raw,*.gcp)" @@ -2711,8 +2837,12 @@ msgstr "" "(ou c'est un mauvais code, ou il n'est pas encore pris en charge.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< 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/VideoConfigDiag.cpp:204 msgid "General" msgstr "Général" @@ -2721,9 +2851,15 @@ msgstr "Général" msgid "General Settings" msgstr "Paramètres généraux" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "Allemand" @@ -2746,6 +2882,10 @@ msgid "Greater Than" msgstr "Plus grand que" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +<<<<<<< HEAD +======= +#, fuzzy +>>>>>>> Update translation files for recent changes in the code. msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2759,8 +2899,11 @@ msgstr "" "effets de rendu vers texture.\n" "Le fait d'augmenter la résolution interne améliore l'impact de cette " "option.\n" +<<<<<<< HEAD "Baisse légèrement les performances et peut provoquer quelques pépins (mais " "peu probable).\n" +======= +>>>>>>> Update translation files for recent changes in the code. "\n" "Dans le doute, cochez cette case." @@ -2859,8 +3002,12 @@ msgid "Hotkey Configuration" msgstr "Configuration des raccourcis clavier" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< 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. msgid "Hotkeys" msgstr "Raccourcis clavier" @@ -2941,7 +3088,11 @@ msgstr "" "Si les FPS ne sont pas corrects, cette option peut résoudre le souci. (ON = " "Compatible, OFF = Vitesse)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 +>>>>>>> Update translation files for recent changes in the code. 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." @@ -3085,7 +3236,11 @@ msgstr "" "InstallExceptionHandler a été appelé, mais cette plateforme ne le prend pas " "encore en charge." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "Installation du WAD..." @@ -3167,9 +3322,15 @@ msgstr "Fichier d'enregitrement non valide" msgid "Invalid state" msgstr "Etat non valide" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "Italien" @@ -3327,11 +3488,19 @@ msgstr "Charger l'état du Slot 8" msgid "Load State..." msgstr "Charger un état..." +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "Charger le Menu Système Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Charger le Menu Système Wii %d%c" @@ -3415,7 +3584,11 @@ msgstr "Hack de vitesse pour le MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Fichiers MadCatz Gameshark (*.gcs)" +<<<<<<< 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/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Stick principal" @@ -3446,7 +3619,11 @@ msgid "Memory Byte" msgstr "Octet mémoire" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "Carte mémoire" @@ -3647,7 +3824,11 @@ msgstr "NP Tabulation" msgid "NP Up" msgstr "NP Haut" +<<<<<<< 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/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3734,7 +3915,11 @@ msgstr "Différent" msgid "Not Set" msgstr "Non défini" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "Non connectée" @@ -3795,7 +3980,10 @@ msgstr "%d blocs disponibles seulement" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Ouvrir" @@ -3927,8 +4115,13 @@ msgstr "Patchs" msgid "Paths" msgstr "Chemins" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: 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/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -3948,8 +4141,13 @@ msgstr "Perspective %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< 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. msgid "Play" msgstr "Démarrer" @@ -3975,7 +4173,11 @@ msgstr "Options de lecture" msgid "Players" msgstr "Joueurs" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "Veuillez confirmer..." @@ -4187,10 +4389,17 @@ msgstr "Rafraîchir la liste" msgid "Refresh game list" msgstr "Rafraîchir la liste des jeux" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "Retirer" @@ -4209,7 +4418,10 @@ msgid "Render to Main Window" msgstr "Rendu dans la fenêtre principale" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reset" @@ -4252,7 +4464,11 @@ msgstr "Sau&vegarder l'état" msgid "Safe" msgstr "Sûr " +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Echantillonnage :" @@ -4378,12 +4594,21 @@ msgstr "La section %s n'a pas été trouvée dans SYSCONF" msgid "Select" msgstr "Select" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Sélectionner le fichier d'enregistrement" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Sélectionner un fichier WAD de Wii à installer" @@ -4409,6 +4634,7 @@ msgstr "Sélectionner les fenêtres flottantes" msgid "Select the file to load" msgstr "Sélectionner le fichier à charger" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Sélectionner le fichier à enregistrer" @@ -4418,6 +4644,17 @@ msgid "Select the state to load" msgstr "Sélectionner l'état à charger" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Sélectionner le fichier à enregistrer" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Sélectionner l'état à charger" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Sélectionner l'état à enregistrer" @@ -4493,7 +4730,11 @@ msgstr "Séparateur" msgid "Serbian" msgstr "Serbe" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4722,6 +4963,7 @@ msgid "Skip EFB Access from CPU" msgstr "Ignorer l'accès à l'EFB depuis le CPU" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +<<<<<<< HEAD msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4742,6 +4984,28 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +======= +msgid "" +"Skip the destination alpha pass used in many games for various graphical " +"effects.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"Saute la passe alpha de destination, utilisée dans beaucoup de jeux pour " +"divers effets graphiques.\n" +"\n" +"Dans le doute, décochez cette case." + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +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" +"\n" +"If unsure, leave this unchecked." +msgstr "" +>>>>>>> Update translation files for recent changes in the code. "Accélère légèrement les copies d'EFB vers la RAM en sacrifiant la précision " "de l'émulation.\n" "Améliore parfois la qualité visuelle.\n" @@ -4803,9 +5067,15 @@ msgstr "Echec de la création du buffer audio : %s" msgid "Space" msgstr "Espace" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "Espagnol" @@ -4849,7 +5119,11 @@ msgstr "Stick carré" msgid "Standard Controller" msgstr "Contrôleur standard" +<<<<<<< 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/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4884,7 +5158,10 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Arrêter" @@ -4961,7 +5238,10 @@ msgstr "Table Droite" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "Capture d'écran" @@ -5211,12 +5491,19 @@ msgstr "Activer tous les types de journaux" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "Activer le plein écran" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "Haut" @@ -5323,6 +5610,17 @@ msgstr "Reception d'un message inconnu avec l'ID : %d" #: Source/Core/Core/Src/NetPlayServer.cpp:504 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" +<<<<<<< HEAD +======= +msgstr "" +"Message inconnu avec l'ID %d reçue du lecteur %d. Banissement du lecteur !" + +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +>>>>>>> Update translation files for recent changes in the code. msgstr "" "Message inconnu avec l'ID %d reçue du lecteur %d. Banissement du lecteur !" @@ -5551,7 +5849,11 @@ msgstr "Racine de la NAND (Wii) :" msgid "Wii Save Import" msgstr "Importer une sauvegarde Wii" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Fichiers de sauvegarde Wii (*.bin)|*.bin" @@ -5582,7 +5884,11 @@ 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 #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiimote connectée" @@ -5614,9 +5920,15 @@ msgstr "Windows Droit" msgid "Word Wrap" msgstr "Casse" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "Travail..." diff --git a/Languages/po/he.po b/Languages/po/he.po index 498fb36d91..857ec27567 100644 --- a/Languages/po/he.po +++ b/Languages/po/he.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< 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. "PO-Revision-Date: 2011-01-08 20:50+0200\n" "Last-Translator: Ely \n" "Language-Team: \n" @@ -506,9 +510,15 @@ msgstr "" msgid "Add new pane" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "" @@ -562,8 +572,13 @@ msgstr "" msgid "All Gamecube GCM files (gcm)" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "" @@ -641,7 +656,11 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" +<<<<<<< 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/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -662,7 +681,11 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" +<<<<<<< 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/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "" @@ -771,7 +794,11 @@ msgid "Blue Right" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "" @@ -804,7 +831,11 @@ msgstr "" msgid "Buffer:" msgstr "" +<<<<<<< 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/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1026,7 +1057,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< 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/VideoConfigDiag.cpp:592 msgid "Close" msgstr "" @@ -1135,7 +1170,11 @@ msgstr "" msgid "Connect Wiimote 4" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "" @@ -1310,7 +1349,11 @@ msgid "DSP Emulator Engine" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "" @@ -1520,7 +1563,11 @@ msgstr "" msgid "Divide" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "" @@ -1549,13 +1596,22 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Dolphin GCPad Configuration" msgstr "הגדרות גרפיקה" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1638,9 +1694,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "" @@ -1763,15 +1825,22 @@ msgstr "" msgid "Enable Block Merging" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "" @@ -1897,9 +1966,15 @@ msgstr "" msgid "End" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "" @@ -1928,6 +2003,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "" @@ -1939,6 +2015,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2353,9 +2435,15 @@ msgstr "" msgid "Free Look" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "" @@ -2424,7 +2512,11 @@ msgid "Gamecube &Pad Settings" msgstr "הגדרות קול" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2445,8 +2537,12 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< 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/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2456,9 +2552,15 @@ msgstr "" msgid "General Settings" msgstr "הגדרות קול" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "" @@ -2573,8 +2675,12 @@ msgid "Hotkey Configuration" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< 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. msgid "Hotkeys" msgstr "" @@ -2764,7 +2870,11 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "" @@ -2841,9 +2951,15 @@ msgstr "" msgid "Invalid state" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "" @@ -2994,11 +3110,19 @@ msgstr "" msgid "Load State..." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -3076,7 +3200,11 @@ msgstr "" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" +<<<<<<< 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/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3107,7 +3235,11 @@ msgid "Memory Byte" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "" @@ -3284,7 +3416,11 @@ msgstr "" msgid "NP Up" msgstr "" +<<<<<<< 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/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3371,7 +3507,11 @@ msgstr "" msgid "Not Set" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "" @@ -3432,7 +3572,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "" @@ -3558,8 +3701,13 @@ msgstr "" msgid "Paths" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: 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/WXInputBase.cpp:48 msgid "Pause" msgstr "" @@ -3579,8 +3727,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< 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. msgid "Play" msgstr "" @@ -3606,7 +3759,11 @@ msgstr "" msgid "Players" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "" @@ -3812,10 +3969,17 @@ msgstr "" msgid "Refresh game list" msgstr "" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "" @@ -3831,7 +3995,10 @@ msgid "Render to Main Window" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "" @@ -3874,7 +4041,11 @@ msgstr "" msgid "Safe" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "" @@ -3958,7 +4129,11 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Scanning %s" msgstr "" @@ -3998,12 +4173,21 @@ msgstr "" msgid "Select" msgstr "" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "" @@ -4026,6 +4210,7 @@ msgstr "" msgid "Select the file to load" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "" @@ -4035,6 +4220,17 @@ msgid "Select the state to load" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "" @@ -4370,9 +4566,15 @@ msgstr "" msgid "Space" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "" @@ -4408,7 +4610,11 @@ msgstr "" msgid "Standard Controller" msgstr "" +<<<<<<< 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/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4443,7 +4649,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "" @@ -4515,7 +4724,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "" @@ -4727,12 +4939,19 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "" @@ -4834,6 +5053,16 @@ msgstr "" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5036,7 +5265,11 @@ msgstr "" msgid "Wii Save Import" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5063,7 +5296,11 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "" @@ -5095,9 +5332,15 @@ msgstr "" msgid "Word Wrap" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "" diff --git a/Languages/po/hu.po b/Languages/po/hu.po index d39eec28db..2a61a06212 100644 --- a/Languages/po/hu.po +++ b/Languages/po/hu.po @@ -7,8 +7,13 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-12-18 13:41-0600\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +"PO-Revision-Date: 2011-06-04 14:29+0100\n" +>>>>>>> Update translation files for recent changes in the code. "Last-Translator: Delirious \n" "Language-Team: Delirious \n" "Language: Hungarian\n" @@ -74,7 +79,11 @@ msgid "%s failed to be scrubbed. Probably the image is corrupt." msgstr "%s tisztítása sikertelen. Valószínűleg a képfájl sérült." #: Source/Core/Core/Src/HW/GCMemcard.cpp:97 +<<<<<<< HEAD #, c-format +======= +#, fuzzy, c-format +>>>>>>> Update translation files for recent changes in the code. msgid "" "%s failed to load as a memorycard \n" " Card file size is invalid (0x%x bytes)" @@ -83,7 +92,11 @@ msgstr "" " A kártya fájlmérete nem megfelelő (0x%x bájt)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:112 +<<<<<<< HEAD #, c-format +======= +#, fuzzy, c-format +>>>>>>> Update translation files for recent changes in the code. msgid "" "%s failed to load as a memorycard \n" " Card size is invalid (0x%x bytes)" @@ -429,6 +442,10 @@ msgid "Accurate VBeam emulation" msgstr "Pontos VBeam emuláció" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +<<<<<<< HEAD +======= +#, fuzzy +>>>>>>> Update translation files for recent changes in the code. msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -554,9 +571,15 @@ msgstr "Patch hozzáadása" msgid "Add new pane" msgstr "Új mező hozzáadása" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "Hozzáadás..." @@ -626,8 +649,13 @@ 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 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Minden állásmentés (sav, s##)" @@ -656,8 +684,14 @@ msgstr "" "Ha bizonytalan vagy, hagyd kijelöletlenül." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +<<<<<<< HEAD msgid "Alternate Wiimote Timing" msgstr "Változtatható Wiimote időzítés" +======= +#, fuzzy +msgid "Alternate Wiimote Timing" +msgstr "Emulált Wiimote" +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -715,7 +749,11 @@ 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 #: 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/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Képarány:" @@ -736,7 +774,11 @@ msgstr "Hang feldolgozó:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Hiba az AO eszköz megnyitásakor.\n" +<<<<<<< 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/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automatikus" @@ -853,7 +895,11 @@ msgid "Blue Right" msgstr "Kék jobbra" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "Lent" @@ -886,7 +932,11 @@ msgstr "Kimeneti könyvtár tallózása" msgid "Buffer:" msgstr "Puffer:" +<<<<<<< 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/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1132,7 +1182,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< 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/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Bezárás" @@ -1241,7 +1295,11 @@ msgstr "Wiimote 3 csatlakoztatása" msgid "Connect Wiimote 4" msgstr "Wiimote 4 csatlakoztatása" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "Csatlakozás..." @@ -1431,7 +1489,11 @@ msgid "DSP Emulator Engine" msgstr "DSP emulátor motor" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emuláció (gyors)" @@ -1664,7 +1726,11 @@ msgstr "" msgid "Divide" msgstr "Megosztás" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Le akarod állítani az éppen működő emulációt?" @@ -1693,12 +1759,21 @@ msgstr "Dolphin emulált Wiimote beállítások" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +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. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS videók (*.dtm)" @@ -1795,9 +1870,15 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "Holland" @@ -1941,15 +2022,22 @@ msgstr "BAT használata" msgid "Enable Block Merging" msgstr "Blokk csatlakozás használata" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Gyorsítótár használata" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "Csalások használata" @@ -2105,9 +2193,15 @@ msgstr "" msgid "End" msgstr "Vége" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "Angol" @@ -2136,6 +2230,7 @@ msgstr "Egyenlő" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Hiba" @@ -2147,6 +2242,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Hiba" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2606,9 +2707,15 @@ msgstr "Rögzítendő képkockák" msgid "Free Look" msgstr "Szabad nézet" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "Francia" @@ -2675,7 +2782,11 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube &irányító beállítások" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube memóriakártyák (*.raw,*.gcp)" @@ -2698,8 +2809,12 @@ msgstr "" "(vagy rossz a kód vagy a kód típus még nem támogatott.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< 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/VideoConfigDiag.cpp:204 msgid "General" msgstr "Általános" @@ -2708,9 +2823,15 @@ msgstr "Általános" msgid "General Settings" msgstr "Általános beállítások" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "Német" @@ -2732,6 +2853,10 @@ msgid "Greater Than" msgstr "Nagyobb mint" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +<<<<<<< HEAD +======= +#, fuzzy +>>>>>>> Update translation files for recent changes in the code. msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2842,8 +2967,12 @@ msgid "Hotkey Configuration" msgstr "Gyorsbillentyű beállítások" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< 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. msgid "Hotkeys" msgstr "Gyorsbill." @@ -3068,7 +3197,11 @@ msgid "" msgstr "" "InstallExceptionHandler előidézve, de ez a platform még nem támogatja azt." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "WAD telepítése..." @@ -3150,9 +3283,15 @@ msgstr "Nem megfelelő rögzített fájl" msgid "Invalid state" msgstr "Nem megfelelő mentés" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "Olasz" @@ -3310,11 +3449,19 @@ msgstr "Állás betöltése a 8. helyről" msgid "Load State..." msgstr "Állás betöltése..." +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "Wii rendszer menü betöltése" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii rendszer menü betöltése %d%c" @@ -3396,7 +3543,11 @@ msgstr "MMU sebesség növelő hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark fájlok (*.gcs)" +<<<<<<< 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/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Főkar" @@ -3427,7 +3578,11 @@ msgid "Memory Byte" msgstr "Memória bájt" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "Memóriakártya" @@ -3625,7 +3780,11 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< 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/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3712,7 +3871,11 @@ msgstr "Nem egyenlő" msgid "Not Set" msgstr "Nincs beállítva" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "Nincs csatlakoztatva" @@ -3773,7 +3936,10 @@ msgstr "Csak %d blokk szabad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Megnyitás" @@ -3904,8 +4070,13 @@ msgstr "Javítások" msgid "Paths" msgstr "Mappák" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: 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/WXInputBase.cpp:48 msgid "Pause" msgstr "Szünet" @@ -3925,8 +4096,13 @@ msgstr "%d perspektíva" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< 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. msgid "Play" msgstr "Indítás" @@ -3952,7 +4128,11 @@ msgstr "Visszajátszási lehetőségek" msgid "Players" msgstr "Játékosok" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "Változtatás jóváhagyása..." @@ -4163,10 +4343,17 @@ msgstr "A lista frissítése" msgid "Refresh game list" msgstr "Játéklista frissítése" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "Törlés" @@ -4185,7 +4372,10 @@ msgid "Render to Main Window" msgstr "Megjelenítés a főablakban" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Alapra állítás" @@ -4228,7 +4418,11 @@ msgstr "Ál&lás mentése" msgid "Safe" msgstr "Biztonságos" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Mintavételezési frekvencia:" @@ -4312,7 +4506,11 @@ 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 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Keresés %s" @@ -4352,12 +4550,21 @@ msgstr "%s rész nem található a SYSCONF fájlban" msgid "Select" msgstr "Választás" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Válassz rögzítendő fájlt" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Válassz telepítendő Wii WAD fájlt" @@ -4383,6 +4590,7 @@ msgstr "Válassz lebegő ablakokat" msgid "Select the file to load" msgstr "Betöltendő fájl kiválasztása" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Válassz mentési fájlt" @@ -4392,6 +4600,17 @@ msgid "Select the state to load" msgstr "Válassz betöltendő állásmentést" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Válassz mentési fájlt" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Válassz betöltendő állásmentést" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Válassz mentendő állást" @@ -4773,9 +4992,15 @@ msgstr "Hang puffer létrehozása sikertelen: %s" msgid "Space" msgstr "Szóköz" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "Spanyol" @@ -4819,7 +5044,11 @@ msgstr "Negyzetes kar" msgid "Standard Controller" msgstr "Normál irányító" +<<<<<<< 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/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4854,7 +5083,10 @@ msgstr "Kar" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Leállítás" @@ -4910,6 +5142,10 @@ msgstr "TAJVAN" #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 +<<<<<<< HEAD +======= +#, fuzzy +>>>>>>> Update translation files for recent changes in the code. msgid "TAS Input" msgstr "TAS bemenet" @@ -4932,7 +5168,10 @@ msgstr "Tábla jobbra" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "Pillanatkép készítése" @@ -5178,12 +5417,19 @@ msgstr "Minden napló típus kijelölése" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "Váltás teljes nézetre" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "Fent" @@ -5294,6 +5540,18 @@ 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 +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"Ismeretlen mutató %#08x\n" +"Folytatod?" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5517,7 +5775,11 @@ msgstr "Wii NAND gyökér könyvtár:" msgid "Wii Save Import" msgstr "Wii mentés importálása" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii mentés fájlok (*.bin)|*.bin" @@ -5548,7 +5810,11 @@ msgstr "" "esetleg az üresjárati időkorlát letelt vagy egyéb ok miatt történt.\n" "Újra akarod csatlakoztatni most?" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiimote csatlakoztatva" @@ -5580,9 +5846,15 @@ msgstr "Jobb Windows" msgid "Word Wrap" msgstr "Word Wrap" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "Folyamatban..." diff --git a/Languages/po/it.po b/Languages/po/it.po index 6be9fd979c..c27de2da97 100644 --- a/Languages/po/it.po +++ b/Languages/po/it.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< 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. "PO-Revision-Date: 2011-04-08 20:40+0100\n" "Last-Translator: RebuMan, Dolphin Team\n" "Language-Team: \n" @@ -552,9 +556,15 @@ msgstr "Aggiungi Patch" msgid "Add new pane" msgstr "Aggiungi nuovo riquadro" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "Aggiungi..." @@ -626,8 +636,13 @@ 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 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Tutti gli Stati di Gioco Salvati (sav, s##)" @@ -711,7 +726,11 @@ 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 #: 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/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Aspetto:" @@ -732,7 +751,11 @@ msgstr "Interfaccia Audio:" msgid "AudioCommon: Error opening AO device.\n" msgstr "Audiocommon: Errore nell'apertura della periferica AO.\n" +<<<<<<< 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/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -845,7 +868,11 @@ msgid "Blue Right" msgstr "Blu Destro" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "Sotto" @@ -878,7 +905,11 @@ msgstr "Cerca una directory di destinazione" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< 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/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1116,7 +1147,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< 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/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Chiudi" @@ -1226,7 +1261,11 @@ msgstr "Collega Wiimote 3" msgid "Connect Wiimote 4" msgstr "Collega Wiimote 4" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "Connessione in corso..." @@ -1415,7 +1454,11 @@ msgid "DSP Emulator Engine" msgstr "Motore di Emulazione DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulazione DSP HLE (veloce)" @@ -1635,7 +1678,11 @@ msgstr "Visualizza i tasti di input letti dall'emulatore." msgid "Divide" msgstr "/" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Vuoi interrompere l'emulazione in corso?" @@ -1664,12 +1711,21 @@ msgstr "Dolphin - Configurazione Wiimote Emulato" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +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. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmati TAS Dolphin (*.dtm)" @@ -1758,9 +1814,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "Olandese" @@ -1889,16 +1951,23 @@ msgstr "Attiva BAT" msgid "Enable Block Merging" msgstr "Attiva Unione Blocchi" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "Attiva Cache" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "Abilita Trucchi" @@ -2039,9 +2108,15 @@ msgstr "" msgid "End" msgstr "Fine" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "Inglese" @@ -2070,6 +2145,7 @@ msgstr "Uguale" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Errore/i" @@ -2081,6 +2157,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Errore/i" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2545,9 +2627,15 @@ msgstr "Fotogrammi da Registrare:" msgid "Free Look" msgstr "Visuale Libera" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "Francese" @@ -2615,7 +2703,11 @@ msgid "Gamecube &Pad Settings" msgstr "Impostazioni &Controlli GameCube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Schede di Memoria GameCube (*.raw,*.gcp)" @@ -2638,8 +2730,12 @@ msgstr "" "(codice corrotto oppure tipo di codice non ancora supportato.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< 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/VideoConfigDiag.cpp:204 msgid "General" msgstr "Generale" @@ -2649,9 +2745,15 @@ msgstr "Generale" msgid "General Settings" msgstr "Impostazioni Interfaccia" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "Tedesco" @@ -2776,8 +2878,12 @@ msgid "Hotkey Configuration" msgstr "Configurazione Tasti di Scelta Rapida" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< 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. msgid "Hotkeys" msgstr "Tasti di Scelta Rapida" @@ -2991,7 +3097,11 @@ msgstr "" "E' stata sollevata un'Eccezione all'Installazione, tuttavia questa " "piattaforma non la supporta ancora." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "Installazione WAD..." @@ -3075,9 +3185,15 @@ msgstr "File di registrazione non valido" msgid "Invalid state" msgstr "Stato non valido" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "Italiano" @@ -3236,12 +3352,20 @@ msgstr "Carica Stato di Gioco dall'Ingresso 8" msgid "Load State..." msgstr "Carica Stato di Gioco..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "Carica il Menu di Sistema Wii %d%c" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carica il Menu di Sistema Wii %d%c" @@ -3324,7 +3448,11 @@ msgstr "Hack Velocità MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "File MadCatz Gameshark(*.gcs)" +<<<<<<< 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/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Levetta Principale" @@ -3355,7 +3483,11 @@ msgid "Memory Byte" msgstr "Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "Scheda di Memoria" @@ -3541,7 +3673,11 @@ msgstr "TN Tab" msgid "NP Up" msgstr "TN Su" +<<<<<<< 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/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3628,7 +3764,11 @@ msgstr "Diverso" msgid "Not Set" msgstr "Non Impostato" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "Non collegato" @@ -3689,7 +3829,10 @@ msgstr "Solo %d blocchi disponibili" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Apri" @@ -3823,8 +3966,13 @@ msgstr "Patches" msgid "Paths" msgstr "Percorsi" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: 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/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -3845,8 +3993,13 @@ msgstr "Prospettiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< 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. msgid "Play" msgstr "Gioca" @@ -3872,7 +4025,11 @@ msgstr "Opzioni di Riproduzione" msgid "Players" msgstr "Giocatori" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "Per favore confermare..." @@ -4086,10 +4243,17 @@ msgstr "Aggiorna Elenco" msgid "Refresh game list" msgstr "Aggiorna elenco giochi" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "Rimuovi" @@ -4108,7 +4272,10 @@ msgid "Render to Main Window" msgstr "Rendering nella finestra Principale" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Resetta" @@ -4151,7 +4318,11 @@ msgstr "Sa&lva Stato di Gioco" msgid "Safe" msgstr "Accurata" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Frequenza di Campionamento:" @@ -4236,7 +4407,11 @@ msgstr "Il salvataggio del filmato %s è corrotto, arresto registrazione..." msgid "Scaled EFB Copy" msgstr "Scala Copie EFB" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "Ricerca..." @@ -4276,12 +4451,21 @@ msgstr "Sezione %s non trovata in SYSCONF" msgid "Select" msgstr "Seleziona" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Seleziona il File di Registrazione" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Seleziona un file WAD Wii da installare" @@ -4307,6 +4491,7 @@ msgstr "Seleziona finestre libere/mobili" msgid "Select the file to load" msgstr "Seleziona il file da caricare" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Seleziona il file di salvataggio" @@ -4316,6 +4501,17 @@ msgid "Select the state to load" msgstr "Seleziona lo stato di gioco da caricare" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Seleziona il file di salvataggio" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Seleziona lo stato di gioco da caricare" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Seleziona lo stato di gioco da salvare" @@ -4670,9 +4866,15 @@ msgstr "Creazione buffer audio non riuscita: %s" msgid "Space" msgstr "Spazio" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "Spagnolo" @@ -4708,7 +4910,11 @@ msgstr "Levetta Quadrata" msgid "Standard Controller" msgstr "Controller Standard" +<<<<<<< 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/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4743,7 +4949,10 @@ msgstr "Levetta" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Arresta" @@ -4816,7 +5025,10 @@ msgstr "Semipiano destro" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "Genera un'Istantanea di Gioco" @@ -5061,12 +5273,19 @@ msgstr "Seleziona/Deseleziona tutti i Tipi di Log" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "Commuta a Schermo Intero" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "Sopra" @@ -5172,6 +5391,18 @@ msgstr "" "Messaggio sconosciuto avente id:%d ricevuto dal giocatore:%d Giocatore " "espluso!!" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"Puntatore %#08x sconosciuto\n" +"Continuare?" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5384,7 +5615,11 @@ msgstr "Origine DVD:" msgid "Wii Save Import" msgstr "Importa Salvataggi Wii" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Salva i file Wii (*.bin)|*.bin" @@ -5415,7 +5650,11 @@ msgstr "" " o forse è dovuto ad altri motivi. \n" "Vuoi riconnettersi immediatamente?" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiimote Collegato" @@ -5448,9 +5687,15 @@ msgstr "Windows Destro" msgid "Word Wrap" msgstr "Adatta Testo" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "Attività in corso..." diff --git a/Languages/po/ja.po b/Languages/po/ja.po index d0e94ebb39..dc9751b1b1 100644 --- a/Languages/po/ja.po +++ b/Languages/po/ja.po @@ -7,8 +7,13 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" "PO-Revision-Date: 2011-10-12 20:45+0900\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +"PO-Revision-Date: 2011-08-19 08:37-0500\n" +>>>>>>> Update translation files for recent changes in the code. "Last-Translator: DanbSky\n" "Language-Team: \n" "Language: Japanese\n" @@ -426,6 +431,10 @@ msgid "Accurate VBeam emulation" msgstr "Accurate VBeam emulation" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +<<<<<<< HEAD +======= +#, fuzzy +>>>>>>> Update translation files for recent changes in the code. msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -550,9 +559,15 @@ msgstr "パッチを追加" msgid "Add new pane" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "追加" @@ -618,8 +633,13 @@ msgstr "全ての GC/Wii イメージ (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "GC GCMファイル (gcm)|*.gcm" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "全てのステートセーブファイル (sav, s##)" @@ -648,8 +668,14 @@ msgstr "" "よく分からなければ、チェックを入れないでください。" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +<<<<<<< HEAD msgid "Alternate Wiimote Timing" msgstr "Wii リモコンの同期調整" +======= +#, fuzzy +msgid "Alternate Wiimote Timing" +msgstr "Wii リモコンをエミュレート" +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -707,7 +733,11 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "このタイトルの実体ファイルを削除しますか？元に戻すことはできません！" +<<<<<<< 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/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "アスペクト比：" @@ -728,7 +758,11 @@ msgstr "出力API (Audio Backend)" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error opening AO device.\n" +<<<<<<< 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/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "自動" @@ -843,7 +877,11 @@ msgid "Blue Right" msgstr "青 - 右" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "下部" @@ -876,7 +914,11 @@ msgstr "出力先を選択" msgid "Buffer:" msgstr "バッファ：" +<<<<<<< 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/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1123,7 +1165,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< 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/VideoConfigDiag.cpp:592 msgid "Close" msgstr "閉じる" @@ -1232,7 +1278,11 @@ msgstr "3PのWii リモコンを接続／切断" msgid "Connect Wiimote 4" msgstr "4PのWii リモコンを接続／切断" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "接続中..." @@ -1423,7 +1473,11 @@ msgid "DSP Emulator Engine" msgstr "DSPエミュレーション方式" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP-HLE エミュレーション (高速)" @@ -1654,7 +1708,11 @@ msgstr "" msgid "Divide" msgstr "Divide" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "動作中のゲームを停止しますか？" @@ -1683,12 +1741,21 @@ msgstr "Wii リモコンのエミュレーション設定" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +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. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS ムービー (*.dtm)" @@ -1785,9 +1852,15 @@ msgstr "" "\n" "よく分からなければ、チェックを入れないでください。" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "オランダ語" @@ -1931,15 +2004,22 @@ msgstr "Enable BAT" msgid "Enable Block Merging" msgstr "Enable Block Merging" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Enable Cache" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "チートコードを有効化" @@ -2093,9 +2173,15 @@ msgstr "" msgid "End" msgstr "End" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "英語" @@ -2124,6 +2210,7 @@ msgstr "に一致する" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "エラー" @@ -2135,6 +2222,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "エラー" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2593,9 +2686,15 @@ msgstr "録画フレーム数設定" msgid "Free Look" msgstr "フリールック" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "フランス語" @@ -2662,7 +2761,11 @@ msgid "Gamecube &Pad Settings" msgstr "ゲームキューブ入力設定(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "メモリーカードファイル (*.raw,*.gcp)|*.raw;*.gcp" @@ -2685,8 +2788,12 @@ msgstr "" "(コードに問題があるか、まだサポートされていないタイプのコードです)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< 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/VideoConfigDiag.cpp:204 msgid "General" msgstr "一般" @@ -2695,9 +2802,15 @@ msgstr "一般" msgid "General Settings" msgstr "一般" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "ドイツ語" @@ -2720,6 +2833,10 @@ msgid "Greater Than" msgstr "より大きい" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +<<<<<<< HEAD +======= +#, fuzzy +>>>>>>> Update translation files for recent changes in the code. msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2829,8 +2946,12 @@ msgid "Hotkey Configuration" msgstr "ホットキーの設定" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< 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. msgid "Hotkeys" msgstr "ホットキー" @@ -3053,7 +3174,11 @@ msgstr "" "InstallExceptionHandler が呼び出されましたが、このプラットフォームはまだサ" "ポートされていません" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "WADファイルを追加しています..." @@ -3135,9 +3260,15 @@ msgstr "不正な録画ファイル" msgid "Invalid state" msgstr "不正なセーブ／ロードファイル" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "イタリア語" @@ -3295,11 +3426,19 @@ msgstr "ステートロード - スロット 8" msgid "Load State..." msgstr "ファイルからロード" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Wiiメニューを起動" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "Wiiメニューを起動" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wiiメニューを起動 ( バージョン：%d %c )" @@ -3382,7 +3521,11 @@ msgstr "MMU Speed Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark セーブファイル(*.gcs)" +<<<<<<< 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/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "コントロールスティック" @@ -3413,7 +3556,11 @@ msgid "Memory Byte" msgstr "メモリバイト" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "メモリーカード" @@ -3609,7 +3756,11 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< 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/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3696,7 +3847,11 @@ msgstr "に一致しない" msgid "Not Set" msgstr "未確認" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "未接続" @@ -3757,7 +3912,10 @@ msgstr "残り %d ブロックしかありません！" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "開く" @@ -3888,8 +4046,13 @@ msgstr "パッチ" msgid "Paths" msgstr "フォルダ" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: 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/WXInputBase.cpp:48 msgid "Pause" msgstr "一時停止" @@ -3909,8 +4072,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< 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. msgid "Play" msgstr "開始" @@ -3936,7 +4104,11 @@ msgstr "再生オプション" msgid "Players" msgstr "プレイヤー一覧" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "確認" @@ -4148,10 +4320,17 @@ msgstr "ゲームリストを再更新" msgid "Refresh game list" msgstr "ゲームリストを再更新します" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "削除" @@ -4170,7 +4349,10 @@ msgid "Render to Main Window" msgstr "メインウィンドウ部分に描画" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "初期化" @@ -4213,7 +4395,11 @@ msgstr "ステートセーブ(&V)" msgid "Safe" msgstr "Safe" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "サンプルレート" @@ -4297,7 +4483,11 @@ msgstr "Savestate movie %s の破損を確認しました。録画を中止し msgid "Scaled EFB Copy" msgstr "Scaled EFB Copy" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Scanning %s" msgstr "確認中... .%s" @@ -4337,12 +4527,21 @@ msgstr "Section %s not found in SYSCONF" msgid "Select" msgstr "選択" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "録画ファイルを選択" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "追加するWADファイルを選択" @@ -4368,6 +4567,7 @@ msgstr "" msgid "Select the file to load" msgstr "ロードするファイルを選択" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "セーブファイルを選択" @@ -4377,6 +4577,17 @@ msgid "Select the state to load" msgstr "ロードするステートセーブファイルを選択" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "セーブファイルを選択" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "ロードするステートセーブファイルを選択" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "ステートセーブの保存先を選択" @@ -4755,9 +4966,15 @@ msgstr "Sound buffer creation failed: %s" msgid "Space" msgstr "Space" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "スペイン語" @@ -4801,7 +5018,11 @@ msgstr "丸み" msgid "Standard Controller" msgstr "標準コントローラ" +<<<<<<< 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/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4836,7 +5057,10 @@ msgstr "スティック" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "停止" @@ -4913,7 +5137,10 @@ msgstr "右テーブル" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "スクリーンショット" @@ -5164,12 +5391,19 @@ msgstr "全てのログ情報を選択／解除" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "フルスクリーン表示切り替え" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "上部" @@ -5278,6 +5512,18 @@ 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 +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"不明なポインタ %#08x\n" +"続けますか？" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5501,7 +5747,11 @@ msgstr "Wii NANDルート" msgid "Wii Save Import" msgstr "Wiiのセーブデータをインポート" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wiiセーブデータ (*.bin)|*.bin" @@ -5532,7 +5782,11 @@ msgstr "" "またはしばらく入力がなかったため省電力モードに入ったのかもしれません\n" "再接続しますか？" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wii リモコン接続中" @@ -5564,9 +5818,15 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "ワードラップ" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "動作中..." @@ -6263,6 +6523,7 @@ msgstr "| (...もしくは)" #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "音声や効果音の再生によく使用されます" +<<<<<<< HEAD #~ msgid "" #~ "Unknown pointer %#08x\n" @@ -6270,6 +6531,8 @@ msgstr "| (...もしくは)" #~ msgstr "" #~ "Unknown pointer %#08x\n" #~ "Continue?" +======= +>>>>>>> Update translation files for recent changes in the code. #~ msgid "Use FPS For Limiting" #~ msgstr "有効化" diff --git a/Languages/po/ko.po b/Languages/po/ko.po index 3f8323714e..6378880eee 100644 --- a/Languages/po/ko.po +++ b/Languages/po/ko.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< 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. "PO-Revision-Date: 2011-07-07 10:24+0900\n" "Last-Translator: \n" "Language-Team: \n" @@ -549,9 +553,15 @@ msgstr "패치 추가" msgid "Add new pane" msgstr "새로운 창 추가" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "추가..." @@ -619,8 +629,13 @@ msgstr "모든 GC/Wii 이미지들 (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "모든 게임큐브 GCM 파일들 (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "모든 상태들 저장 (sav, s##)" @@ -708,7 +723,11 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "이 파일을 정말로 지우고 싶습니까? 그것은 영원히 사라집니다!" +<<<<<<< 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/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "종횡비:" @@ -729,7 +748,11 @@ msgstr "오디오 백엔드:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: AO 장치를 열기 에러.\n" +<<<<<<< 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/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "자동" @@ -844,7 +867,11 @@ msgid "Blue Right" msgstr "파랑 오른쪽" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "아래" @@ -877,7 +904,11 @@ msgstr "출력 디렉토리 둘러보기" msgid "Buffer:" msgstr "버퍼:" +<<<<<<< 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/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1118,7 +1149,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< 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/VideoConfigDiag.cpp:592 msgid "Close" msgstr "닫기" @@ -1227,7 +1262,11 @@ msgstr "위모트 3 연결" msgid "Connect Wiimote 4" msgstr "위모트 4 연결" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "연결중..." @@ -1418,7 +1457,11 @@ msgid "DSP Emulator Engine" msgstr "DSP 에뮬레이터 엔진" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE 에뮬레이션 (빠름)" @@ -1647,7 +1690,11 @@ msgstr "" msgid "Divide" msgstr "나누기" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "현재 에뮬레이션을 중단하고 싶습니까?" @@ -1676,12 +1723,21 @@ msgstr "돌핀 에뮬된 위모트 환경설정" msgid "Dolphin FIFO" msgstr "돌핀 FIFO" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +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. msgid "Dolphin TAS Movies (*.dtm)" msgstr "돌핀 TAS 동영상 (*.dtm)" @@ -1777,9 +1833,15 @@ msgstr "" "\n" "확신 없다면, 이것을 언체크로 두세요." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "네덜란드어" @@ -1922,15 +1984,22 @@ msgstr "BAT 활성" msgid "Enable Block Merging" msgstr "블록 합치기 활성" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "캐쉬 활성" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "치트 활성" @@ -2081,9 +2150,15 @@ msgstr "" msgid "End" msgstr "끝" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "영어" @@ -2112,6 +2187,7 @@ msgstr "같음" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "에러" @@ -2123,6 +2199,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "에러" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "선택된 언어 로딩 에러. 시스템 기본으로 돌아갑니다." @@ -2577,9 +2659,15 @@ msgstr "녹화할 프레임" msgid "Free Look" msgstr "자유로운 보기" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "프랑스어" @@ -2646,7 +2734,11 @@ msgid "Gamecube &Pad Settings" msgstr "게임큐브 패드 설정(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "게임큐브 메모리 카드들 (*.raw,*.gcp)" @@ -2669,8 +2761,12 @@ msgstr "" "(잘못된 코드이거나 코드 타입이 아직 지원않된다.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< 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/VideoConfigDiag.cpp:204 msgid "General" msgstr "일반" @@ -2679,9 +2775,15 @@ msgstr "일반" msgid "General Settings" msgstr "일반 설정" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "독일어" @@ -2811,8 +2913,12 @@ msgid "Hotkey Configuration" msgstr "단축키 설정" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< 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. msgid "Hotkeys" msgstr "단축키들" @@ -3034,7 +3140,11 @@ msgstr "" "InstallExceptionHandler 호출됨, 하지만 이 플랫폼은 아직 그것을 지원하지 않습" "니다." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "WAD 설치하기..." @@ -3116,9 +3226,15 @@ msgstr "비적합 기록 파일" msgid "Invalid state" msgstr "비적합 상태" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "이탈리아어" @@ -3276,11 +3392,19 @@ msgstr "슬롯8 상태 로드" msgid "Load State..." msgstr "상태 로드..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Wii 시스템 메뉴 로드" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "Wii 시스템 메뉴 로드" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii 시스템 메뉴 %d %c 로드" @@ -3362,7 +3486,11 @@ msgstr "MMU 스피드 핵" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz 게임샤크 파일들(*.gcs)" +<<<<<<< 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/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "메인 스틱" @@ -3393,7 +3521,11 @@ msgid "Memory Byte" msgstr "메모리 바이트" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "메모리 카드" @@ -3591,7 +3723,11 @@ msgstr "NP 탭" msgid "NP Up" msgstr "NP 위" +<<<<<<< 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/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3678,7 +3814,11 @@ msgstr "같지 않음" msgid "Not Set" msgstr "설정 안함" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "연결되지 않음" @@ -3739,7 +3879,10 @@ msgstr "%d 블럭들만 유용한" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "열기" @@ -3867,8 +4010,13 @@ msgstr "패치" msgid "Paths" msgstr "경로" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: 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/WXInputBase.cpp:48 msgid "Pause" msgstr "일시정지" @@ -3888,8 +4036,13 @@ msgstr "관점 %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< 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. msgid "Play" msgstr " 실행 " @@ -3915,7 +4068,11 @@ msgstr "재생 옵션" msgid "Players" msgstr "플레이어" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "확인해주세요..." @@ -4127,10 +4284,17 @@ msgstr "목록 새로 고침" msgid "Refresh game list" msgstr "게임 목록 새로 고침" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "제거" @@ -4149,7 +4313,10 @@ msgid "Render to Main Window" msgstr "메인 윈도우에 렌더" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "리셋" @@ -4192,7 +4359,11 @@ msgstr "상태 저장(&v) " msgid "Safe" msgstr "안전" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "샘플율:" @@ -4276,7 +4447,11 @@ msgstr "%s 영상 상태저장이 손상되었습니다, 영상 기록 중지... msgid "Scaled EFB Copy" msgstr "스케일된 EFB 복사" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Scanning %s" msgstr "스캐닝 %s" @@ -4316,12 +4491,21 @@ msgstr "섹션 %s를 SYSCONF에서 찾을 수 없음" msgid "Select" msgstr "선택" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "기록 파일 선택" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "설치할 Wii WAD 파일 선택" @@ -4347,6 +4531,7 @@ msgstr "유동적인 윈도우즈 선택" msgid "Select the file to load" msgstr "로드할 파일 선택" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "저장 파일을 선택" @@ -4356,6 +4541,17 @@ msgid "Select the state to load" msgstr "로드할 상태 선택" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "저장 파일을 선택" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "로드할 상태 선택" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "저장할 상태 선택" @@ -4730,9 +4926,15 @@ msgstr "사운드 버퍼 생성 실패했습니다: %s" msgid "Space" msgstr "스페이스" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "스페인어" @@ -4776,7 +4978,11 @@ msgstr "스퀘어 스틱" msgid "Standard Controller" msgstr "표준 컨트롤러" +<<<<<<< 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/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4811,7 +5017,10 @@ msgstr "스틱" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "중지" @@ -4887,7 +5096,10 @@ msgstr "테이블 오른쪽" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "스크린샷 찍기" @@ -5129,12 +5341,19 @@ msgstr "모든 로그 타입 토글" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "전체화면 토글" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "위" @@ -5242,6 +5461,18 @@ msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" "id:%d의 알려지지 않은 메시지, 플레이어:%d 플레이어 킥킹으로 부터 전달된!" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"알려지지 않은 포인터 %#08x\n" +"계속합니까?" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5463,7 +5694,11 @@ msgstr "Wii NAND 루트:" msgid "Wii Save Import" msgstr "Wii 저장 가져오기" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 저장 파일들 (*.bin)|*.bin" @@ -5494,7 +5729,11 @@ msgstr "" "혹은 아마도 아이들 타임 아웃이거나 다른 원인 때문인 것 같습니다.\n" "당신은 즉시 재연결 하고 싶습니까?" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "위모트가 연결됨" @@ -5527,9 +5766,15 @@ msgstr "윈도우즈 오른쪽" msgid "Word Wrap" msgstr "자동 줄바꿈" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "작동중..." diff --git a/Languages/po/nb.po b/Languages/po/nb.po index d922644cbf..f916e21416 100644 --- a/Languages/po/nb.po +++ b/Languages/po/nb.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< 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. "PO-Revision-Date: 2011-06-06 20:15+0100\n" "Last-Translator: Knut \n" "Language-Team: Norwegian \n" @@ -555,9 +559,15 @@ msgstr "Legg til Patch" msgid "Add new pane" msgstr "Legg til ny rute" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "Legg til..." @@ -625,8 +635,13 @@ msgstr "Alle GC/Wii-bildefiler (gcm, iso, ciso, wad)" msgid "All Gamecube GCM files (gcm)" msgstr "Alle GameCube GCM-filer (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Alle Save States (sav, s##)" @@ -718,7 +733,11 @@ msgstr "" "Er du sikker på at du vil slette denne filen?\n" "Den vil bli borte for alltid!" +<<<<<<< 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/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Aspektforhold:" @@ -739,7 +758,11 @@ msgstr "Audio Backend:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Feil ved åpning av AO-device.\n" +<<<<<<< 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/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automatisk" @@ -854,7 +877,11 @@ msgid "Blue Right" msgstr "Blå Høyre" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "Bunn" @@ -887,7 +914,11 @@ msgstr "Bla etter lagringssted" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< 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/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1130,7 +1161,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< 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/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Lukk" @@ -1239,7 +1274,11 @@ msgstr "Koble til Wiimote 3" msgid "Connect Wiimote 4" msgstr "Koble til Wiimote 4" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "Kobler til..." @@ -1429,7 +1468,11 @@ msgid "DSP Emulator Engine" msgstr "CPU Emulatormotor" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE-emulering (raskt)" @@ -1660,7 +1703,11 @@ msgstr "" msgid "Divide" msgstr "Del" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Vil du stoppe pågående emulering?" @@ -1689,12 +1736,21 @@ msgstr "Dolphin Emulert Wiimote Konfigurasjon" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +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. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS-Filmer (*.dtm)" @@ -1790,9 +1846,15 @@ msgstr "" "\n" "Hvis usikker, la stå avslått." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "Nederlansk" @@ -1935,15 +1997,22 @@ msgstr "Aktiver BAT" msgid "Enable Block Merging" msgstr "Aktiver Block Merging" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Aktiver cache" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "Aktiver Juksekoder" @@ -2098,9 +2167,15 @@ msgstr "" msgid "End" msgstr "Slutt" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "Engelsk" @@ -2129,6 +2204,7 @@ msgstr "Lik" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Feil" @@ -2140,6 +2216,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Feil" + +>>>>>>> Update translation files for recent changes in the code. #: 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." @@ -2595,9 +2677,15 @@ msgstr "Bilder Til Opptak" msgid "Free Look" msgstr "Fri Utkikk" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "Fransk" @@ -2664,7 +2752,11 @@ msgid "Gamecube &Pad Settings" msgstr "Innstillinger for &GameCube-kontroll" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "GameCube-minnekort (*.raw,*.gcp)" @@ -2687,8 +2779,12 @@ msgstr "" "(Enten en dårlig kode, eller så støttes ikke kodeformatet.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< 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/VideoConfigDiag.cpp:204 msgid "General" msgstr "Generelt" @@ -2697,9 +2793,15 @@ msgstr "Generelt" msgid "General Settings" msgstr "Generelle Innstillinger" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "Tysk" @@ -2830,8 +2932,12 @@ msgid "Hotkey Configuration" msgstr "Konfigurer Snarveistaster" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< 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. msgid "Hotkeys" msgstr "Snarveistaster" @@ -3050,7 +3156,11 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "InstallExceptionHandler kalt, men denne plattformen støtter den ikke." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "Installer WAD..." @@ -3132,9 +3242,15 @@ msgstr "Ugyldig opptaksfil" msgid "Invalid state" msgstr "Ugyldig save state" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "Italiensk" @@ -3292,11 +3408,19 @@ msgstr "Last Inn Save State Slot 8" msgid "Load State..." msgstr "Last Inn Save State..." +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "Last inn Wii System Meny" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Last inn Wii System Meny %d %c" @@ -3378,7 +3502,11 @@ msgstr "Ytelses-hack for MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark-filer(*.gcs)" +<<<<<<< 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/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Hoved-joystick" @@ -3409,7 +3537,11 @@ msgid "Memory Byte" msgstr "Memory Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "Minnekort" @@ -3607,7 +3739,11 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Opp" +<<<<<<< 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/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3694,7 +3830,11 @@ msgstr "Ikke Lik" msgid "Not Set" msgstr "Ikke Satt" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "Ikke tilkoblet" @@ -3755,7 +3895,10 @@ msgstr "Kun %d blokker tilgjengelig" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Åpne" @@ -3886,8 +4029,13 @@ msgstr "Patcher" msgid "Paths" msgstr "Mappestier" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: 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/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -3907,8 +4055,13 @@ msgstr "Perspektiv %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< 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. msgid "Play" msgstr "Spill" @@ -3934,7 +4087,11 @@ msgstr "Avspillingsalterntiver" msgid "Players" msgstr "Spillere" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "Vennligst bekreft..." @@ -4147,10 +4304,17 @@ msgstr "Oppdater liste" msgid "Refresh game list" msgstr "Oppdater spilliste" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "Fjern" @@ -4169,7 +4333,10 @@ msgid "Render to Main Window" msgstr "Render til Hovedvindu" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Restart" @@ -4212,7 +4379,11 @@ msgstr "Lagre Sa&ve State" msgid "Safe" msgstr "Sikker" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Samplingsratio:" @@ -4296,7 +4467,11 @@ msgstr "Save State-film %s er korrupt, opptak avsluttes..." msgid "Scaled EFB Copy" msgstr "Skalert EFB-kopi" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Søker i %s" @@ -4336,12 +4511,21 @@ msgstr "Seksjon %s ikke funnet i SYSCONF" msgid "Select" msgstr "Velg" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Velg Opptaksfil" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Velg en Wii WAD-fil å innstallere" @@ -4367,6 +4551,7 @@ msgstr "Velg flytvindu" msgid "Select the file to load" msgstr "Velg fil å laste" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Velg lagringsfil" @@ -4376,6 +4561,17 @@ msgid "Select the state to load" msgstr "Velg en save state å laste" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Velg lagringsfil" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Velg en save state å laste" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Velg en save state å lagre" @@ -4752,9 +4948,15 @@ msgstr "Laging av lydbuffer mislyktes: %s" msgid "Space" msgstr "Mellomrom" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "Spansk" @@ -4797,7 +4999,11 @@ msgstr "Kvadrat-joystick" msgid "Standard Controller" msgstr "Standardkontroller" +<<<<<<< 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/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4832,7 +5038,10 @@ msgstr "Joystick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Stopp" @@ -4910,7 +5119,10 @@ msgstr "Tabell Høyre" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "Ta Skjermbilde" @@ -5153,12 +5365,19 @@ msgstr "Vipp Alle Loggtyper" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "Vipp Mellom Vindu/Fullskjerm" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "Topp" @@ -5265,6 +5484,18 @@ 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 +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"Ukjent peker %#08x\n" +"Fortsett?" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5487,7 +5718,11 @@ msgstr "Wii NAND-rot:" msgid "Wii Save Import" msgstr "Importer Wii-lagringsfil" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii-lagringsfiler (*.bin)|*.bin" @@ -5518,7 +5753,11 @@ msgstr "" "eller kanskje den koblet seg fra pga. inaktivitet.\n" "Vil du koble til igjen øyeblikkelig?" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiimote Tilkoblet" @@ -5551,9 +5790,15 @@ msgstr "Windows Høyre" msgid "Word Wrap" msgstr "Ordkrumning" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "Arbeider..." diff --git a/Languages/po/nl.po b/Languages/po/nl.po index e77719aeb3..76e2b607fc 100644 --- a/Languages/po/nl.po +++ b/Languages/po/nl.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< 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. "PO-Revision-Date: 2011-08-07 16:43+0100\n" "Last-Translator: Goost \n" "Language-Team: DevPro Team. \n" @@ -556,9 +560,15 @@ msgstr "Voeg Patch toe" msgid "Add new pane" msgstr "Voeg een nieuwe paneel toe" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "Voeg toe..." @@ -626,8 +636,13 @@ msgstr "Alle GC/Wii images (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Alle Gamecube GCM bestanden (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Alle Opgeslagen Staten (sav, s##)" @@ -718,7 +733,11 @@ msgstr "" "Weet je zeker dat je dit bestand wilt verwijderen? Deze gegevens zijn niet " "terug te halen!" +<<<<<<< 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/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Beeldverhouding:" @@ -739,7 +758,11 @@ msgstr "Geluid Backend:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Fout bij het openen van een AO toestel. \n" +<<<<<<< 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/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -850,7 +873,11 @@ msgid "Blue Right" msgstr "Blauw Rechts" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "Onder" @@ -883,7 +910,11 @@ msgstr "Zoek een uitvoer folder" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< 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/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1128,7 +1159,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< 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/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Sluit" @@ -1238,7 +1273,11 @@ msgstr "Verbind Wiimote 3" msgid "Connect Wiimote 4" msgstr "Verbind Wiimote 4" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "Verbinden..." @@ -1429,7 +1468,11 @@ msgid "DSP Emulator Engine" msgstr "DSP Emulator Motor" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulatie (snel)" @@ -1662,7 +1705,11 @@ msgstr "" msgid "Divide" msgstr "Verdelen" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Wil je de emulatie stoppen?" @@ -1691,12 +1738,21 @@ msgstr "Dolphin Geëmuleerde Wiimote configuratie" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +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. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Film (*.dtm)" @@ -1791,9 +1847,15 @@ msgstr "" "\n" "In geval van twijfel leeg laten." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "Nederlands" @@ -1936,16 +1998,23 @@ msgstr "Activeer BAT" msgid "Enable Block Merging" msgstr "Activeer Block Merging" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "Activeer Cache" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "Activeer Cheats" @@ -2101,9 +2170,15 @@ msgstr "" msgid "End" msgstr "Einde" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "Engels" @@ -2132,6 +2207,7 @@ msgstr "Gelijk" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Error (Fout)" @@ -2143,6 +2219,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Error (Fout)" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2605,9 +2687,15 @@ msgstr "Frames om op te nemen" msgid "Free Look" msgstr "Vrije kijk" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "Frans" @@ -2675,7 +2763,11 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube &Pad Instellingen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube Memory Kaarten (*.raw,*.gcp)" @@ -2698,8 +2790,12 @@ msgstr "" "(ofwel een onjuiste code of het type code is nog niet ondersteund.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< 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/VideoConfigDiag.cpp:204 msgid "General" msgstr "Algemeen" @@ -2708,9 +2804,15 @@ msgstr "Algemeen" msgid "General Settings" msgstr "Algemene Instellingen" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "Duits" @@ -2841,8 +2943,12 @@ msgid "Hotkey Configuration" msgstr "Sneltoets Configuratie" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< 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. msgid "Hotkeys" msgstr "Hotkeys" @@ -3067,7 +3173,11 @@ msgstr "" "InstallExceptionHandler opgeroepen, maar dit platform ondersteund dit nog " "niet." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "WAD aan het installeren..." @@ -3150,9 +3260,15 @@ msgstr "Onjuist opname bestand" msgid "Invalid state" msgstr "Onjuiste staat" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "Italië" @@ -3310,12 +3426,20 @@ msgstr "Laad staat 8" msgid "Load State..." msgstr "Laad staat..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "Laad Wii System Menu(%d %c)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Laad Wii System Menu(%d %c)" @@ -3397,7 +3521,11 @@ msgstr "MMU Snelheids Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark bestanden(*.gcs)" +<<<<<<< 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/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3428,7 +3556,11 @@ msgid "Memory Byte" msgstr "Geheugen Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "Geheugen Kaart" @@ -3627,7 +3759,11 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Omhoog" +<<<<<<< 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/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3714,7 +3850,11 @@ msgstr "Niet gelijk" msgid "Not Set" msgstr "Niet ingesteld" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "Niet verbonden" @@ -3775,7 +3915,10 @@ msgstr "Er zijn maar %d blocks beschikaarr" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Open" @@ -3907,8 +4050,13 @@ msgstr "Patches" msgid "Paths" msgstr "Pad" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: 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/WXInputBase.cpp:48 msgid "Pause" msgstr "Pauze" @@ -3928,8 +4076,13 @@ msgstr "Perspectief %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< 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. msgid "Play" msgstr "Speel" @@ -3955,7 +4108,11 @@ msgstr "Terugspeel Opties" msgid "Players" msgstr "Spelers" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "Bevestig alsjeblieft..." @@ -4168,10 +4325,17 @@ msgstr "Lijst Verversen" msgid "Refresh game list" msgstr "Ververs de speellijst" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "Verwijder" @@ -4191,7 +4355,10 @@ msgid "Render to Main Window" msgstr "Geef weer op hoofdscherm" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Opnieuw" @@ -4234,7 +4401,11 @@ msgstr "S&la Staat Op" msgid "Safe" msgstr "Opslaan" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Sample Rate:" @@ -4319,7 +4490,11 @@ msgstr "Save staat film %s is corrupt, het opnemen van de film is gestopt..." msgid "Scaled EFB Copy" msgstr "EFB Verkleinde Kopie" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Scannen van %s" @@ -4359,12 +4534,21 @@ msgstr "Sectie %s niet gevonden in SYSCONF" msgid "Select" msgstr "Selecteer" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Selecteer de opname Bestand" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Selecteer een Wii WAD bestand om te installeren" @@ -4390,6 +4574,7 @@ msgstr "Selecteer zwevende vensters" msgid "Select the file to load" msgstr "Selecteer het bestand om het te laden" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Selecteer het save - bestand" @@ -4399,6 +4584,17 @@ msgid "Select the state to load" msgstr "Selecteer de Staat om te laden" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Selecteer het save - bestand" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Selecteer de Staat om te laden" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Selecteer de Staat om op te slaan" @@ -4771,9 +4967,15 @@ msgstr "Het aanmaken van de geluids buffer is mislukt: %s" msgid "Space" msgstr "Ruimte" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "Spaans" @@ -4817,7 +5019,11 @@ msgstr "" msgid "Standard Controller" msgstr "" +<<<<<<< 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/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4852,7 +5058,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Stop" @@ -4924,7 +5133,10 @@ msgstr "Rechter Tabel" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "Neem een Schermafdruk" @@ -5170,12 +5382,19 @@ msgstr "Zet Alle Log Types Aan" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "Volledig Scherm Inschakelen" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "Boven" @@ -5285,6 +5504,18 @@ msgstr "" "Onbekend bericht ontvagen met id : %d ontvangen van speler: %d Speler " "eruitgeschopt!" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"Onbekende pointer %#08x\n" +"Doorgaan?" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5508,7 +5739,11 @@ msgstr "Wii NAND basismap:" msgid "Wii Save Import" msgstr "Wii Save Importeren" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii save bestanden (*.bin)|*.bin" @@ -5539,7 +5774,11 @@ msgstr "" "of misschien is het te wijten aan een time-out of een andere reden.\n" "Wilt u meteen opnieuw verbinden?" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiimote Connected" @@ -5572,9 +5811,15 @@ msgstr "Venster Rechts" msgid "Word Wrap" msgstr "Regelafbreking" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "Werken..." diff --git a/Languages/po/pl.po b/Languages/po/pl.po index 6aab51aec9..39aa254b51 100644 --- a/Languages/po/pl.po +++ b/Languages/po/pl.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< 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. "PO-Revision-Date: 2011-08-12 17:04+0100\n" "Last-Translator: Krzysztof Baszczok \n" "Language-Team: Polish \n" @@ -554,9 +558,15 @@ msgstr "Dodaj łatkę" msgid "Add new pane" msgstr "Dodaj nowy panel" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "Dodaj..." @@ -624,8 +634,13 @@ msgstr "Wszystkie obrazy GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Pliki GCM" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Stany zapisu (sav, s##)" @@ -713,7 +728,11 @@ 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 #: 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/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Proporcje ekranu:" @@ -734,7 +753,11 @@ msgstr "Audio Backend :" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Błąd otwarcia urządzenia AO.\n" +<<<<<<< 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/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -849,7 +872,11 @@ msgid "Blue Right" msgstr "Niebieski prawo" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "Dół" @@ -882,7 +909,11 @@ msgstr "Szukaj folderu wyjściowego" msgid "Buffer:" msgstr "Bufor:" +<<<<<<< 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/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1083,7 +1114,11 @@ msgstr "Wybierz plik do otwarcia" msgid "Choose a memory card:" msgstr "Wybierz kartę pamięci:" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1125,7 +1160,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< 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/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Zamknij" @@ -1234,7 +1273,11 @@ msgstr "Połącz Wiilot 3" msgid "Connect Wiimote 4" msgstr "Połącz Wiilot 4" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "Łączę..." @@ -1350,7 +1393,11 @@ msgstr "Utwórz nową perspektywę" msgid "Created by KDE-Look.org" msgstr "Utworzone przez KDE-Look.org" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" @@ -1426,7 +1473,11 @@ msgid "DSP Emulator Engine" msgstr "DSP Emulator Engine" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulacja (szybkie)" @@ -1657,7 +1708,11 @@ msgstr "" msgid "Divide" msgstr "Podziel" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Zatrzymać aktualną emulację?" @@ -1686,12 +1741,21 @@ msgstr "Konfiguracja emulowanego Wiilota" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +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. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmy TAS (*.dtm)" @@ -1703,7 +1767,11 @@ msgstr "Konfiguracja Wiilot'a" msgid "Dolphin at &Google Code" msgstr "Dolphin na &Google Code" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1711,7 +1779,11 @@ msgstr "" "Program nie mógł znaleść żadnych obrazów GC/Wii ISO. Kliknij tutaj by " "przeglądać pliki..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1787,9 +1859,15 @@ msgstr "" "\n" "W razie wątpliwości, pozostaw wyłączone." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "Holenderski" @@ -1933,15 +2011,22 @@ msgstr "Włącz BAT" msgid "Enable Block Merging" msgstr "Włącz łączenie bloków" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Włącz cache" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "Włącz kody" @@ -2040,7 +2125,11 @@ msgstr "" "\n" "W razie wątpliwości, pozostaw wyłączone." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2096,9 +2185,15 @@ msgstr "" msgid "End" msgstr "Koniec" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "Angielski" @@ -2127,6 +2222,7 @@ msgstr "Równy" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Błąd" @@ -2138,6 +2234,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Błąd" + +>>>>>>> Update translation files for recent changes in the code. #: 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." @@ -2145,6 +2247,7 @@ msgstr "Błąd wczytywania wybranego języka. Ustawienia domyślne." #: Source/Core/Common/Src/ChunkFile.h:180 #, c-format msgid "" +<<<<<<< HEAD "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" @@ -2152,6 +2255,8 @@ msgstr "" #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format msgid "" +======= +>>>>>>> Update translation files for recent changes in the code. "Error: Trying to access %s fonts but they are not loaded. Games may not show " "fonts correctly, or crash." msgstr "" @@ -2592,9 +2697,15 @@ msgstr "Ramki do nagrania" msgid "Free Look" msgstr "Free Look" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "Francuski" @@ -2661,7 +2772,11 @@ msgid "Gamecube &Pad Settings" msgstr "Ustawienia &pada GC" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Karty pamięci GC (*.raw,*.gcp)" @@ -2684,8 +2799,12 @@ msgstr "" "(zły kod albo typ kodu nie jest jeszcze wspierany)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< 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/VideoConfigDiag.cpp:204 msgid "General" msgstr "Główne" @@ -2694,9 +2813,15 @@ msgstr "Główne" msgid "General Settings" msgstr "Ustawienia ogólne" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "Niemiecki" @@ -2825,8 +2950,12 @@ msgid "Hotkey Configuration" msgstr "Konfiguracja skrótów klawiszowych" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< 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. msgid "Hotkeys" msgstr "Skróty klawiszowe" @@ -2906,7 +3035,11 @@ msgstr "" "Jeśli FPS jest niezrównoważony, ta opcja może pomóc. (ON = kompatybilny, OFF " "= szybko)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 +>>>>>>> Update translation files for recent changes in the code. 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." @@ -3047,7 +3180,11 @@ msgid "" msgstr "" "InstallExceptionHandler wywołany, ale ta platforma nie wspiera go jeszcze." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "Instalacja WAD..." @@ -3129,9 +3266,15 @@ msgstr "Newłaściwy plik nagrania" msgid "Invalid state" msgstr "Niewłaściwy stan" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "Włoski" @@ -3289,11 +3432,19 @@ msgstr "Wczytaj stan Slot 8" msgid "Load State..." msgstr "Wczytaj stan..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Wczytaj Wii System Menu" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "Wczytaj Wii System Menu" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wczytaj Wii System Menu %d %c" @@ -3375,7 +3526,11 @@ msgstr "MMU Speed Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Pliki MadCatz Gameshark(*.gcs)" +<<<<<<< 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/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Główna gałka" @@ -3406,7 +3561,11 @@ msgid "Memory Byte" msgstr "Bajt pamięci" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "Karta pamięci" @@ -3604,7 +3763,11 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< 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/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3691,7 +3854,11 @@ msgstr "Nie równe" msgid "Not Set" msgstr "Nie ustawiono" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "Nie połączono" @@ -3752,7 +3919,10 @@ msgstr "Dostępnych tylko %d bloków" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Otwórz" @@ -3883,8 +4053,13 @@ msgstr "Patche" msgid "Paths" msgstr "Ścieżki" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: 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/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -3904,8 +4079,13 @@ msgstr "Perspekrtywa %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< 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. msgid "Play" msgstr "Play" @@ -3931,7 +4111,11 @@ msgstr "Opcje playback'u" msgid "Players" msgstr "Gracze" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "Potwierdź..." @@ -4142,10 +4326,17 @@ msgstr "Odśwież listę" msgid "Refresh game list" msgstr "Odśwież listę gier" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "Usuń" @@ -4164,7 +4355,10 @@ msgid "Render to Main Window" msgstr "Generuj w oknie głównym" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reset" @@ -4207,7 +4401,11 @@ msgstr "Zapisz &stan" msgid "Safe" msgstr "Bezpieczny" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Wskaźnik próbkowania:" @@ -4291,7 +4489,11 @@ msgstr "Stan zapisu filmu %s jest uszkodzony, nagrywanie zatrzymane..." msgid "Scaled EFB Copy" msgstr "Scaled EFB Copy" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Sknauję %s" @@ -4331,12 +4533,21 @@ msgstr "Nie odnaleziono sekcji %s w SYSCONF" msgid "Select" msgstr "Select" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Wybierz plik nagrania" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Wybierz plik Wii WAD do zainstalowania" @@ -4362,6 +4573,7 @@ msgstr "Select floating windows" msgid "Select the file to load" msgstr "Wybierz plik do wczytania" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Wybierz plik do zapisu" @@ -4371,6 +4583,17 @@ msgid "Select the state to load" msgstr "Wybierz stan do wczytania" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Wybierz plik do zapisu" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Wybierz stan do wczytania" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Wybierz stan do zapisu" @@ -4443,7 +4666,11 @@ msgstr "Separator" msgid "Serbian" msgstr "Serbski" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +>>>>>>> Update translation files for recent changes in the code. 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" @@ -4745,9 +4972,15 @@ msgstr "Utworzenie bufora dźwięku nie powiodło się: %s" msgid "Space" msgstr "Space" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "Hiszpański" @@ -4791,7 +5024,11 @@ msgstr "Square Stick" msgid "Standard Controller" msgstr "Standard Controller" +<<<<<<< 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/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4826,7 +5063,10 @@ msgstr "Gałka" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Stop" @@ -4903,7 +5143,10 @@ msgstr "Talerz prawo" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "Zrób zdjęcie" @@ -5148,12 +5391,19 @@ msgstr "Przełącz wszystkie typy logów" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "Przełącz na pełny ekran" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "Góra" @@ -5262,6 +5512,18 @@ 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 +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"Nieznany wskaźnik %#08x\n" +"Kontynuować?" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5484,7 +5746,11 @@ msgstr "Źródło Wii NAND:" msgid "Wii Save Import" msgstr "Import zapisów Wii" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Pliki zapisu Wii (*.bin)|*.bin" @@ -5515,7 +5781,11 @@ msgstr "" "lub zbyt długi czas nieobecności lub coś innego.\n" "Połączyć ponownie?" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiilot połączony" @@ -5547,9 +5817,15 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "Zawijanie wierszy" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "Pracuję..." diff --git a/Languages/po/pt.po b/Languages/po/pt.po index 84a31dafc3..62025d0da8 100644 --- a/Languages/po/pt.po +++ b/Languages/po/pt.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< 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. "PO-Revision-Date: 2011-07-23 15:53-0000\n" "Last-Translator: Zilaan \n" "Language-Team: Zilaan \n" @@ -556,9 +560,15 @@ msgstr "Adicionar Patch" msgid "Add new pane" msgstr "Adicionar novo painel" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "Adicionar..." @@ -627,8 +637,13 @@ msgstr "Todas as imagens GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Todos os ficheiros Gamecube GCM (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Todos os Estados Guardados (sav, s##)" @@ -718,7 +733,11 @@ msgstr "" "Tem a certeza que quer eliminar este ficheiro? Será eliminado " "permanentemente!" +<<<<<<< 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/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Proporção de ecrã:" @@ -739,7 +758,11 @@ msgstr "Áudio Backend :" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Erro ao abrir dispositivo AO.\n" +<<<<<<< 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/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automático" @@ -855,7 +878,11 @@ msgid "Blue Right" msgstr "Azul Direita" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "Inferior" @@ -888,7 +915,11 @@ msgstr "Procurar por pasta de destino" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< 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/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1136,7 +1167,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< 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/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Fechar" @@ -1245,7 +1280,11 @@ msgstr "Conectar Wiimote 3" msgid "Connect Wiimote 4" msgstr "Conectar Wiimote 4" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "A conectar..." @@ -1436,7 +1475,11 @@ msgid "DSP Emulator Engine" msgstr "Motor de Emulador DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulação de DSP HLE (rápido)" @@ -1667,7 +1710,11 @@ msgstr "" msgid "Divide" msgstr "Dividir" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Deseja parar a emulação actual?" @@ -1696,12 +1743,21 @@ msgstr "Configuração da emulação de Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +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. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS filmes (*.dtm)" @@ -1798,9 +1854,15 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "Holandês" @@ -1944,15 +2006,22 @@ msgstr "Activar BAT" msgid "Enable Block Merging" msgstr "Activar Fusão de blocos" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Activar Cache" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "Activar Cheats" @@ -2108,9 +2177,15 @@ msgstr "" msgid "End" msgstr "Fim" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "Inglês" @@ -2139,6 +2214,7 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Erro" @@ -2150,6 +2226,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Erro" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2610,9 +2692,15 @@ msgstr "Quadros para Gravar" msgid "Free Look" msgstr "Vista Livre" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "Francês" @@ -2679,7 +2767,11 @@ msgid "Gamecube &Pad Settings" msgstr "Definições de Comando &Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Cartões de memória Gamecube (*.raw,*.gcp)" @@ -2702,8 +2794,12 @@ msgstr "" "(Ou é um código com erros ou o tipo de código não é suportado.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< 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/VideoConfigDiag.cpp:204 msgid "General" msgstr "Geral" @@ -2712,9 +2808,15 @@ msgstr "Geral" msgid "General Settings" msgstr "Definições Gerais" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "Alemão" @@ -2844,8 +2946,12 @@ msgid "Hotkey Configuration" msgstr "Configuração de Teclas de atalho" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< 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. msgid "Hotkeys" msgstr "Teclas de Atalho" @@ -3069,7 +3175,11 @@ msgid "" msgstr "" "InstallExceptionHandler chamado, mas esta plataforma ainda não a suporta." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "A Instalar WAD..." @@ -3151,9 +3261,15 @@ msgstr "Ficheiro de Gravação inválido" msgid "Invalid state" msgstr "Estado Inválido" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "Italiano" @@ -3311,11 +3427,19 @@ msgstr "Carregar Estado Slot 8" msgid "Load State..." msgstr "Carregar Estado..." +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "Carregar Sistema de Menu Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar Sistema de Menu Wii %d%c" @@ -3397,7 +3521,11 @@ msgstr "MMU Hack de velocidade" msgid "MadCatz Gameshark files(*.gcs)" msgstr "ficheiros MadCatz Gameshark(*.gcs)" +<<<<<<< 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/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Stick Principal" @@ -3428,7 +3556,11 @@ msgid "Memory Byte" msgstr "Byte de Memória" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "Cartão de memória" @@ -3627,7 +3759,11 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Cima" +<<<<<<< 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/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3714,7 +3850,11 @@ msgstr "Não igual" msgid "Not Set" msgstr "Não definido" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "Não conectado" @@ -3775,7 +3915,10 @@ msgstr "Apenas %d blocos disponíveis" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Abrir" @@ -3906,8 +4049,13 @@ msgstr "Patches" msgid "Paths" msgstr "Caminhos" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: 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/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -3927,8 +4075,13 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< 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. msgid "Play" msgstr "Começar" @@ -3954,7 +4107,11 @@ msgstr "Opções de Reprodução" msgid "Players" msgstr "Jogadores" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "Por favor confirme..." @@ -4167,10 +4324,17 @@ msgstr "Actualizar Lista" msgid "Refresh game list" msgstr "Actualizar lista de Jogos" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "Remover" @@ -4189,7 +4353,10 @@ msgid "Render to Main Window" msgstr "Renderizar para a Janela Principal" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reset" @@ -4232,7 +4399,11 @@ msgstr "Gua&rdar Estado" msgid "Safe" msgstr "Seguro" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Taxa de Amostragem:" @@ -4316,7 +4487,11 @@ msgstr "O filme de Savestate %s está corrupto, gravação de filme a parar..." msgid "Scaled EFB Copy" msgstr "Cópia EFB Escalada" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Scanning %s" msgstr "A procurar %s" @@ -4356,12 +4531,21 @@ msgstr "Selecção %s não encontrada em SYSCONF" msgid "Select" msgstr "Seleccionar" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Seleccione o Ficheiro de Gravação" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Seleccione um ficheiro Wii WAD para instalar" @@ -4387,6 +4571,7 @@ msgstr "Seleccionar janelas flutuantes" msgid "Select the file to load" msgstr "Seleccione o ficheiro para carregar" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Seleccione o ficheiro de jogo guardado" @@ -4396,6 +4581,17 @@ msgid "Select the state to load" msgstr "Seleccione o estado para carregar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Seleccione o ficheiro de jogo guardado" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Seleccione o estado para carregar" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Seleccione o estado para gravar" @@ -4776,9 +4972,15 @@ msgstr "Criação do buffer de som falhou: %s" msgid "Space" msgstr "Espaço" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "Espanhol" @@ -4822,7 +5024,11 @@ msgstr "Stick quadrado" msgid "Standard Controller" msgstr "Comando padrão" +<<<<<<< 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/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4857,7 +5063,10 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Parar" @@ -4934,7 +5143,10 @@ msgstr "Table Direita" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "Tirar Screenshot" @@ -5185,12 +5397,19 @@ msgstr "Alternar Todos os Tipos de Relatório" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "Alternar Ecrã Inteiro" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "Topo" @@ -5299,6 +5518,18 @@ msgstr "" "Mensagem desconhecida com a id:%d recebida pelo jogador:%d Excluindo o " "jogador!" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"Apontador desconhecido %#08x\n" +"Continuar?" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5524,7 +5755,11 @@ msgstr "Raiz de NAND Wii:" msgid "Wii Save Import" msgstr "Importação de Jogo Guardado Wii" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Ficheiros de jogo guardado Wii (*.bin)|*.bin" @@ -5556,7 +5791,11 @@ msgstr "" "razão.\n" "Quer reconectar imediatamente?" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiimote Conectado" @@ -5589,9 +5828,15 @@ msgstr "Janelas Direita" msgid "Word Wrap" msgstr "Moldar o texto" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "A trabalhar..." @@ -6204,6 +6449,7 @@ msgstr "| OU" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Começar a janela renderizada em ecrã inteiro" +<<<<<<< HEAD #~ msgid "" #~ "Unknown pointer %#08x\n" #~ "Continue?" @@ -6211,6 +6457,8 @@ msgstr "| OU" #~ "Apontador desconhecido %#08x\n" #~ "Continuar?" +======= +>>>>>>> Update translation files for recent changes in the code. #~ 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 81320cdc3f..8f2c968751 100644 --- a/Languages/po/pt_BR.po +++ b/Languages/po/pt_BR.po @@ -7,8 +7,13 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< 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. "Last-Translator: Runo \n" "Language-Team: Portuguese (BR) \n" "Language: \n" @@ -558,9 +563,15 @@ msgstr "Adicionar Patch" msgid "Add new pane" msgstr "Adicionar novo painél" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "Adicionar..." @@ -628,8 +639,13 @@ msgstr "Todas as imagens CG/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Todos os arquivos Gamecube CGM (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Todos os Pontos de Jogo Salvos (sav, s##)" @@ -719,7 +735,11 @@ msgstr "" "Você tem certeza que quer deletar este arquivo? Ele ficará perdido para " "sempre!" +<<<<<<< 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/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Proporção:" @@ -740,7 +760,11 @@ msgstr "Backend de Audio" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Erro ao abrir o dispositivo AO.\n" +<<<<<<< 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/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automático" @@ -856,7 +880,11 @@ msgid "Blue Right" msgstr "Azul Direito" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "Embaixo" @@ -889,7 +917,11 @@ msgstr "Procurar por um diretório de saída" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< 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/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1094,7 +1126,11 @@ msgstr "Escolher um arquivo para abrir" msgid "Choose a memory card:" msgstr "Escolher um cartão de memória:" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1136,7 +1172,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< 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/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Fechar" @@ -1245,7 +1285,11 @@ msgstr "Conectar Wiimote 3" msgid "Connect Wiimote 4" msgstr "Conectar Wiimote 4" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "Conectando..." @@ -1362,7 +1406,11 @@ msgstr "Criar nova perspectiva" msgid "Created by KDE-Look.org" msgstr "Criado por KDE-Look.org" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" @@ -1436,7 +1484,11 @@ msgid "DSP Emulator Engine" msgstr "Engine de Emulação do DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulação HLE do DSP (rápido)" @@ -1667,7 +1719,11 @@ msgstr "" msgid "Divide" msgstr "Dividir" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Você quer parar a emulação atual?" @@ -1696,12 +1752,21 @@ msgstr "Configuração de Wiimote Emulado do Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +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. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmes TAS Dolphin (*.dtm)" @@ -1713,7 +1778,11 @@ msgstr "Configuração de Wiimote Dolphin" msgid "Dolphin at &Google Code" msgstr "Dolphin no &Google Code" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1721,7 +1790,11 @@ msgstr "" "Dolphin não pôde encontrar ISOs GC/Wii. Duplo-clique aqui para procurar por " "arquivos..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1797,9 +1870,15 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "Holandês" @@ -1943,15 +2022,22 @@ msgstr "Ativar BAT" msgid "Enable Block Merging" msgstr "Ativar Block Merging" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Ativar Cache" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "Ativar Cheats" @@ -2051,7 +2137,11 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2107,9 +2197,15 @@ msgstr "" msgid "End" msgstr "Fim" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "Inglês" @@ -2138,6 +2234,7 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Erro" @@ -2149,6 +2246,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Erro" + +>>>>>>> Update translation files for recent changes in the code. #: 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." @@ -2156,6 +2259,7 @@ msgstr "Erro ao carregar o idioma selecionado. Voltando ao padrão do sistema." #: Source/Core/Common/Src/ChunkFile.h:180 #, c-format msgid "" +<<<<<<< HEAD "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" @@ -2163,6 +2267,8 @@ msgstr "" #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format msgid "" +======= +>>>>>>> Update translation files for recent changes in the code. "Error: Trying to access %s fonts but they are not loaded. Games may not show " "fonts correctly, or crash." msgstr "" @@ -2605,9 +2711,15 @@ msgstr "QUadros para Capturar" msgid "Free Look" msgstr "Olhar Livre" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "Francês" @@ -2674,7 +2786,11 @@ msgid "Gamecube &Pad Settings" msgstr "Configurações de &Controle de Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Memory Cards do Gamecube (*.raw,*.gcp)" @@ -2697,8 +2813,12 @@ msgstr "" "(É um código ruim ou um tipo de código não suportado.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< 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/VideoConfigDiag.cpp:204 msgid "General" msgstr "Geral" @@ -2707,9 +2827,15 @@ msgstr "Geral" msgid "General Settings" msgstr "Configurações Gerais" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "Alemão" @@ -2840,8 +2966,12 @@ msgid "Hotkey Configuration" msgstr "Configuração de hotkey" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< 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. msgid "Hotkeys" msgstr "Hotkeys" @@ -2921,7 +3051,11 @@ msgstr "" "Se a taxa de FPS estiver instável, esta opção pode ajudar. (ON = Compatível, " "OFF = Rápido)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 +>>>>>>> Update translation files for recent changes in the code. 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." @@ -3065,7 +3199,11 @@ msgstr "" "InstallExceptionHandler foi chamado, mas esta plataforma ainda não tem " "suporte a ele." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "Instalando WAD..." @@ -3147,9 +3285,15 @@ msgstr "Arquivo de gravação inválido" msgid "Invalid state" msgstr "Estado Salvo Inválido" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "Italiano" @@ -3307,11 +3451,19 @@ msgstr "Carregar Estado do Slot 8" msgid "Load State..." msgstr "Carregar State..." +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "Carregar Menu de Sistema do Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar Menu de Sistema do Wii %d %c" @@ -3394,7 +3546,11 @@ msgstr "Hack de velocidade MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Arquivos de Gameshark MadCatz(*.gcs)" +<<<<<<< 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/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Analógico Principal" @@ -3425,7 +3581,11 @@ msgid "Memory Byte" msgstr "Byte de Memória" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "Cartão de memoria" @@ -3624,7 +3784,11 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Cima" +<<<<<<< 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/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3711,7 +3875,11 @@ msgstr "Não igual" msgid "Not Set" msgstr "Indefinido" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "Não conectado" @@ -3772,7 +3940,10 @@ msgstr "Apenas %d blocos disponíveis" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Abrir" @@ -3903,8 +4074,13 @@ msgstr "Patches" msgid "Paths" msgstr "Diretórios" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: 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/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausar" @@ -3924,8 +4100,13 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< 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. msgid "Play" msgstr "Executar" @@ -3951,7 +4132,11 @@ msgstr "Opções de Reprodução" msgid "Players" msgstr "Jogadores" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "Favor confirmar..." @@ -4162,10 +4347,17 @@ msgstr "Atualizar Lista" msgid "Refresh game list" msgstr "Atualizar a lista de jogos" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "Remover" @@ -4184,7 +4376,10 @@ msgid "Render to Main Window" msgstr "Renderizar na Janela Principal" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reiniciar" @@ -4227,7 +4422,11 @@ msgstr "Sal&var estado atual" msgid "Safe" msgstr "Seguro" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Taxa de Amostragem:" @@ -4311,7 +4510,11 @@ msgstr "O Estado Salvo capturado %s está corrompido, parando captura..." msgid "Scaled EFB Copy" msgstr "Cópia Escalada do EFB" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Escaneando %s" @@ -4351,12 +4554,21 @@ msgstr "A seção %s não foi encontrada no SYSCONF" msgid "Select" msgstr "Selecionar" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Selecione o arquivo de Gravação" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Selecione um arquivo WAD de Wii para instalar" @@ -4381,6 +4593,7 @@ msgstr "Selecionar Janelas flutuantes" msgid "Select the file to load" msgstr "Selecione um arquivo para carregar" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Selecione o arquivo de salva" @@ -4390,6 +4603,17 @@ msgid "Select the state to load" msgstr "Selecione um estado para carregar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Selecione o arquivo de salva" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Selecione um estado para carregar" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Selecione um estado para salvar" @@ -4463,7 +4687,11 @@ msgstr "Separador" msgid "Serbian" msgstr "Sérvio" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +>>>>>>> Update translation files for recent changes in the code. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4770,9 +4998,15 @@ msgstr "Falha na criação do buffer de som: %s" msgid "Space" msgstr "Barra de Espaço" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "Espanhol" @@ -4816,7 +5050,11 @@ msgstr "Analógico Quadrado" msgid "Standard Controller" msgstr "Controle Padrão" +<<<<<<< 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/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4851,7 +5089,10 @@ msgstr "Analógico" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Parar" @@ -4928,7 +5169,10 @@ msgstr "Direita da Mesa" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "Capturar Tela" @@ -5176,12 +5420,19 @@ msgstr "Ligar/Desligar Todos os Logs" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "Ir para Tela Cheia" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "Topo" @@ -5289,6 +5540,17 @@ msgstr "Menssagem desconhecida recebida com identificação: %d" #: Source/Core/Core/Src/NetPlayServer.cpp:504 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" +<<<<<<< HEAD +======= +msgstr "" +"Menssagem desconhecida com ID:%d recebida do jogador:%d Expulsando jogador!" + +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +>>>>>>> Update translation files for recent changes in the code. msgstr "" "Menssagem desconhecida com ID:%d recebida do jogador:%d Expulsando jogador!" @@ -5517,7 +5779,11 @@ msgstr "Raiz do Wii NAND" msgid "Wii Save Import" msgstr "Importar Save de Wii" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Arquivos de Salva do Wii (*.bin)|*.bin" @@ -5548,7 +5814,11 @@ msgstr "" "ou talvez tenha sido pelo tempo parado ou por outra razão.\n" "Você quer reconectar imediatamente?" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiimote Conectado" @@ -5580,9 +5850,15 @@ msgstr "Janelas da Direita" msgid "Word Wrap" msgstr "Word Wrap" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "Funcionando..." diff --git a/Languages/po/ru.po b/Languages/po/ru.po index be14918713..02636c4777 100644 --- a/Languages/po/ru.po +++ b/Languages/po/ru.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< 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. "PO-Revision-Date: 2011-01-20 14:40+0300\n" "Last-Translator: firnis \n" "Language-Team: Russian <>\n" @@ -539,9 +543,15 @@ msgstr "Добавление патча" msgid "Add new pane" msgstr "Добавить панель" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "Добавить..." @@ -596,8 +606,13 @@ msgstr "Все образа от GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Все GCM-файлы Gamecube (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Файлы быстрых сохранений (sav, s##)" @@ -678,7 +693,11 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "Вы уверены, что хотите удалить этот файл? Он исчезнет навсегда!" +<<<<<<< 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/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Соотношение сторон:" @@ -700,7 +719,11 @@ msgstr "Система вывода" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Ошибка открытия устройства вывода звука.\n" +<<<<<<< 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/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Авто" @@ -815,7 +838,11 @@ msgid "Blue Right" msgstr "Синяя справа" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "снизу" @@ -848,7 +875,11 @@ msgstr "Укажите папку для сохранения" msgid "Buffer:" msgstr "Буфер:" +<<<<<<< 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/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1082,7 +1113,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< 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/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Закрыть" @@ -1192,7 +1227,11 @@ msgstr "Подключить Wiimote 3" msgid "Connect Wiimote 4" msgstr "Подключить Wiimote 4" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "Подключение..." @@ -1378,7 +1417,11 @@ msgid "DSP Emulator Engine" msgstr "Режим эмуляции CPU" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "" @@ -1594,7 +1637,11 @@ msgstr "" msgid "Divide" msgstr "/" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Вы хотите остановить эмуляцию?" @@ -1624,12 +1671,21 @@ msgstr "Настройки эмулируемого Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +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. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1717,9 +1773,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Dutch" msgstr "Dutch" @@ -1847,16 +1909,23 @@ msgstr "Включить BAT" msgid "Enable Block Merging" msgstr "Включить совмещение блоков" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "кэшировать" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "Включить чит-коды" @@ -1997,9 +2066,15 @@ msgstr "" msgid "End" msgstr "End" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "English" msgstr "English" @@ -2029,6 +2104,7 @@ msgstr "Равно" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Ошибки" @@ -2040,6 +2116,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Ошибки" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Ошибка загрузки выбранного языка. Возвращаемся к стандартному." @@ -2474,9 +2556,15 @@ msgstr "" msgid "Free Look" msgstr "Свободный обзор" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "French" msgstr "French" @@ -2546,7 +2634,11 @@ msgid "Gamecube &Pad Settings" msgstr "Опции &контроллера Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Файлы карт памяти Gamecube (*.raw,*.gcp)" @@ -2567,8 +2659,12 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< 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/VideoConfigDiag.cpp:204 msgid "General" msgstr "Общие" @@ -2578,9 +2674,15 @@ msgstr "Общие" msgid "General Settings" msgstr "Настройки интерфейса" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "German" msgstr "German" @@ -2708,8 +2810,12 @@ msgid "Hotkey Configuration" msgstr "Настройка \"горячих\" клавиш" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< 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. msgid "Hotkeys" msgstr "Клавиши" @@ -2926,7 +3032,11 @@ msgid "" msgstr "" "Вызван InstallExceptionHandler, но ваша платформа его еще не поддерживает." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Installing WAD..." msgstr "Устанавливается WAD в меню Wii..." @@ -3011,9 +3121,15 @@ msgstr "Неверный файл записи" msgid "Invalid state" msgstr "Неверное сохранение" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Italian" msgstr "Italian" @@ -3179,12 +3295,20 @@ msgstr "Быстрая &загрузка" msgid "Load State..." msgstr "Загрузить игру..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "Загрузить Wii System Menu (%d %c)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Загрузить Wii System Menu (%d %c)" @@ -3268,7 +3392,11 @@ msgstr "Ускорить MMU (спидхак)" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Файлы Gameshark MadCatz (*.gcs)" +<<<<<<< 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/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3300,7 +3428,11 @@ msgid "Memory Byte" msgstr "Па&мять" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "Карта памяти" @@ -3478,7 +3610,11 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Вверх" +<<<<<<< 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/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3567,7 +3703,11 @@ msgstr "Не равно" msgid "Not Set" msgstr "Неизвестно" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "Не подключено" @@ -3628,7 +3768,10 @@ msgstr "Доступно только %d блоков" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Открыть" @@ -3754,8 +3897,13 @@ msgstr "Патчи" msgid "Paths" msgstr "Папки" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: 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/WXInputBase.cpp:48 msgid "Pause" msgstr "Пауза" @@ -3776,8 +3924,13 @@ msgstr "Точка %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< 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. msgid "Play" msgstr "Запуск" @@ -3805,7 +3958,11 @@ msgstr "Опции" msgid "Players" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "" @@ -4030,10 +4187,17 @@ msgstr "&Обновить список игр" msgid "Refresh game list" msgstr "Обновление списка игр" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "Удалить" @@ -4052,7 +4216,10 @@ msgid "Render to Main Window" msgstr "Выводить изображение в главное окно" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Сброс настроек" @@ -4095,7 +4262,11 @@ msgstr "Быстрое &сохранение" msgid "Safe" msgstr "безопасное" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Sample Rate:" msgstr "Частота" @@ -4188,7 +4359,11 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "Поиск..." @@ -4228,12 +4403,21 @@ msgstr "Секция %s не найдена в SYSCONF" msgid "Select" msgstr "Выбрать" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Выберите файл для записи игрового процесса" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Выберите файл сохранения для импорта" @@ -4260,6 +4444,7 @@ msgstr "" msgid "Select the file to load" msgstr "Выберите файл для запуска..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Выберите файл сохранений Wii" @@ -4269,6 +4454,17 @@ msgid "Select the state to load" msgstr "Выберите файл сохранения для загрузки" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Выберите файл сохранений Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Выберите файл сохранения для загрузки" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Выберите или укажите файл для быстрого сохранения" @@ -4629,9 +4825,15 @@ msgstr "Ошибка создания аудио-буфера %s." msgid "Space" msgstr "Пробел" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Spanish" msgstr "Spanish" @@ -4669,7 +4871,11 @@ msgstr "" msgid "Standard Controller" msgstr "" +<<<<<<< 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/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4706,7 +4912,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Стоп" @@ -4778,7 +4987,10 @@ msgstr "Правая панель" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "Сделать скриншот" @@ -5023,12 +5235,19 @@ msgstr "Включить все" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "Включение полноэкранного режима" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "сверху" @@ -5132,6 +5351,18 @@ msgstr "Получено неизвестное сообщение с id : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "Получено неизвестное сообщение с id : %d от игрока:%d Игрок выкинут!" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"Неизвестный указатель %#08x\n" +"Продолжить?" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5342,7 +5573,11 @@ msgstr "DVD-диск:" msgid "Wii Save Import" msgstr "Импорт сохранений Wii" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Файлы сохранений Wii (*.bin)|*.bin" @@ -5369,7 +5604,11 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiimote подключен" @@ -5405,9 +5644,15 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "Перенос строк" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "Подождите..." diff --git a/Languages/po/sr.po b/Languages/po/sr.po index 7f9c8580a6..098435044b 100644 --- a/Languages/po/sr.po +++ b/Languages/po/sr.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< 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. "PO-Revision-Date: 2011-03-02 21:58+0100\n" "Last-Translator: nikolassj\n" "Language-Team: \n" @@ -508,9 +512,15 @@ msgstr "Dodaj Patch " msgid "Add new pane" msgstr "Dodaj nova okna" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "Dodaj..." @@ -564,8 +574,13 @@ msgstr "" msgid "All Gamecube GCM files (gcm)" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "" @@ -645,7 +660,11 @@ 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 #: 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/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -666,7 +685,11 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" +<<<<<<< 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/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -777,7 +800,11 @@ msgid "Blue Right" msgstr "Blue right " #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "Donji deo/dno" @@ -810,7 +837,11 @@ msgstr "" msgid "Buffer:" msgstr "" +<<<<<<< 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/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1037,7 +1068,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< 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/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Zatvori" @@ -1146,7 +1181,11 @@ msgstr "" msgid "Connect Wiimote 4" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "Povezivanje..." @@ -1321,7 +1360,11 @@ msgid "DSP Emulator Engine" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "" @@ -1533,7 +1576,11 @@ msgstr "" msgid "Divide" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "" @@ -1563,12 +1610,21 @@ msgstr "" msgid "Dolphin FIFO" msgstr "Dolphin" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1651,9 +1707,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "" @@ -1776,15 +1838,22 @@ msgstr "" msgid "Enable Block Merging" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "" @@ -1910,9 +1979,15 @@ msgstr "" msgid "End" msgstr "Kraj" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "" @@ -1941,6 +2016,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Error" @@ -1952,6 +2028,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Error" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2368,9 +2450,15 @@ msgstr "" msgid "Free Look" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "" @@ -2438,7 +2526,11 @@ msgid "Gamecube &Pad Settings" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2459,8 +2551,12 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< 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/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2470,9 +2566,15 @@ msgstr "" msgid "General Settings" msgstr "Opcije Uredjaja " +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "Nemacki " @@ -2589,8 +2691,12 @@ msgid "Hotkey Configuration" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< 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. msgid "Hotkeys" msgstr "" @@ -2786,7 +2892,11 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "" @@ -2864,9 +2974,15 @@ msgstr "" msgid "Invalid state" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "Italianski " @@ -3018,12 +3134,20 @@ msgstr "Ucitaj State Slot 8" msgid "Load State..." msgstr "Ucitaj State" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "Ucitaj Wii Sistem Meni (%d %c)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Ucitaj Wii Sistem Meni (%d %c)" @@ -3100,7 +3224,11 @@ msgstr "" msgid "MadCatz Gameshark files(*.gcs)" msgstr "" +<<<<<<< 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/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "" @@ -3132,7 +3260,11 @@ msgid "Memory Byte" msgstr "&Memorija" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "" @@ -3309,7 +3441,11 @@ msgstr "" msgid "NP Up" msgstr "" +<<<<<<< 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/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3396,7 +3532,11 @@ msgstr "" msgid "Not Set" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "" @@ -3457,7 +3597,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Otvori " @@ -3583,8 +3726,13 @@ msgstr "" msgid "Paths" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: 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/WXInputBase.cpp:48 msgid "Pause" msgstr "Pauza " @@ -3605,8 +3753,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< 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. msgid "Play" msgstr "Pokreni " @@ -3633,7 +3786,11 @@ msgstr "Opcije " msgid "Players" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "" @@ -3841,10 +3998,17 @@ msgstr "" msgid "Refresh game list" msgstr "" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "" @@ -3860,7 +4024,10 @@ msgid "Render to Main Window" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reset/Restart " @@ -3903,7 +4070,11 @@ msgstr "" msgid "Safe" msgstr "Siguran " +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "" @@ -3987,7 +4158,11 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "Skeniranje..." @@ -4027,12 +4202,21 @@ msgstr "" msgid "Select" msgstr "Izaberi " +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Izaberi Snimani fajl" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Izaberi \"Snimani fajl/Save file\" za importovanje " @@ -4059,6 +4243,7 @@ msgstr "" msgid "Select the file to load" msgstr "Izaberi fajl za ucitavanje " +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Izaberi \"snimani fajl/the save state\"" @@ -4068,6 +4253,17 @@ msgid "Select the state to load" msgstr "Izaberi state za ucitavanje " #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Izaberi \"snimani fajl/the save state\"" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Izaberi state za ucitavanje " + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Izaberi state za snimanje/save" @@ -4403,9 +4599,15 @@ msgstr "" msgid "Space" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "" @@ -4441,7 +4643,11 @@ msgstr "" msgid "Standard Controller" msgstr "" +<<<<<<< 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/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4476,7 +4682,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr " Zaustavi" @@ -4548,7 +4757,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "" @@ -4762,12 +4974,19 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "" @@ -4869,6 +5088,16 @@ msgstr "" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5076,7 +5305,11 @@ msgstr "" msgid "Wii Save Import" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5103,7 +5336,11 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "" @@ -5136,9 +5373,15 @@ msgstr "" msgid "Word Wrap" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "Radi..." diff --git a/Languages/po/tr.po b/Languages/po/tr.po index 31ca12822d..fe7e7a4688 100644 --- a/Languages/po/tr.po +++ b/Languages/po/tr.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< 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. "PO-Revision-Date: 2011-08-19 08:38-0500\n" "Last-Translator: nlgzrgn \n" "Language-Team: nlgzrgn \n" @@ -555,9 +559,15 @@ msgstr "Yama Ekle" msgid "Add new pane" msgstr "Bölme ekle" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "Ekle..." @@ -627,8 +637,13 @@ msgstr "Tüm GC/Wii kalıpları (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Tüm GameCube GCM Dosyaları (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Tüm Kayıtlı Oyunlar (sav,s##)" @@ -717,7 +732,11 @@ msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Bu dosyayı gerçekten silmek istiyor musunuz? Ama geri döndürülemeyecektir!" +<<<<<<< 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/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "En-boy Oranı:" @@ -738,7 +757,11 @@ msgstr "Ses Arka Ucu:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: AO sürücüyü açarken hata.\n" +<<<<<<< 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/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Otomatik" @@ -853,7 +876,11 @@ msgid "Blue Right" msgstr "Mavi Sağ" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "Alt" @@ -886,7 +913,11 @@ msgstr "Çıkış klasörü için gözat" msgid "Buffer:" msgstr "Tampon:" +<<<<<<< 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/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1131,7 +1162,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< 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/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Kapat" @@ -1240,7 +1275,11 @@ msgstr "Wiimote 3'ü Bağla" msgid "Connect Wiimote 4" msgstr "Wiimote 4'ü Bağla" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "Bağlanıyor..." @@ -1434,7 +1473,11 @@ msgid "DSP Emulator Engine" msgstr "Ses Emülatörü Motoru" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE Emülasyonu (Hızlı)" @@ -1665,7 +1708,11 @@ msgstr "" msgid "Divide" msgstr "Böl" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Emülasyonu durdurmak istiyor musunuz?" @@ -1694,12 +1741,21 @@ msgstr "Dolphin Taklit Wiimote Yapılandırması" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC Kolu Yapılandırması" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GC Kolu Yapılandırması" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> Update translation files for recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Filmleri (*.dtm)" @@ -1796,9 +1852,15 @@ msgstr "" "\n" "Emin değilseniz, işaretsiz bırakın." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "Flemenkçe" @@ -1942,15 +2004,22 @@ msgstr "BAT'a İzin Ver" msgid "Enable Block Merging" msgstr "Blok Birleşimine İzin Ver" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Önbelleğe izin ver" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "Hilelere İzin Ver" @@ -2106,9 +2175,15 @@ msgstr "" msgid "End" msgstr "Son" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "İngilizce" @@ -2137,6 +2212,7 @@ msgstr "Eşit" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Hata" @@ -2148,6 +2224,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Hata" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Seçili dili yüklerken hata. Sistem varsayılanlarına geri dönülüyor." @@ -2602,9 +2684,15 @@ msgstr "Çekilecek Kareler" msgid "Free Look" msgstr "Serbest Bakış" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "Fransızca" @@ -2671,7 +2759,11 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube Kolu Ayarları (&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "GameCube Hafıza Kartları (*.raw,*.gcp)" @@ -2694,8 +2786,12 @@ msgstr "" "(kötü bir kod veya türü henüz desteklenmiyor.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< 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/VideoConfigDiag.cpp:204 msgid "General" msgstr "Genel" @@ -2704,9 +2800,15 @@ msgstr "Genel" msgid "General Settings" msgstr "Genel Ayarlar" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "Almanca" @@ -2835,8 +2937,12 @@ msgid "Hotkey Configuration" msgstr "Kısayol Tuşu Yapılandırması" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< 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. msgid "Hotkeys" msgstr "Tuşlar" @@ -3059,7 +3165,11 @@ msgstr "" "Kurulum Özel Durum İşleyici çağrıldı, ama bu platform henüz bunu " "desteklemiyor." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "WAD kuruluyor..." @@ -3141,9 +3251,15 @@ msgstr "Hatalı çekim dosyası" msgid "Invalid state" msgstr "Hatalı durum" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "İtalyanca" @@ -3301,11 +3417,19 @@ msgstr "Durumu Yükle : 8" msgid "Load State..." msgstr "Durumu Yükle..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Wii Sistem Menüsünü Yükle" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "Wii Sistem Menüsünü Yükle" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii Sistem Menüsünü Yükle %d%c" @@ -3387,7 +3511,11 @@ msgstr "MMU Hız Hilesi" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark dosyaları(*.gcs)" +<<<<<<< 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/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Ana Çubuk" @@ -3418,7 +3546,11 @@ msgid "Memory Byte" msgstr "Hafıza Baytı" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "Hafıza Kartı" @@ -3616,7 +3748,11 @@ msgstr "NP Sekme" msgid "NP Up" msgstr "NP Yukarı" +<<<<<<< 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/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3703,7 +3839,11 @@ msgstr "Eşit Değil" msgid "Not Set" msgstr "Ayarlanmamış" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "Bağlı değil" @@ -3764,7 +3904,10 @@ msgstr "Sadece %d blok kullanılabilir" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "Aç" @@ -3895,8 +4038,13 @@ msgstr "Yamalar" msgid "Paths" msgstr "Yollar" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: 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/WXInputBase.cpp:48 msgid "Pause" msgstr "Duraklat" @@ -3916,8 +4064,13 @@ msgstr "Perspektif %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< 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. msgid "Play" msgstr "Oynat" @@ -3943,7 +4096,11 @@ msgstr "Oynatma Seçenekleri" msgid "Players" msgstr "Oyuncular" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "Lütfen onaylayın..." @@ -4154,10 +4311,17 @@ msgstr "Listeyi Yenile" msgid "Refresh game list" msgstr "Oyun Listesini Yenile" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "Kaldır" @@ -4176,7 +4340,10 @@ msgid "Render to Main Window" msgstr "Ana pencerede yorumla" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Sıfırla" @@ -4219,7 +4386,11 @@ msgstr "Durumu Kaydet (&V)" msgid "Safe" msgstr "Güvenli" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Örnek Oran:" @@ -4303,7 +4474,11 @@ msgstr "Kayıtlı durum filmi %s bozuk, film çekimi duruyor..." msgid "Scaled EFB Copy" msgstr "Boyutlandırılmış EFB Kopyası" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Taranıyor %s" @@ -4343,12 +4518,21 @@ msgstr "SYSCONF içinde %s bölümü bulunamadı" msgid "Select" msgstr "Seç" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" msgstr "Çekim Dosyasını Seç" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Çekim Dosyasını Seç" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Kurmak için bir Wii WAD dosyası seçin" @@ -4374,6 +4558,7 @@ msgstr "Sabit olmayan pencereyi seçin" msgid "Select the file to load" msgstr "Yüklemek için dosyayı seçin" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "Kayıt dosyasını seçin" @@ -4383,6 +4568,17 @@ msgid "Select the state to load" msgstr "Yüklemek için durum seçin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "Kayıt dosyasını seçin" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "Yüklemek için durum seçin" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "Kaydetmek için durum seçin" @@ -4759,9 +4955,15 @@ msgstr "Ses tamponu oluşturulamadı: %s" msgid "Space" msgstr "Boşluk" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "İspanyolca" @@ -4805,7 +5007,11 @@ msgstr "Kare Çubuk" msgid "Standard Controller" msgstr "Varsayılan Denetim Aygıtı" +<<<<<<< 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/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4840,7 +5046,10 @@ msgstr "Çubuk" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Durdur" @@ -4917,7 +5126,10 @@ msgstr "Tablo Sağ" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "Ekran Görüntüsü Al" @@ -5160,12 +5372,19 @@ msgstr "Tüm Geçmiş Türlerini Seç" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "Tam Ekran Moduna Geç" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "Üst" @@ -5274,6 +5493,18 @@ msgstr "Şu ID ile bilinmeyen mesaj alındı : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "ID %d ile %d oyuncusundan bilinmeyen mesaj alındı. Oyuncu atılıyor!" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"Bilinmeyen işaretleyici %#08x\n" +"Devam?" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5496,7 +5727,11 @@ msgstr "Wii NAND Kök Dizini:" msgid "Wii Save Import" msgstr "Wii Kaydı Al" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii kayıt dosyaları (*.bin)|*.bin" @@ -5527,7 +5762,11 @@ msgstr "" "bir zaman aşımı olabilir veya başka bir şey olabilir. \n" "Tekrar bağlamak istiyor musunuz?" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiimote Bağlandı" @@ -5559,9 +5798,15 @@ msgstr "Pencereleri Sağa Döşe" msgid "Word Wrap" msgstr "Heceleme" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "Çalışıyor..." diff --git a/Languages/po/zh_CN.po b/Languages/po/zh_CN.po index 10e394fc88..331fbb422d 100644 --- a/Languages/po/zh_CN.po +++ b/Languages/po/zh_CN.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< 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. "PO-Revision-Date: 2011-01-09 13:55-0800\n" "Last-Translator: thegfw \n" "Language-Team: \n" @@ -536,9 +540,15 @@ msgstr "添加补丁" msgid "Add new pane" msgstr "添加新面板" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "添加..." @@ -592,8 +602,13 @@ msgstr "所有 GC/Wii 镜像 (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "所有 Gamecube GCM 文件 (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "所有存档状态 (sav, s##)" @@ -674,7 +689,11 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "请确认真的要删除这些文件?这将是永久性的删除!" +<<<<<<< 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/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "高宽比:" @@ -695,7 +714,11 @@ msgstr "音频后端:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: 打开 AO 设备错误.\n" +<<<<<<< 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/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "自动" @@ -807,7 +830,11 @@ msgid "Blue Right" msgstr "蓝 右" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "底部" @@ -840,7 +867,11 @@ msgstr "浏览输出目录" msgid "Buffer:" msgstr "缓冲区:" +<<<<<<< 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/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1075,7 +1106,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< 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/VideoConfigDiag.cpp:592 msgid "Close" msgstr "关闭" @@ -1185,7 +1220,11 @@ msgstr "连接 Wiimote 3" msgid "Connect Wiimote 4" msgstr "连接 Wiimote 4" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "连接中..." @@ -1371,7 +1410,11 @@ msgid "DSP Emulator Engine" msgstr "音频模拟引擎" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "音频 HLE 模拟(很快)" @@ -1591,7 +1634,11 @@ msgstr "按模拟器显示输入读取" msgid "Divide" msgstr "Divide" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "您确定是否停止当前模拟?" @@ -1621,12 +1668,21 @@ msgstr "Dolphin 模拟 Wiimote 设置" msgid "Dolphin FIFO" msgstr "Dolphin" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +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. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS 电影 (*.dtm)" @@ -1710,9 +1766,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "荷兰语" @@ -1840,16 +1902,23 @@ msgstr "启用 BAT" msgid "Enable Block Merging" msgstr "启用区块合并" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "启用缓存" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "启用作弊" @@ -1984,9 +2053,15 @@ msgstr "" msgid "End" msgstr "End" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "英语" @@ -2015,6 +2090,7 @@ msgstr "等于" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "错误" @@ -2026,6 +2102,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "错误" + +>>>>>>> Update translation files for recent changes in the code. #: 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." @@ -2480,9 +2562,15 @@ msgstr "" msgid "Free Look" msgstr "自由视点" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "法语" @@ -2550,7 +2638,11 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube 手柄设置(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube 内存卡 (*.raw,*.gcp)" @@ -2573,8 +2665,12 @@ msgstr "" "(either a bad code or the code type is not yet supported.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< 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/VideoConfigDiag.cpp:204 msgid "General" msgstr "常规" @@ -2584,9 +2680,15 @@ msgstr "常规" msgid "General Settings" msgstr "界面设置" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "德语" @@ -2708,8 +2810,12 @@ msgid "Hotkey Configuration" msgstr "热键设置" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< 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. msgid "Hotkeys" msgstr "热键" @@ -2919,7 +3025,11 @@ msgid "" msgstr "" "InstallExceptionHandler called, but this platform does not yet support it." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Installing WAD..." msgstr "安装 WAD 到 Wii 菜单中..." @@ -3004,9 +3114,15 @@ msgstr "无效录制文件" msgid "Invalid state" msgstr "Invalid state" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "意大利语" @@ -3165,12 +3281,20 @@ msgstr "载入存档插槽 8" msgid "Load State..." msgstr "载入状态..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "载入 Wii 系统菜单(%d %c)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "载入 Wii 系统菜单(%d %c)" @@ -3251,7 +3375,11 @@ msgstr "MMU 速度破解" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark 文件(*.gcs)" +<<<<<<< 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/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "主摇杆" @@ -3283,7 +3411,11 @@ msgid "Memory Byte" msgstr "内存(&M)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "内存卡" @@ -3467,7 +3599,11 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< 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/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3555,7 +3691,11 @@ msgstr "不等于" msgid "Not Set" msgstr "未设置" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "未连接" @@ -3616,7 +3756,10 @@ msgstr "只有 %d 区块有效" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "打开" @@ -3747,8 +3890,13 @@ msgstr "补丁" msgid "Paths" msgstr "路径" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: 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/WXInputBase.cpp:48 msgid "Pause" msgstr "暂停" @@ -3769,8 +3917,13 @@ msgstr "Perspective %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< 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. msgid "Play" msgstr "开始" @@ -3797,7 +3950,11 @@ msgstr "选项" msgid "Players" msgstr "玩家" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "请确认..." @@ -4012,10 +4169,17 @@ msgstr "刷新列表" msgid "Refresh game list" msgstr "刷新游戏列表" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "移除" @@ -4034,7 +4198,10 @@ msgid "Render to Main Window" msgstr "附加到主窗口" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "重置" @@ -4077,7 +4244,11 @@ msgstr "保存状态(&V)" msgid "Safe" msgstr "安全" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "采样率:" @@ -4162,7 +4333,11 @@ msgstr "Savestate movie %s is corrupted, movie recording stopping..." msgid "Scaled EFB Copy" msgstr "EFB 比例复制" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "扫描中..." @@ -4202,12 +4377,21 @@ msgstr "Section %s not found in SYSCONF" msgid "Select" msgstr "选择" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "选择录制文件" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "选择要导入的存档" @@ -4234,6 +4418,7 @@ msgstr "选择浮动窗口" msgid "Select the file to load" msgstr "选择要载入的文件" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "选择一个存档文件" @@ -4243,6 +4428,17 @@ msgid "Select the state to load" msgstr "选择要载入的状态" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "选择一个存档文件" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "选择要载入的状态" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "选择要保存的状态" @@ -4591,9 +4787,15 @@ msgstr "声音缓冲区创建失败: %s" msgid "Space" msgstr "空格" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "西班牙语" @@ -4629,7 +4831,11 @@ msgstr "方块键" msgid "Standard Controller" msgstr "标准控制器" +<<<<<<< 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/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4664,7 +4870,10 @@ msgstr "摇杆" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "停止" @@ -4737,7 +4946,10 @@ msgstr "Table Right" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "屏幕截图(&T)" @@ -4973,12 +5185,19 @@ msgstr "切换所有日志类型" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "切换全屏" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "顶部" @@ -5082,6 +5301,18 @@ 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 +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"未知指针 %#08x\n" +"继续?" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5292,7 +5523,11 @@ msgstr "DVD 根目录:" msgid "Wii Save Import" msgstr "导入 Wii 存档" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 存档文件 (*.bin)|*.bin" @@ -5323,7 +5558,11 @@ msgstr "" "or maybe it is due to idle time out or other reason.\n" "Do you want to reconnect immediately?" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiimote 已连接" @@ -5356,9 +5595,15 @@ msgstr "窗口右侧" msgid "Word Wrap" msgstr "自动换行" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "工作中..." diff --git a/Languages/po/zh_TW.po b/Languages/po/zh_TW.po index 9c59bbbd6d..ab270c846f 100644 --- a/Languages/po/zh_TW.po +++ b/Languages/po/zh_TW.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< 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. "PO-Revision-Date: 2011-03-15 02:51+0800\n" "Last-Translator: khiav \n" "Language-Team: khiav&yrbn \n" @@ -536,9 +540,15 @@ msgstr "新增修正" msgid "Add new pane" msgstr "新增面版" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update translation files for recent changes in the code. msgid "Add..." msgstr "新增..." @@ -605,8 +615,13 @@ msgstr "所有 GC/Wii 映像檔 (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "所有 Gamecube GCM 檔案 (gcm)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update translation files for recent changes in the code. msgid "All Save States (sav, s##)" msgstr "所有即時存檔 (sav, s##)" @@ -687,7 +702,11 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "是否真的要刪除這些檔案？刪了之後就回不來了哦！" +<<<<<<< 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/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "畫面比例：" @@ -708,7 +727,11 @@ msgstr "聲音裝置：" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon：開啟 AO 裝置出錯。\n" +<<<<<<< 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/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "自動" @@ -820,7 +843,11 @@ msgid "Blue Right" msgstr "藍 右" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +>>>>>>> Update translation files for recent changes in the code. msgid "Bottom" msgstr "下方" @@ -853,7 +880,11 @@ msgstr "瀏覽輸出的資料夾" msgid "Buffer:" msgstr "緩衝：" +<<<<<<< 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/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1084,7 +1115,11 @@ msgstr "在遊戲執行時客戶端斷開連接！！網路對戰已經被關閉 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 +<<<<<<< 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/VideoConfigDiag.cpp:592 msgid "Close" msgstr "關閉" @@ -1194,7 +1229,11 @@ msgstr "連接 Wiimote 3" msgid "Connect Wiimote 4" msgstr "連接 Wiimote 4" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> Update translation files for recent changes in the code. msgid "Connecting..." msgstr "正在連接..." @@ -1379,7 +1418,11 @@ msgid "DSP Emulator Engine" msgstr "DSP 模擬引擎" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> Update translation files for recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE 模擬器 (快)" @@ -1599,7 +1642,11 @@ msgstr "顯示控制器輸入狀態 (僅作用於錄製或播放影片時)。" msgid "Divide" msgstr "Divide" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> Update translation files for recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "您要停止目前的模擬嗎？" @@ -1629,12 +1676,21 @@ msgstr "Dolphin 模擬 Wiimote 設定" msgid "Dolphin FIFO" msgstr "Dolphin" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +msgid "Dolphin GCPad Configuration" +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. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS 影片 (*.dtm)" @@ -1718,9 +1774,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update translation files for recent changes in the code. msgid "Dutch" msgstr "Dutch" @@ -1846,16 +1908,23 @@ msgstr "開啟 BAT" msgid "Enable Block Merging" msgstr "開啟塊合併" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 #, fuzzy msgid "Enable Cache" msgstr "開啟快取" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +>>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" msgstr "開啟作弊" @@ -1987,9 +2056,15 @@ msgstr "" msgid "End" msgstr "End" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update translation files for recent changes in the code. msgid "English" msgstr "English" @@ -2018,6 +2093,7 @@ msgstr "等於" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "錯誤" @@ -2029,6 +2105,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "錯誤" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "讀取選擇的語系出錯。返回使用系統預設值。" @@ -2481,9 +2563,15 @@ msgstr "" msgid "Free Look" msgstr "自由視點" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update translation files for recent changes in the code. msgid "French" msgstr "French" @@ -2551,7 +2639,11 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube 控制器設定(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +>>>>>>> Update translation files for recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube 記憶卡 (*.raw,*.gcp)" @@ -2574,8 +2666,12 @@ msgstr "" "(一個損毀的代碼或不支援的代碼類型。)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +<<<<<<< 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/VideoConfigDiag.cpp:204 msgid "General" msgstr "一般" @@ -2585,9 +2681,15 @@ msgstr "一般" msgid "General Settings" msgstr "界面設定" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update translation files for recent changes in the code. msgid "German" msgstr "German" @@ -2709,8 +2811,12 @@ msgid "Hotkey Configuration" msgstr "快捷鍵設定" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +<<<<<<< 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. msgid "Hotkeys" msgstr "快捷鍵" @@ -2912,7 +3018,11 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "調用 InstallExceptionHandler，但是這個平台尚未支援此功能。" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> Update translation files for recent changes in the code. msgid "Installing WAD..." msgstr "正在安裝 WAD 至 Wii 選單..." @@ -2996,9 +3106,15 @@ msgstr "無效的錄像檔" msgid "Invalid state" msgstr "無效的狀態" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update translation files for recent changes in the code. msgid "Italian" msgstr "Italian" @@ -3157,12 +3273,20 @@ msgstr "讀取儲存格 8" msgid "Load State..." msgstr "讀取進度檔..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "讀取 Wii 系統選單 (%d%c)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update translation files for recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "讀取 Wii 系統選單 (%d%c)" @@ -3243,7 +3367,11 @@ msgstr "MMU 速度修正" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark 檔案(*.gcs)" +<<<<<<< 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/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "主搖桿" @@ -3275,7 +3403,11 @@ msgid "Memory Byte" msgstr "記憶卡(&M)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +>>>>>>> Update translation files for recent changes in the code. msgid "Memory Card" msgstr "記憶卡" @@ -3459,7 +3591,11 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< 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/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3547,7 +3683,11 @@ msgstr "不相等" msgid "Not Set" msgstr "未設定" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> Update translation files for recent changes in the code. msgid "Not connected" msgstr "未連接" @@ -3608,7 +3748,10 @@ msgstr "僅 %d 個區塊可用" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Open" msgstr "開啟" @@ -3737,8 +3880,13 @@ msgstr "修正" msgid "Paths" msgstr "路徑" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +======= +#: 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/WXInputBase.cpp:48 msgid "Pause" msgstr "暫停" @@ -3759,8 +3907,13 @@ msgstr "版式 %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +<<<<<<< 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. msgid "Play" msgstr "執行" @@ -3787,7 +3940,11 @@ msgstr "選項" msgid "Players" msgstr "玩家" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> Update translation files for recent changes in the code. msgid "Please confirm..." msgstr "請確認..." @@ -4001,10 +4158,17 @@ msgstr "更新列表" msgid "Refresh game list" msgstr "更新遊戲列表" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update translation files for recent changes in the code. msgid "Remove" msgstr "移除" @@ -4023,7 +4187,10 @@ msgid "Render to Main Window" msgstr "渲染至主視窗" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "重置" @@ -4066,7 +4233,11 @@ msgstr "儲存進度(&V)" msgid "Safe" msgstr "安全" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +>>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "取樣率：" @@ -4151,7 +4322,11 @@ msgstr "儲存的影片 %s 是損毀的，影片錄製停止..." msgid "Scaled EFB Copy" msgstr "EFB 縮放複製" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update translation files for recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "正在掃瞄..." @@ -4191,12 +4366,21 @@ msgstr "項目 %s 在 SYSCONF 中找不到" msgid "Select" msgstr "選擇" +<<<<<<< HEAD #: 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 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "選擇已錄製的檔案" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update translation files for recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "選擇要安裝的 Wii WAD" @@ -4222,6 +4406,7 @@ msgstr "選擇浮動視窗" msgid "Select the file to load" msgstr "選擇要讀取的檔案" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" msgstr "選擇存檔" @@ -4231,6 +4416,17 @@ msgid "Select the state to load" msgstr "選擇要讀取的進度" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +msgid "Select the save file" +msgstr "選擇存檔" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +msgid "Select the state to load" +msgstr "選擇要讀取的進度" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update translation files for recent changes in the code. msgid "Select the state to save" msgstr "選擇要儲存的進度" @@ -4578,9 +4774,15 @@ msgstr "聲音緩衝建立失敗：%s" msgid "Space" msgstr "Space" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update translation files for recent changes in the code. msgid "Spanish" msgstr "Spanish" @@ -4616,7 +4818,11 @@ msgstr "Square Stick" msgid "Standard Controller" msgstr "標準控制器" +<<<<<<< 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/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -4651,7 +4857,10 @@ msgstr "搖桿" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 +======= +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "停止" @@ -4724,7 +4933,10 @@ msgstr "Table 右" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Take Screenshot" msgstr "截取畫面" @@ -4950,12 +5162,19 @@ msgstr "全選/全部取消" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +======= +>>>>>>> Update translation files for recent changes in the code. msgid "Toggle Fullscreen" msgstr "切換全螢幕" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +>>>>>>> Update translation files for recent changes in the code. msgid "Top" msgstr "上方" @@ -5059,6 +5278,18 @@ msgstr "接收到帶有未知 id 的錯誤訊息：%d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "知訊息帶有 id:%d 接收於玩家:%d 正在提出玩家！" +<<<<<<< HEAD +======= +#: Source/Core/Core/Src/HW/Memmap.cpp:633 +#, c-format +msgid "" +"Unknown pointer %#08x\n" +"Continue?" +msgstr "" +"未知的指示器 %#08x\n" +"是否繼續？" + +>>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5269,7 +5500,11 @@ msgstr "DVD 根：" msgid "Wii Save Import" msgstr "匯入 Wii 存檔" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> Update translation files for recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 存檔 (*.bin)|*.bin" @@ -5300,7 +5535,11 @@ msgstr "" "或閒置的時間太久。\n" "是否要重新連接？" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> Update translation files for recent changes in the code. msgid "Wiimote Connected" msgstr "Wiimote 已連接" @@ -5333,9 +5572,15 @@ msgstr "視窗 右" msgid "Word Wrap" msgstr "自動換行" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update translation files for recent changes in the code. msgid "Working..." msgstr "執行中..." From 828205df22f7a4006c396c51ea1b09270f7e455d Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Sat, 15 Oct 2011 09:08:15 -0500 Subject: [PATCH 02/14] Update Greek and Czech translations --- Languages/po/cs.po | 733 ++++++++++++++++++++++++++++++--------------- Languages/po/el.po | 680 +++++++++++++++++++++++++++++++---------- 2 files changed, 1011 insertions(+), 402 deletions(-) diff --git a/Languages/po/cs.po b/Languages/po/cs.po index b441cc4434..5de197a7a6 100644 --- a/Languages/po/cs.po +++ b/Languages/po/cs.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-10-15 14:50+0100\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" "PO-Revision-Date: 2011-08-10 20:37+0100\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-08-10 08:30-0500\n" +"PO-Revision-Date: 2011-10-15 14:50+0100\n" +>>>>>>> Update Greek and Czech translations "Last-Translator: Zbyněk Schwarz \n" "Language-Team: \n" "Language: Czech\n" @@ -35,7 +40,7 @@ msgstr " Hra : " msgid "! NOT" msgstr "! NE" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:72 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:69 #, c-format msgid "" "\"%s\" does not exist.\n" @@ -77,7 +82,7 @@ msgstr "%s už existuje, přepsat?" msgid "%s failed to be scrubbed. Probably the image is corrupt." msgstr "%s nelze vyčistit. Obraz je pravděpodobně poškozen." -#: Source/Core/Core/Src/HW/GCMemcard.cpp:97 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:97 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -86,7 +91,7 @@ msgstr "" "%s nelze načíst jako paměťovou kartu\n" "Soubor karty je neplatný (0x%x bajtů)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:112 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:112 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -95,7 +100,7 @@ msgstr "" "%s nelze načíst jako paměťovou kartu\n" "Velikost karty je neplatná (0x%x bajtů)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:92 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:92 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -312,7 +317,7 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(NEZNÁMÝ)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:381 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(vypnuto)" @@ -324,7 +329,7 @@ msgstr "16 bit" msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "3D Vision" msgstr "3D Vision" @@ -336,7 +341,7 @@ msgstr "8 bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:258 msgid "" msgstr "<Žádné rozlišení nenalezeno>" @@ -423,17 +428,17 @@ msgstr "O Dolphinu" msgid "Acceleration" msgstr "Zrychlení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 -msgid "Accuracy:" -msgstr "Přesnost:" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Accurate VBeam emulation" msgstr "Precizní emulace VBeam" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 <<<<<<< HEAD ======= +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +>>>>>>> Update Greek and Czech translations #, fuzzy >>>>>>> Update translation files for recent changes in the code. msgid "" @@ -441,7 +446,7 @@ msgid "" "Some games depend on this for certain graphical effects or gameplay " "functionality.\n" "\n" -"If unsure, check EFB to Texture instead." +"If unsure, leave this checked." msgstr "" "Přesně emulovat EFB kopie.\n" "Některé hry na tomto závisí pro určité grafické efekty nebo herní funkce.\n" @@ -540,12 +545,12 @@ msgstr "Action Replay: Normální Kód %i: Neplatný podtyp %08x (%s)" msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: Normální Kód 0: Neplatný Podtyp %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:249 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:245 msgid "Adapter:" msgstr "Adaptér:" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 msgid "Add" msgstr "Přidat" @@ -561,6 +566,7 @@ msgstr "Přidat Záplatu" msgid "Add new pane" msgstr "Přidat nový panel" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -570,6 +576,11 @@ msgstr "Přidat nový 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/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +>>>>>>> Update Greek and Czech translations msgid "Add..." msgstr "Přidat..." @@ -617,7 +628,7 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "Upravte tlak analogového ovládání potřebný k aktivaci tlačítek." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486 msgid "Advanced" msgstr "Pokročilé" @@ -637,6 +648,7 @@ msgstr "Všechny obrazy GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Všechny soubory Gamecube GCM )gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -644,6 +656,10 @@ msgstr "Všechny soubory 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:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update Greek and Czech translations msgid "All Save States (sav, s##)" msgstr "Všechny Uložené Stavy (sav, s##)" @@ -659,7 +675,7 @@ msgstr "Všechny komprimované soubory GC/WII ISO (gcz)" msgid "All files (*.*)|*.*" msgstr "Všechny soubory (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " "emulation window.\n" @@ -671,6 +687,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 <<<<<<< HEAD msgid "Alternate Wiimote Timing" @@ -682,10 +699,13 @@ msgstr "Emulovaný Wiimote" >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 +>>>>>>> Update Greek and Czech translations msgid "Anisotropic Filtering:" msgstr "Anizotropní Filtrování:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:355 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "Vyhlazení okrajů" @@ -705,7 +725,7 @@ msgstr "Zavaděč aplikace:" msgid "Apply" msgstr "Použít" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -740,8 +760,12 @@ msgstr "Opravdu chcete smazat tento soubor? Bude navždy ztracen!" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 +>>>>>>> Update Greek and Czech translations msgid "Aspect Ratio:" msgstr "Poměr Stran:" @@ -765,20 +789,24 @@ msgstr "AudioCommon: Chyba při otevírání zařízení zvukového výstupu.\n" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +>>>>>>> Update Greek and Czech translations msgid "Auto" msgstr "Auto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "Auto (Násobek 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "Auto (Velikost Okna)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Auto adjust Window Size" msgstr "Automaticky upravovat Velikost Okna" @@ -792,18 +820,6 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"Automaticky vytvořit mipmapy, raději než dekódovat je z paměti.\n" -"Trochu zlepší výkon, ale může způsobit malé chyby paměti.\n" -"\n" -"Pokud si nejste jisti, nechejte toto zaškrtnuté." - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:27 msgid "Back" msgstr "Zpět" @@ -812,8 +828,8 @@ msgstr "Zpět" msgid "Backend Settings" msgstr "Nastavení Backendu" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:209 #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:213 msgid "Backend:" msgstr "Backend:" @@ -847,7 +863,7 @@ msgstr "Plakát:" msgid "Bar" msgstr "Vibráto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "Základní" @@ -859,7 +875,7 @@ msgstr "Základní nastavení" msgid "Bass" msgstr "Basy" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:188 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:188 msgid "Block Allocation Table checksum failed" msgstr "Kontrolní součet Alokační Tabulky Bloku selhal" @@ -879,12 +895,17 @@ msgstr "Modrá vlevo" msgid "Blue Right" msgstr "Modrá vpravo" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< 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:272 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +>>>>>>> Update Greek and Czech translations msgid "Bottom" msgstr "Dole" @@ -917,13 +938,18 @@ msgstr "Procházet pro výstupní adresář" msgid "Buffer:" msgstr "Vyrovnávací paměť:" +<<<<<<< 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/DolphinWX/Src/UDPConfigDiag.cpp:23 +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 msgid "Buttons" msgstr "Tlačítka" @@ -939,11 +965,11 @@ msgstr "Kr-Stick" msgid "CPU Emulator Engine" msgstr "Jádro Emulátoru Procesoru" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465 msgid "Cache Display Lists" msgstr "Ukládat předvyt. obj. do vyr. pam." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 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 " @@ -958,7 +984,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto zaškrtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -973,8 +999,8 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 msgid "Cancel" msgstr "Zrušit" @@ -1018,10 +1044,10 @@ msgstr "Nelze najít Wiimote podle bz: %02x:%02x:%02x:%02x:%02x:%02x" msgid "Cant find WiiMote by connection handle %02x" msgstr "Nelze najít Wiimote pomocí obslužné rutiny spojení %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "Nelze číst ze zásuvného modulu DVD - DVD-Rozhraní: Závažná chyba" @@ -1144,10 +1170,10 @@ msgstr "Kruhový Stick" msgid "Classic" msgstr "Klasické" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 msgid "Clear" msgstr "Vyčistit" @@ -1162,14 +1188,18 @@ msgid "" msgstr "" "Klient odpojen při běhu hry!! NetPlay je vypnut. Hru musíte ukončit ručně." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 +>>>>>>> Update Greek and Czech translations msgid "Close" msgstr "Zavřít" @@ -1277,11 +1307,15 @@ msgstr "Připojit Wiimote 3" msgid "Connect Wiimote 4" msgstr "Připojit 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:608 +>>>>>>> Update Greek and Czech translations msgid "Connecting..." msgstr "Připojuji..." @@ -1349,7 +1383,7 @@ msgstr "" "Nelze nastavit pady. Hráč odešel, nebo hra v současnosti běží!.\n" "(nastavení padů za běhu hry není ještě podporováno)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1419,11 +1453,11 @@ msgstr "Tvůrce:" msgid "Critical" msgstr "Kritické" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Crop" msgstr "Oříznout" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1470,12 +1504,17 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "Jádro Emulátoru DSP" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< 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:248 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +>>>>>>> Update Greek and Czech translations msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulace (rychlé)" @@ -1524,7 +1563,7 @@ msgstr "Mrtvá Zóna" msgid "Debug" msgstr "Ladění" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Debugging" msgstr "Ladění" @@ -1557,8 +1596,8 @@ msgstr "Výchozí ISO:" msgid "Default font" msgstr "Výchozí typ písma" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 msgid "Delete" msgstr "Smazat" @@ -1566,12 +1605,12 @@ msgstr "Smazat" msgid "Delete Save" msgstr "Smazat Uloženou Hru" -#: Source/Core/VideoCommon/Src/AVIDump.cpp:77 +#: Source/Core/VideoCommon/Src/AVIDump.cpp:73 #, c-format msgid "Delete the existing file '%s'?" msgstr "Vymazat existující soubor '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:651 msgid "Description" msgstr "Popis" @@ -1602,15 +1641,15 @@ msgstr "Nastavení Zařízení" msgid "Dial" msgstr "Kruhová stupnice" -#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146 +#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:147 msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:129 msgid "Direct3D9" msgstr "Direct3D9" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:169 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:169 msgid "" "Directory checksum failed\n" " and Directory backup checksum failed" @@ -1618,28 +1657,32 @@ msgstr "" "Kontrolní součet adresáře\n" "i záložní kontrolní součet Adresáře selhal" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 msgid "Disable" msgstr "Zakázat" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Disable Fog" msgstr "Zakázat Mlhu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Disable Lighting" msgstr "Zakázat Osvětlení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Disable Per-Pixel Depth" msgstr "Zakázat Hloubku Podle Pixelu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Textures" msgstr "Zakázat Textury" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +msgid "Disable Wiimote Speaker" +msgstr "Zakázat Reproduktor Wiimote" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1653,7 +1696,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto zaškrtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1669,7 +1712,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" "Disable texturing.\n" "\n" @@ -1688,11 +1731,11 @@ msgstr "Disk" msgid "Disc Read Error" msgstr "Chyba čtení disku" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "Obraz" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1706,11 +1749,15 @@ msgstr "" msgid "Divide" msgstr "Rozdělit" +<<<<<<< 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:1051 +>>>>>>> Update Greek and Czech translations msgid "Do you want to stop the current emulation?" msgstr "Chcete současnou emulaci zastavit?" @@ -1718,7 +1765,7 @@ msgstr "Chcete současnou emulaci zastavit?" msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:185 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s Grafická Nastavení" @@ -1739,6 +1786,7 @@ msgstr "Nastavení Emulovaného Dolphin Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1748,12 +1796,19 @@ msgstr "Dolphin GCPad Nastavení" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1202 +>>>>>>> Update Greek and Czech translations msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Nastavení" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +>>>>>>> Update Greek and Czech translations msgid "Dolphin TAS Movies (*.dtm)" msgstr "Doplhin Filmy TAS (*.dtm)" @@ -1781,8 +1836,8 @@ msgstr "" "Dolphin je v současnosti nastaven na skrytí všech her. Klikněte zde dvakrát " "pro zobrazení všech her..." -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 msgid "Down" msgstr "Dolů" @@ -1807,19 +1862,19 @@ msgstr "Atrapa" msgid "Dump Audio" msgstr "Vypsat Zvuk" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Dump EFB Target" msgstr "Vypsat Cíl EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:511 msgid "Dump Frames" msgstr "Vypsat Snímky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:508 msgid "Dump Textures" msgstr "Vypsat Textury" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1829,7 +1884,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1839,7 +1894,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1849,6 +1904,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1858,6 +1914,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/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +>>>>>>> Update Greek and Czech translations msgid "Dutch" msgstr "Nizozemština" @@ -1865,7 +1926,7 @@ msgstr "Nizozemština" msgid "E&xit" msgstr "O&dejít" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:430 msgid "EFB Copies" msgstr "EFB Kopie" @@ -1918,7 +1979,7 @@ msgstr "Upravit" msgid "Effect" msgstr "Efekt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 msgid "Embedded Frame Buffer" msgstr "Vnořená Vyr. Pamět Snímků" @@ -1926,7 +1987,7 @@ msgstr "Vnořená Vyr. Pamět Snímků" msgid "Emu Thread already running" msgstr "Vlákno Emulace již běží" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1940,7 +2001,7 @@ msgstr "" "\n" "Pokud si nejste jisti, zaškrtněte místo tohoto virtuální emulaci XFB." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1968,7 +2029,7 @@ msgstr "Stav Emulace:" msgid "Enable" msgstr "Povolit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -2000,6 +2061,7 @@ msgstr "Zapnout BAT" msgid "Enable Block Merging" msgstr "Zapnout Slučování Bloků" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" @@ -2014,6 +2076,8 @@ msgstr "Povolit vyrovnávací paměť" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" @@ -2031,7 +2095,7 @@ msgstr "Povolit dvojité jádro" msgid "Enable Dual Core (speedup)" msgstr "Zapnout dvojité jádro (zrychlení)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 msgid "Enable Hotkeys" msgstr "Povolit klávesové zkratky" @@ -2047,8 +2111,8 @@ msgstr "Povolit Přeskakování Nečinných Příkazů (zrychlení)" msgid "Enable MMU" msgstr "Zapnout MMU" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 msgid "Enable Progressive Scan" msgstr "Povolit Progresivní Skenování" @@ -2060,7 +2124,7 @@ msgstr "Povolit Spořič Obrazovky" msgid "Enable WideScreen" msgstr "Povolit Širokoúhlou obrazovku" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Enable Wireframe" msgstr "Povolit Drátěný Model" @@ -2157,7 +2221,7 @@ msgstr "" "Povolí Jednotku Správy Paměti, potřebnou v nějakých hrách. (ZAPNUTO = " "Kompatibilní, VYPNUTO = Rychlé)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2171,6 +2235,7 @@ msgstr "" msgid "End" msgstr "End" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2180,11 +2245,16 @@ 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/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +>>>>>>> Update Greek and Czech translations msgid "English" msgstr "Angličtina" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:334 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:411 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 msgid "Enhancements" msgstr "Vylepšení" @@ -2206,6 +2276,7 @@ msgstr "Záznam 1/%d" msgid "Equal" msgstr "Rovná se" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD @@ -2221,12 +2292,20 @@ msgid "" msgstr "" ======= +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Error" msgstr "Chyba" +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:356 +>>>>>>> Update Greek and Czech translations msgid "Error loading selected language. Falling back to system default." msgstr "" "Chyba při nahrávání zvoleného jazyka. Vracím se na výchozí jazyk systému." @@ -2309,7 +2388,7 @@ msgstr "Exportovat Uloženou hru jako..." msgid "Extension" msgstr "Rozšíření" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 msgid "External Frame Buffer" msgstr "Vnější Vyr. Paměť Snímků" @@ -2431,7 +2510,7 @@ msgstr "Nelze nahrát hid.dll" msgid "Failed to read banner.bin" msgstr "Nelze číst z banner.bin" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:150 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:150 msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" @@ -2439,7 +2518,7 @@ msgstr "" "Nelze správně číst zálohu alokační tabulky bloku\n" "(0x8000-0x9FFF)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:144 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:144 msgid "" "Failed to read block allocation table correctly\n" "(0x6000-0x7FFF)" @@ -2452,7 +2531,7 @@ msgstr "" msgid "Failed to read data from file %d" msgstr "Nelze číst data ze souboru %d" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:138 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:138 msgid "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" @@ -2460,7 +2539,7 @@ msgstr "" "Nelze správně číst zálohu adresáře\n" "(0x4000-0x5FFF)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:132 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:132 msgid "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" @@ -2468,7 +2547,7 @@ msgstr "" "Nelze správně číst adresář\n" "(0x2000-0x3FFF)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:121 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:121 msgid "" "Failed to read header correctly\n" "(0x0000-0x1FFF)" @@ -2476,7 +2555,7 @@ msgstr "" "Nelze správně číst hlavičku\n" "(0x0000-0x1FFF)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:222 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:222 msgid "" "Failed to read save data\n" "(0xA000-)\n" @@ -2508,14 +2587,6 @@ msgstr "Zápis hlavičky selhal pro %s" msgid "Failed to write header for file %d" msgstr "Selhal zápis hlavičky souboru %d" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 -msgid "Fast" -msgstr "Rychlá" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Fast Mipmaps" -msgstr "Rychlé Mipmapy" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Fast version of the MMU. Does not work for every game." msgstr "Rychlá verze MMU. Nefunguje v každé hře." @@ -2544,7 +2615,7 @@ msgstr "" "Soubor nelze otevřít\n" "nebo nemá platnou příponu" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:86 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:86 #, c-format msgid "" "File has the extension \"%s\"\n" @@ -2582,11 +2653,11 @@ msgstr "První blok" msgid "Fix Checksums" msgstr "Spravit Kontrolní Součty" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Force 16:9" msgstr "Vynutit 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Force 4:3" msgstr "Vynutit 4:3" @@ -2594,11 +2665,11 @@ msgstr "Vynutit 4:3" msgid "Force Console as NTSC-J" msgstr "Donutit konzoli být jako NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 msgid "Force Texture Filtering" msgstr "Vynutit Filtrování Textur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2632,7 +2703,7 @@ msgstr "" "Pokud není zaškrtnuto, Dolphin standardně přejde na NTSC-U a automaticky " "zapne toto nastavení při hraní Japonských her." -#: Source/Core/Core/Src/HW/GCMemcard.cpp:76 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:73 msgid "" "Format as ascii (NTSC\\PAL)?\n" "Choose no for sjis (NTSC-J)" @@ -2658,7 +2729,7 @@ msgstr "Snímek" msgid "Frame Advance" msgstr "Postup Snímkem" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:514 msgid "Frame Dumps use FFV1" msgstr "Uložení snímků použije FFV1" @@ -2678,10 +2749,11 @@ msgstr "Limit Snímků:" msgid "Frames To Record" msgstr "Snímky k Nahrání" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:512 msgid "Free Look" msgstr "Rozhlížení pomocí myši" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2691,6 +2763,11 @@ msgstr "Rozhlížení pomocí myši" #: 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/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +>>>>>>> Update Greek and Czech translations msgid "French" msgstr "Francouzština" @@ -2707,7 +2784,7 @@ msgstr "Z" msgid "FullScr" msgstr "CelObr" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 msgid "Fullscreen resolution:" msgstr "Rozlišení celé obrazovky:" @@ -2756,12 +2833,17 @@ msgstr "Gamecube" msgid "Gamecube &Pad Settings" msgstr "Nastavení Gamecube &Pad" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< 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:1007 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +>>>>>>> Update Greek and Czech translations msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Paměťové karty Gamecube (*.raw,*.gcp)" @@ -2783,6 +2865,7 @@ msgstr "" "Nelze spustit GeckoKód (CT%i CST%i) (%s)\n" "(buď špatný kód, nebo typ kódu není ještě podporován.)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 @@ -2791,6 +2874,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +>>>>>>> Update Greek and Czech translations msgid "General" msgstr "Obecné" @@ -2798,6 +2886,7 @@ msgstr "Obecné" msgid "General Settings" msgstr "Obecná Nastavení" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2807,6 +2896,11 @@ msgstr "Obecná Nastavení" #: 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/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +>>>>>>> Update Greek and Czech translations msgid "German" msgstr "Němčina" @@ -2827,17 +2921,19 @@ msgstr "Grafická nastavení" msgid "Greater Than" msgstr "Větší než" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 <<<<<<< HEAD ======= +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +>>>>>>> Update Greek and Czech translations #, fuzzy >>>>>>> Update translation files for recent changes in the code. msgid "" -"Greatly increases quality of textures generated using render to texture " +"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" "\n" "If unsure, leave this checked." msgstr "" @@ -2872,11 +2968,11 @@ msgstr "Kytara" msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "Byl zavolán HCI_CMD_INQUIRY, prosím ohlaste!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:420 msgid "Hacks" msgstr "Hacky" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:160 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:160 msgid "Header checksum failed" msgstr "Kontrolní součet hlavičky selhal" @@ -2912,7 +3008,7 @@ msgstr "" msgid "Hide" msgstr "Skrýt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "Skrýt kurzor myši" @@ -2939,6 +3035,7 @@ msgstr "Hostovat" msgid "Hotkey Configuration" msgstr "Nastavení klávesových zkratek" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 @@ -2946,6 +3043,10 @@ msgstr "Nastavení klávesových zkratek" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +>>>>>>> Update Greek and Czech translations msgid "Hotkeys" msgstr "Klávesové zkratky" @@ -3032,11 +3133,11 @@ msgstr "" "Pokud nastavíte limit snímků větší než plná rychlost hry (NTSC:60, PAL:50), " "měli byste také vypnout Přiškrcení Zvuku v DSP, aby to bylo účinné." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 msgid "Ignore Format Changes" msgstr "Ignorovat Změny Formátu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -3050,7 +3151,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto zaškrtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 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 " @@ -3092,7 +3193,7 @@ msgstr "" "\"Importovaný soubor má příponu sav\n" "ale nemá správnou hlavičku\"" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3104,7 +3205,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Improves performance but causes lighting to disappear in most games.\n" "\n" @@ -3122,8 +3223,8 @@ msgstr "Ve Hře" msgid "In-Game" msgstr "Ve Hře" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 msgid "Info" msgstr "Info" @@ -3166,11 +3267,15 @@ msgstr "" "Byl zavolán InstallExceptionHandler, ale tato platforma toto ještě " "nepodporuje." +<<<<<<< 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:1361 +>>>>>>> Update Greek and Czech translations msgid "Installing WAD..." msgstr "Instaluji WAD..." @@ -3199,7 +3304,7 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "Vnitřní chyba LZO - lzo_init() selhalo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:349 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 msgid "Internal Resolution:" msgstr "Vnitřní Rozlišení:" @@ -3252,6 +3357,7 @@ msgstr "Neplatný soubor s nahrávkou" msgid "Invalid state" msgstr "Neplatný stav" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3261,6 +3367,11 @@ msgstr "Neplatný stav" #: 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/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +>>>>>>> Update Greek and Czech translations msgid "Italian" msgstr "Italština" @@ -3322,8 +3433,8 @@ msgstr "Poslední Přepsaný Stav" msgid "Last Saved State" msgstr "Poslední Uložený Stav" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 msgid "Left" msgstr "Vlevo" @@ -3370,7 +3481,7 @@ msgstr "Limitovat podle SzS" msgid "Load" msgstr "Nahrát" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509 msgid "Load Custom Textures" msgstr "Nahrát Vlastní Textury" @@ -3418,6 +3529,7 @@ msgstr "Nahrát Slot Stavu 8" msgid "Load State..." msgstr "Nahrát Stav..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3431,11 +3543,18 @@ msgstr "Nahrát Systémové Menu Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1400 +msgid "Load Wii System Menu" +msgstr "Nahrát Systémové Menu Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +>>>>>>> Update Greek and Czech translations #, c-format msgid "Load Wii System Menu %d%c" msgstr "Nahrát Systémové Menu Wii %d%c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3477,8 +3596,8 @@ msgstr "Typy Záznamu" msgid "Logger Outputs" msgstr "Výstup Zapisovače" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 #: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 msgid "Logging" msgstr "Protokolování" @@ -3512,12 +3631,16 @@ msgstr "MMU Hack Rychlosti" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Soubory 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. +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 msgid "Main Stick" msgstr "Hlavní Stick" @@ -3546,12 +3669,17 @@ msgstr "Pam. karta již otevřena" msgid "Memory Byte" msgstr "Bajt Paměti" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< 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:84 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +>>>>>>> Update Greek and Czech translations msgid "Memory Card" msgstr "Paměťová karta" @@ -3580,7 +3708,7 @@ msgstr "" "%s\n" "Chtěli byste starý soubor zkopírovat do nového umístění?\n" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:126 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" msgstr "Velikost paměťové karty se neshoduje s velikosti hlavičky" @@ -3597,7 +3725,7 @@ msgstr "Mikrofon" msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 msgid "Misc" msgstr "Ostatní" @@ -3610,7 +3738,7 @@ msgstr "Ostatní Nastavení" msgid "Modifier" msgstr "Modifikátor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3635,7 +3763,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:634 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3749,13 +3877,17 @@ msgstr "NK Tab" msgid "NP Up" msgstr "NK Nahoru" +<<<<<<< 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. +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 msgid "Name:" msgstr "Jméno:" @@ -3840,11 +3972,15 @@ msgstr "Nerovná se" msgid "Not Set" msgstr "Nenastaven" +<<<<<<< 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:607 +>>>>>>> Update Greek and Czech translations msgid "Not connected" msgstr "Nepřipojen" @@ -3873,8 +4009,8 @@ msgstr "Num Lock" msgid "Number Of Codes: " msgstr "Počet Kódů:" -#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 msgid "Nunchuk" msgstr "Nunčak" @@ -3903,12 +4039,15 @@ msgstr "Logická Adresa:" msgid "Only %d blocks available" msgstr "Pouze bloky %d jsou dostupné" -#: 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/FrameTools.cpp:433 +>>>>>>> Update Greek and Czech translations msgid "Open" msgstr "Otevřít" @@ -3938,11 +4077,11 @@ msgstr "OpenAL: nelze nalézt zvuková zařízení" msgid "OpenAL: can't open device %s" msgstr "OpenAL: nelze otevřít zařízení %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 msgid "OpenCL Texture Decoder" msgstr "OpenCL Dekodér Textury" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "OpenMP Texture Decoder" msgstr "OpenMP Dekodér Textury" @@ -3973,8 +4112,8 @@ msgstr "" "Klikněte pravým tlačítkem a exportujte všechna uložení,\n" "a importujte je do nové paměťové karty\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 msgid "Other" msgstr "Jiné" @@ -4038,6 +4177,7 @@ msgstr "Záplaty" msgid "Paths" msgstr "Cesty" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -4045,11 +4185,15 @@ msgstr "Cesty" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1603 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1604 msgid "Pause" msgstr "Pozastavit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Per-Pixel Lighting" msgstr "Osvětlení Podle Pixelu" @@ -4062,15 +4206,20 @@ msgstr "Dokonalá" msgid "Perspective %d" msgstr "Perspektiva %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:1612 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1613 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 +>>>>>>> Update Greek and Czech translations msgid "Play" msgstr "Spustit" @@ -4096,11 +4245,15 @@ msgstr "Možnosti Přehrávání" msgid "Players" msgstr "Hráči" +<<<<<<< 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:1052 +>>>>>>> Update Greek and Czech translations msgid "Please confirm..." msgstr "Prosím potvrďte..." @@ -4145,7 +4298,7 @@ msgstr "Portugalština" msgid "Portuguese (Brazilian)" msgstr "Portugalština (Brazilská)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "Efekt Následného Zpracování:" @@ -4219,7 +4372,7 @@ msgstr "Tlačítko R" msgid "R-Analog" msgstr "Pravý Analog" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 msgid "RAM" msgstr "RAM" @@ -4236,7 +4389,7 @@ msgstr "Rozsah" msgid "Read-only mode" msgstr "Režim pouze pro čtení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 msgid "Real" msgstr "Opravdová" @@ -4296,9 +4449,9 @@ msgstr "" "\n" "Pokud si nejste jisti, vyberte Žádný." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 msgid "Refresh" msgstr "Obnovit" @@ -4311,6 +4464,7 @@ msgstr "Obnovit Seznam" msgid "Refresh game list" msgstr "Obnovit seznam her" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4322,10 +4476,16 @@ msgstr "Obnovit seznam her" #: 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/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +>>>>>>> Update Greek and Czech translations msgid "Remove" msgstr "Odstranit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4335,16 +4495,20 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "Vykreslit do Hlavního okna" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 msgid "Reset" msgstr "Resetovat" @@ -4356,8 +4520,8 @@ msgstr "Výsledky" msgid "Return" msgstr "Enter" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 msgid "Right" msgstr "Vpravo" @@ -4382,6 +4546,7 @@ msgstr "Ruština" msgid "Sa&ve State" msgstr "Uložit Sta&v" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 msgid "Safe" msgstr "Bezpečná" @@ -4389,14 +4554,16 @@ msgstr "Bezpečná" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Vzorkovací frekvence:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 msgid "Save" msgstr "Uložit" @@ -4470,6 +4637,7 @@ msgstr "Uložit dekomprimované GCM/ISO" msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Uložený stav filmu %s je poškozen, nahrávání filmu je zastaveno..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Scaled EFB Copy" msgstr "EFB Kopie Změněné Velikosti" @@ -4477,6 +4645,8 @@ msgstr "EFB Kopie Změněné Velikosti" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. #, c-format @@ -4513,8 +4683,8 @@ msgstr "Hledat Podadresáře" msgid "Section %s not found in SYSCONF" msgstr "Sekce %s nebyla v SYSCONF nalezena" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 msgid "Select" msgstr "Vybrat" @@ -4527,12 +4697,16 @@ msgstr "Vyberte Soubor s Nahrávkou" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 msgid "Select The Recording File" msgstr "Vyberte Soubor s Nahrávkou" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1349 +>>>>>>> Update Greek and Czech translations msgid "Select a Wii WAD file to install" msgstr "Vyberte soubor Wii WAD k instalování" @@ -4558,6 +4732,7 @@ msgstr "Vybrat plovoucí okna" msgid "Select the file to load" msgstr "Vyberte soubor k nahrání" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4570,15 +4745,22 @@ msgstr "Vyberte stav k nahrání" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1306 +>>>>>>> Update Greek and Czech translations 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:1455 msgid "Select the state to load" msgstr "Vyberte stav k nahrání" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1469 +>>>>>>> Update Greek and Czech translations msgid "Select the state to save" msgstr "Vyberte stav k uložení" @@ -4716,11 +4898,11 @@ msgstr "Zobrazit Panel Nás&trojů" msgid "Show Drives" msgstr "Zobrazit Disky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Show EFB Copy Regions" msgstr "Zobrazit EFB Regiony Kopie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Show FPS" msgstr "Zobrazit Snímky za Sekundu" @@ -4732,7 +4914,7 @@ msgstr "Zobrazit Francii" msgid "Show GameCube" msgstr "Zobrazit GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Show Input Display" msgstr "Zobrazit Obrazovku Vstupu" @@ -4768,7 +4950,7 @@ msgstr "Zobrazit Platformy" msgid "Show Regions" msgstr "Zobrazit Regiony" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Show Statistics" msgstr "Zobrazit Statistiky" @@ -4822,7 +5004,7 @@ msgstr "Zobrazit ikonu uložení" msgid "Show save title" msgstr "Zobrazit název uložení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4842,7 +5024,7 @@ msgstr "Zobrazit tuto zprávu nápovědy" msgid "Show unknown" msgstr "Zobrazit neznámé" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Show various statistics.\n" "\n" @@ -4868,15 +5050,15 @@ msgstr "Velikost" msgid "Skip BIOS" msgstr "Přeskočit BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Skip Dest. Alpha Pass" msgstr "Vypnout Průchod Cíl. Průhl." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 msgid "Skip EFB Access from CPU" msgstr "Přeskočit EFB Přístup z Procesoru" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4888,22 +5070,6 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 -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" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Lehce zrychlí kopie EFB do RAM obětováním přesnosti emulace.\n" -"Někdy také zvýší kvalitu obrazu.\n" -"Pokud se setkáváte s jakýmikoliv problémy, zkuste zvýšit přesnost textury, " -"nebo tuto možnost vypnout.\n" -"\n" -"Pokud si nejste jisti, nechejte toto odškrtnuté." - #: Source/Core/DolphinWX/Src/FrameTools.cpp:387 #: Source/Core/DolphinWX/Src/FrameTools.cpp:399 #, c-format @@ -4957,6 +5123,7 @@ msgstr "Vytvoření vyrovnávací paměti zvuku selhalo: %s" msgid "Space" msgstr "Mezerník" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4966,6 +5133,11 @@ msgstr "Mezerník" #: 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/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +>>>>>>> Update Greek and Czech translations msgid "Spanish" msgstr "Španělština" @@ -4973,7 +5145,7 @@ msgstr "Španělština" msgid "Speaker Volume:" msgstr "Hlasitost Reproduktoru:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 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 " @@ -5009,13 +5181,17 @@ msgstr "Čtvercový Stick" msgid "Standard Controller" msgstr "Standardní Ovladač" +<<<<<<< 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. +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 msgid "Start" msgstr "Start" @@ -5045,32 +5221,21 @@ msgstr "Ukládání stavu" msgid "Stick" msgstr "Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 -#: 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/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Zastavit" -#: 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" -"\n" -"If unsure, leave this checked." -msgstr "" -"Ukládat EFB kopie do objektů textury grafického procesoru.\n" -"Toto není přesné, ale pro většinu her funguje dostatečně dobře a dává větší " -"zrychlení než EFB do RAM.\n" -"\n" -"Pokud si nejste jisti, nechejte toto odškrtnuté." - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Stretch to Window" msgstr "Roztáhnout do Okna" @@ -5104,8 +5269,8 @@ msgstr "Jazyk Systému:" msgid "TAIWAN" msgstr "TCHAJ-WAN" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 msgid "TAS Input" msgstr "TAS Vstup" @@ -5125,13 +5290,17 @@ msgstr "Deska vlevo" msgid "Table Right" msgstr "Deska vpravo" +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Greek and Czech translations msgid "Take Screenshot" msgstr "Vytvořit Snímek Obrazovky" @@ -5143,15 +5312,7 @@ msgstr "" msgid "Test" msgstr "Test" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 -msgid "Texture" -msgstr "Textura" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 -msgid "Texture Cache" -msgstr "Vyrovnávací Paměť Textur" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Texture Format Overlay" msgstr "Překryv Formátu Textury" @@ -5196,7 +5357,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "Soubor %s je už otevřen, hlavička souboru nebude zapsána." -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:281 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Zadaný soubor (%s) neexistuje" @@ -5213,23 +5374,11 @@ msgstr "Jméno nemůže obsahovat znak ','" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "Výsledný rozšifrovaný kód AR neobsahuje žádné řádky." -#: 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" -"\n" -"If unsure, use the second-fastest value from the right." -msgstr "" -"Čím bezpečnější toto bude, tím bude méně pravděpodobné, že emulátoru budou " -"chybět jakékoliv aktualizace textur z RAM.\n" -"\n" -"Pokud si nejste jisti, použijte druhou nejrychlejší hodnotu zprava." - #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 msgid "The save you are trying to copy has an invalid file size" msgstr "Uložená hra, kterou se snažíte zkopírovat má neplatnou délku souboru" -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:363 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5298,7 +5447,7 @@ msgstr "" msgid "This could cause slow down in Wii Menu and some games." msgstr "Toto může způsobit zpomalení ve Wii Menu a v některých hrách." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 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. " @@ -5373,9 +5522,9 @@ msgstr "Do" msgid "Toggle All Log Types" msgstr "Zapnout Všechny Typy Záznamů" -#: 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. @@ -5388,6 +5537,14 @@ msgstr "Přepnout na Celou Obrazovku" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +msgid "Toggle Fullscreen" +msgstr "Přepnout na Celou Obrazovku" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +>>>>>>> Update Greek and Czech translations msgid "Top" msgstr "Nahoře" @@ -5395,7 +5552,7 @@ msgstr "Nahoře" msgid "Traditional Chinese" msgstr "Tradiční Čínština" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:375 msgid "Tried to load an unknown file type." msgstr "Pokus o načtení souboru neznámého typu." @@ -5431,8 +5588,8 @@ msgstr "Typ" msgid "UDP Port:" msgstr "UDP Port:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5507,9 +5664,13 @@ msgstr "" "Neznámý ukazatel %#08x\n" "Pokračovat?" +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 msgid "Up" msgstr "Nahoru" @@ -5526,7 +5687,7 @@ msgstr "Svislý Wiimote" msgid "Use EuRGB60 Mode (PAL60)" msgstr "Použít režim EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 msgid "Use Fullscreen" msgstr "Použít Celou Obrazovku" @@ -5538,7 +5699,7 @@ msgstr "Použít Šestnáctkovou soustavu" msgid "Use Panic Handlers" msgstr "Použít Obslužné Rutiny Paniky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5551,7 +5712,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5565,11 +5726,11 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Utility" msgstr "Pomůcky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:292 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:288 msgid "V-Sync" msgstr "V-Synch" @@ -5593,7 +5754,8 @@ msgstr "Úroveň" msgid "Video" msgstr "Obraz" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451 msgid "Virtual" msgstr "Virtuální" @@ -5620,21 +5782,21 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." -#: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/Common/Src/MsgHandler.cpp:67 msgid "Warning" msgstr "Varování" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:240 msgid "Warning - starting DOL in wrong console mode!" msgstr "Varování - DOL se spouští ve špatném režimu konzole!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:290 msgid "Warning - starting ELF in wrong console mode!" msgstr "Varování - ELF se spouští ve špatném režimu konzole!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:185 msgid "Warning - starting ISO in wrong console mode!" msgstr "Varování - ISO se spouští ve špatném režimu konzole!" @@ -5706,7 +5868,7 @@ msgstr "WaveFileWriter - soubor není otevřen." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Widescreen Hack" msgstr "Hack Širokoúhlého obrazu" @@ -5730,11 +5892,15 @@ msgstr "Wii Kořen NAND:" msgid "Wii Save Import" msgstr "Import uložených pozic 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:1308 +>>>>>>> Update Greek and Czech translations msgid "Wii save files (*.bin)|*.bin" msgstr "Wii soubory s uložením (*.bin)|*.bin" @@ -5742,8 +5908,8 @@ msgstr "Wii soubory s uložením (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD Nelze číst ze souboru" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 #: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/Core/Src/HW/Wiimote.cpp:16 msgid "Wiimote" msgstr "Wiimote" @@ -5765,11 +5931,15 @@ msgstr "" "nebo je to vypršení limitu neaktivity, nebo z jiného důvodu.\n" "Chcete ho hned znovu připojit?" +<<<<<<< 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:609 +>>>>>>> Update Greek and Czech translations msgid "Wiimote Connected" msgstr "Wiimote Připojen" @@ -5801,12 +5971,16 @@ msgstr "Klávesa Windows Vpravo" msgid "Word Wrap" msgstr "Zalamování textu" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1362 +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. @@ -5915,7 +6089,7 @@ msgstr "Nulový kód, který dolphin nezná: %08x" msgid "[ waiting ]" msgstr "[ čekám ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5931,7 +6105,7 @@ msgstr "" msgid "[Custom]" msgstr "[Vlastní]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5950,7 +6124,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -6057,6 +6231,9 @@ msgstr "| NEBO" #~ msgid "< as Default Profile >" #~ msgstr "< jako Výchozí Profil >" +#~ msgid "Accuracy:" +#~ msgstr "Přesnost:" + #~ msgid "Accurate Texture Cache" #~ msgstr "Precizní Vyrovnávací Paměť Textur" @@ -6076,6 +6253,9 @@ msgstr "| NEBO" #~ "ale zapnutí této možnosti může mít také velký negativní dopad na výkon " #~ "pokud hra tuto funkci hodně využívá." +#~ msgid "Alternate Wiimote Timing" +#~ msgstr "Střídat časování Wiimote" + #~ msgid "Auto [recommended]" #~ msgstr "Auto [doporučeno]" @@ -6088,6 +6268,17 @@ msgstr "| NEBO" #~ "nastavená pomocí změny velikosti EFB.\n" #~ "Při používání tohoto je nejlepší nastavit poměr stran na roztáhnutí." +#~ msgid "" +#~ "Automatically generate mipmaps rather than decoding them from memory.\n" +#~ "Increases performance a bit but might cause minor texture defects.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "Automaticky vytvořit mipmapy, raději než dekódovat je z paměti.\n" +#~ "Trochu zlepší výkon, ale může způsobit malé chyby paměti.\n" +#~ "\n" +#~ "Pokud si nejste jisti, nechejte toto zaškrtnuté." + #~ msgid "" #~ "Calculates lighting of 3D graphics on a per-pixel basis rather than per " #~ "vertex.\n" @@ -6124,9 +6315,6 @@ msgstr "| NEBO" #~ msgid "Danish" #~ msgstr "Dánština" -#~ msgid "Disable Wiimote Speaker" -#~ msgstr "Zakázat Reproduktor Wiimote" - #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -6172,6 +6360,9 @@ msgstr "| NEBO" #~ msgid "Enable CPU Access" #~ msgstr "Povolit Přístup k Procesoru" +#~ msgid "Enable Cache" +#~ msgstr "Povolit vyrovnávací paměť" + #~ msgid "Enable Copy to EFB" #~ msgstr "Povolit Kopírování do EFB" @@ -6230,6 +6421,12 @@ msgstr "| NEBO" #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "Nelze nahrát DSP ROM : %s" +#~ msgid "Fast" +#~ msgstr "Rychlá" + +#~ msgid "Fast Mipmaps" +#~ msgstr "Rychlé Mipmapy" + #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -6343,9 +6540,15 @@ msgstr "| NEBO" #~ msgid "Required for using the Japanese ROM font." #~ msgstr "Nutné pro použití Japonského písma ROM" +#~ msgid "Safe" +#~ msgstr "Bezpečná" + #~ msgid "Scale:" #~ msgstr "Změna Velikosti:" +#~ msgid "Scaled EFB Copy" +#~ msgstr "EFB Kopie Změněné Velikosti" + #~ msgid "Select resolution for fullscreen mode" #~ msgstr "Vyberte rozlišení v režimu celé obrazovky" @@ -6390,6 +6593,21 @@ msgstr "| NEBO" #~ "Zobrazí různé statistiky.\n" #~ "Jsou užitečné pouze pro účely ladění." +#~ 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" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Lehce zrychlí kopie EFB do RAM obětováním přesnosti emulace.\n" +#~ "Někdy také zvýší kvalitu obrazu.\n" +#~ "Pokud se setkáváte s jakýmikoliv problémy, zkuste zvýšit přesnost " +#~ "textury, nebo tuto možnost vypnout.\n" +#~ "\n" +#~ "Pokud si nejste jisti, nechejte toto odškrtnuté." + #~ msgid "Slot" #~ msgstr "Slot" @@ -6423,6 +6641,7 @@ msgstr "| NEBO" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Spustí vykreslovací okno v režimu celé obrazovky." +<<<<<<< HEAD <<<<<<< HEAD #~ msgid "" #~ "Unknown pointer %#08x\n" @@ -6433,6 +6652,38 @@ msgstr "| NEBO" ======= >>>>>>> Update translation files for recent changes in the code. +======= +#~ 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" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "Ukládat EFB kopie do objektů textury grafického procesoru.\n" +#~ "Toto není přesné, ale pro většinu her funguje dostatečně dobře a dává " +#~ "větší zrychlení než EFB do RAM.\n" +#~ "\n" +#~ "Pokud si nejste jisti, nechejte toto odškrtnuté." + +#~ msgid "Texture" +#~ msgstr "Textura" + +#~ msgid "Texture Cache" +#~ msgstr "Vyrovnávací Paměť Textur" + +#~ msgid "" +#~ "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 "" +#~ "Čím bezpečnější toto bude, tím bude méně pravděpodobné, že emulátoru " +#~ "budou chybět jakékoliv aktualizace textur z RAM.\n" +#~ "\n" +#~ "Pokud si nejste jisti, použijte druhou nejrychlejší hodnotu zprava." + +>>>>>>> Update Greek and Czech translations #~ msgid "Use FPS For Limiting" #~ msgstr "Použít SzS pro Omezení" diff --git a/Languages/po/el.po b/Languages/po/el.po index 30b56b762f..c9e9dda7d7 100644 --- a/Languages/po/el.po +++ b/Languages/po/el.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:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" "PO-Revision-Date: 2011-09-13 17:28+0200\n" >>>>>>> Update translation files for recent changes in the code. +======= +"POT-Creation-Date: 2011-08-10 08:30-0500\n" +"PO-Revision-Date: 2011-10-15 11:16+0200\n" +>>>>>>> Update Greek and Czech translations "Last-Translator: Linktothepast \n" "Language-Team: Gpower2 \n" "Language: Greek\n" @@ -37,7 +42,7 @@ msgstr "Παιχνίδι : " msgid "! NOT" msgstr "! NOT" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:72 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:69 #, c-format msgid "" "\"%s\" does not exist.\n" @@ -81,7 +86,7 @@ msgid "%s failed to be scrubbed. Probably the image is corrupt." msgstr "" "%s απέτυχε να γίνει scrubbed. Πιθανότατα το αρχείο εικόνας είναι φθαρμένο." -#: Source/Core/Core/Src/HW/GCMemcard.cpp:97 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:97 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -90,7 +95,7 @@ msgstr "" "%s απέτυχε να φορτώσει ως κάρτα μνήμης\n" " Το μέγεθος του αρχείου της κάρτας δεν είναι έγκυρο (0x%x bytes)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:112 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:112 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -99,7 +104,7 @@ msgstr "" "%s απέτυχε να φορτώσει ως κάρτα μνήμης\n" " Το μέγεθος της κάρτας δεν είναι έγκυρο (0x%x bytes)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:92 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:92 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -318,7 +323,7 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(ΑΓΝΩΣΤΟ)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:381 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(ανενεργό)" @@ -330,7 +335,7 @@ msgstr "16 bit" msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "3D Vision" msgstr "3D Vision" @@ -342,7 +347,7 @@ msgstr "8 bit" msgid "" msgstr "<Εισάγετε όνομα εδώ>" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:258 msgid "" msgstr "<Δε βρέθηκαν αναλύσεις>" @@ -429,6 +434,7 @@ msgstr "Σχετικά με το Dolphin" msgid "Acceleration" msgstr "Επιτάχυνση" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Accuracy:" <<<<<<< HEAD @@ -437,13 +443,19 @@ msgstr "Ακρίβεια:" msgstr "" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Accurate VBeam emulation" msgstr "Ακριβής VBeam εξομοίωση" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 <<<<<<< HEAD ======= +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +>>>>>>> Update Greek and Czech translations #, fuzzy >>>>>>> Update translation files for recent changes in the code. msgid "" @@ -451,7 +463,7 @@ msgid "" "Some games depend on this for certain graphical effects or gameplay " "functionality.\n" "\n" -"If unsure, check EFB to Texture instead." +"If unsure, leave this checked." msgstr "" "Εξομοιώνει με ακρίβεια τα EFB αντίγραφα.\n" "Κάποια παιχνίδια βασίζονται σε αυτό για ορισμένα εφέ γραφικών ή λειτουργίες " @@ -552,12 +564,12 @@ msgstr "Action Replay: Normal Code %i: Μη έγκυρο subtype %08x (%s)" msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: Normal Code 0: Μη έγκυρο Subtype %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:249 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:245 msgid "Adapter:" msgstr "Προσαρμογέας:" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 msgid "Add" msgstr "Προσθήκη" @@ -573,6 +585,7 @@ msgstr "Προσθήκη Patch" msgid "Add new pane" msgstr "Προσθήκη νέου pane" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -582,6 +595,11 @@ msgstr "Προσθήκη νέου pane" #: 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/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +>>>>>>> Update Greek and Czech translations msgid "Add..." msgstr "Προσθήκη..." @@ -617,7 +635,7 @@ msgstr "" "Ρύθμιση της απαιτούμενης πίεσης του αναλογικού χειριστηρίου για την " "ενεργοποίηση των κουμπιών." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486 msgid "Advanced" msgstr "Για προχωρημένους" @@ -637,6 +655,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 @@ -644,6 +663,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:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> Update Greek and Czech translations msgid "All Save States (sav, s##)" msgstr "Όλα τα Σημεία Αποθήκευσης(sav, s##)" @@ -659,7 +682,7 @@ msgstr "Όλα τα συμπιεσμένα αρχεία GC/Wii ISO (gcz)" msgid "All files (*.*)|*.*" msgstr "Όλα τα αρχεία (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " "emulation window.\n" @@ -671,6 +694,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 <<<<<<< HEAD msgid "Alternate Wiimote Timing" @@ -682,10 +706,13 @@ msgstr "Εξομοιωμένο Wiimote" >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 +>>>>>>> Update Greek and Czech translations msgid "Anisotropic Filtering:" msgstr "Ανισοτροπικό Φιλτράρισμα:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:355 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "Εξομάλυνση Ορίων:" @@ -705,7 +732,7 @@ msgstr "Apploader:" msgid "Apply" msgstr "Εφαρμογή" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -742,8 +769,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 +>>>>>>> Update Greek and Czech translations msgid "Aspect Ratio:" msgstr "Αναλογία Οθόνης:" @@ -767,20 +798,24 @@ msgstr "AudioCommon: Σφάλμα ανοίγματος AO συσκευής.\n" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +>>>>>>> Update Greek and Czech translations msgid "Auto" msgstr "Αυτόματα" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "Αυτόματα (Πολλαπλάσιο του 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "Αυτόματα (Μέγεθος Παραθύρου)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Auto adjust Window Size" msgstr "Αυτόματη Προσαρμογή Μεγέθους Παραθύρου" @@ -795,6 +830,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Automatically generate mipmaps rather than decoding them from memory.\n" @@ -811,6 +847,8 @@ msgstr "" ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/WXInputBase.cpp:27 msgid "Back" msgstr "Πίσω" @@ -819,8 +857,8 @@ msgstr "Πίσω" msgid "Backend Settings" msgstr "Backend Ρυθμίσεις" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:209 #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:213 msgid "Backend:" msgstr "Backend:" @@ -854,7 +892,7 @@ msgstr "Εικονίδιο:" msgid "Bar" msgstr "Bar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "Βασικές" @@ -866,7 +904,7 @@ msgstr "Βασικές Ρυθμίσεις" msgid "Bass" msgstr "Μπάσο" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:188 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:188 msgid "Block Allocation Table checksum failed" msgstr "Αποτυχία ελέγχου checksum για τον BAT" @@ -886,12 +924,17 @@ msgstr "Αριστερό Μπλε" msgid "Blue Right" msgstr "Δεξί Μπλε" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< 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:272 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +>>>>>>> Update Greek and Czech translations msgid "Bottom" msgstr "Βάση" @@ -924,13 +967,18 @@ msgstr "Εύρεση φακέλου προορισμού" 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/DolphinWX/Src/UDPConfigDiag.cpp:23 +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 msgid "Buttons" msgstr "Κουμπιά" @@ -946,11 +994,11 @@ msgstr "Stick Κάμερας" msgid "CPU Emulator Engine" msgstr "Μηχανή Εξομοίωσης CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465 msgid "Cache Display Lists" msgstr "Cache Display Lists" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 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 " @@ -966,7 +1014,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το επιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -981,8 +1029,8 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 msgid "Cancel" msgstr "Άκυρο" @@ -1026,10 +1074,10 @@ msgstr "Αποτυχία εύρεσης WiiMote με bd: %02x:%02x:%02x:%02x:%02 msgid "Cant find WiiMote by connection handle %02x" msgstr "Αδυναμία εύρεσης του WiiMote με handle σύνδεσης %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "Αδυναμία ανάγνωσης από το DVD_Plugin - DVD-Interface: Κρίσιμο Σφάλμα" @@ -1156,10 +1204,10 @@ msgstr "Κυκλικό Stick" msgid "Classic" msgstr "Κλασικό Χειριστήριο" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 msgid "Clear" msgstr "Καθάρισ." @@ -1175,14 +1223,18 @@ msgstr "" "Ο Client έχει αποσυνδεθεί ενώ το παιχνίδι εκτελείται!! Το NetPlay έχει " "απενεργοποιηθεί. Θα πρέπει να σταματήσετε χειροκίνητα το παιχνίδι." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 +>>>>>>> Update Greek and Czech translations msgid "Close" msgstr "Κλείσιμο" @@ -1290,11 +1342,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:608 +>>>>>>> Update Greek and Czech translations msgid "Connecting..." msgstr "Γίνεται Σύνδεση..." @@ -1365,7 +1421,7 @@ msgstr "" "(ο καθορισμός των χειριστηρίων ενώ το παιχνίδι τρέχει δεν υποστηρίζεται προς " "το παρόν)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1442,11 +1498,11 @@ msgstr "Δημιουργός: " msgid "Critical" msgstr "Κρίσιμο" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Crop" msgstr "Κόψιμο" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1493,12 +1549,17 @@ msgstr "Ήχος (DSP)" msgid "DSP Emulator Engine" msgstr "Μηχανή Εξομοίωσης DSP" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< 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:248 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +>>>>>>> Update Greek and Czech translations msgid "DSP HLE emulation (fast)" msgstr "DSP HLE εξομοίωση (γρήγορη)" @@ -1547,7 +1608,7 @@ msgstr "Νεκρή Ζώνη" msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Debugging" msgstr "Debugging" @@ -1580,8 +1641,8 @@ msgstr "Προεπιλεγμένο ISO:" msgid "Default font" msgstr "Προεπιλεγμένη γραμματοσειρά" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 msgid "Delete" msgstr "Διαγραφή" @@ -1589,12 +1650,12 @@ msgstr "Διαγραφή" msgid "Delete Save" msgstr "Διαγραφή Αποθήκευσης" -#: Source/Core/VideoCommon/Src/AVIDump.cpp:77 +#: Source/Core/VideoCommon/Src/AVIDump.cpp:73 #, c-format msgid "Delete the existing file '%s'?" msgstr "Διαγραφή του υπάρχοντος αρχείου '%s';" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:651 msgid "Description" msgstr "Περιγραφή" @@ -1625,15 +1686,15 @@ msgstr "Ρυθμίσεις Συσκευής" msgid "Dial" msgstr "Dial" -#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146 +#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:147 msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:129 msgid "Direct3D9" msgstr "Direct3D9" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:169 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:169 msgid "" "Directory checksum failed\n" " and Directory backup checksum failed" @@ -1641,28 +1702,32 @@ msgstr "" "Το checksum του Καταλόγου απέτυχε\n" " καθώς και το checksum του εφεδρικού Καταλόγου απέτυχε" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 msgid "Disable" msgstr "Απενεργοποίηση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Disable Fog" msgstr "Απενεργοποίηση Ομίχλης" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Disable Lighting" msgstr "Απενεργοποίηση Φωτισμού" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Disable Per-Pixel Depth" msgstr "Απενεργοποίηση Βάθους ανά Pixel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Textures" msgstr "Απενεργοποίηση Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +msgid "Disable Wiimote Speaker" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1676,7 +1741,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το επιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1692,7 +1757,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" "Disable texturing.\n" "\n" @@ -1711,11 +1776,11 @@ msgstr "Δίσκος" msgid "Disc Read Error" msgstr "Σφάλμα Ανάγνωσης Δίσκου" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "Οθόνη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1729,11 +1794,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:1051 +>>>>>>> Update Greek and Czech translations msgid "Do you want to stop the current emulation?" msgstr "Θέλετε να σταματήσετε την τρέχουσα εξομοίωση;" @@ -1741,7 +1810,7 @@ msgstr "Θέλετε να σταματήσετε την τρέχουσα εξο msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:185 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Ρυθμίσεις Γραφικών Dolphin %s" @@ -1762,6 +1831,7 @@ msgstr "Ρυθμίσεις Εξοιμοιωμένου Dolphin Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1771,12 +1841,19 @@ msgstr "Ρυθμίσεις Dolphin GCPad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1202 +>>>>>>> Update Greek and Czech translations msgid "Dolphin GCPad Configuration" msgstr "Ρυθμίσεις Dolphin GCPad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +>>>>>>> Update Greek and Czech translations msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Ταινίες (*.dtm)" @@ -1812,8 +1889,8 @@ msgstr "" "Το Dolphin είναι ρυθμισμένο να αποκρύπτει όλα τα παιχνίδια. Κάντε διπλό κλίκ " "εδώ για να εμφανιστούν όλα τα παιχνίδια..." -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 msgid "Down" msgstr "Κάτω" @@ -1838,19 +1915,19 @@ msgstr "Dummy" msgid "Dump Audio" msgstr "Εξαγωγή Ήχου" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Dump EFB Target" msgstr "Εξαγωγή EFB Target" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:511 msgid "Dump Frames" msgstr "Εξαγωγή Καρέ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:508 msgid "Dump Textures" msgstr "Εξαγωγή Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1861,7 +1938,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1872,7 +1949,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1882,6 +1959,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1891,6 +1969,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/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +>>>>>>> Update Greek and Czech translations msgid "Dutch" msgstr "Ολλανδικά" @@ -1898,7 +1981,7 @@ msgstr "Ολλανδικά" msgid "E&xit" msgstr "Έ&ξοδος" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:430 msgid "EFB Copies" msgstr "EFB Αντίγραφα" @@ -1952,7 +2035,7 @@ msgstr "Επεξεργασία..." msgid "Effect" msgstr "Εφέ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 msgid "Embedded Frame Buffer" msgstr "Embedded Frame Buffer" @@ -1960,7 +2043,7 @@ msgstr "Embedded Frame Buffer" msgid "Emu Thread already running" msgstr "Το νήμα εξομοίωσης εκτελείται ήδη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1975,7 +2058,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, επιλέξτε εικονική XFB εξομοίωση." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -2003,7 +2086,7 @@ msgstr "Κατάσταση Λειτουργίας:" msgid "Enable" msgstr "Ενεργοποίηση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -2035,6 +2118,7 @@ msgstr "Ενεργοποίηση BAT" msgid "Enable Block Merging" msgstr "Ενεργοποίηση Block Merging" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" @@ -2051,6 +2135,8 @@ msgstr "Ενεργοποίηση Cache" msgid "Enable Cache" msgstr "Ενεργοποίηση Cheat" +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 >>>>>>> Update translation files for recent changes in the code. msgid "Enable Cheats" @@ -2068,7 +2154,7 @@ msgstr "Ενεργοποίηση Διπλού Πυρήνα" msgid "Enable Dual Core (speedup)" msgstr "Ενεργοποίηση Διπλού Πυρήνα (επιτάχυνση)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 msgid "Enable Hotkeys" msgstr "Ενεργοποίηση Συντομεύσεων" @@ -2084,8 +2170,8 @@ msgstr "Ενεργοποίηση Idle Skipping (επιτάχυνση)" msgid "Enable MMU" msgstr "Ενεργοποίηση MMU" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 msgid "Enable Progressive Scan" msgstr "Ενεργοποίηση Προοδευτικής Σάρωσης" @@ -2097,7 +2183,7 @@ msgstr "Ενεργοποίηση Προφύλαξης Οθόνης" msgid "Enable WideScreen" msgstr "Ενεργοποίηση Ευρείας Οθόνης" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Enable Wireframe" msgstr "Ενεργοποίηση Wireframe" @@ -2199,7 +2285,7 @@ msgstr "" "Ενεργοποιεί τη Μονάδα Διαχείρισης Μνήμης, απαραίτητο για μερικά παιχνίδια. " "(Ενεργό = Συμβατό, Ανενεργό = Γρήγορο)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2213,6 +2299,7 @@ msgstr "" msgid "End" msgstr "Τέλος" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2222,11 +2309,16 @@ 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/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +>>>>>>> Update Greek and Czech translations msgid "English" msgstr "Αγγλικά" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:334 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:411 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 msgid "Enhancements" msgstr "Βελτιώσεις" @@ -2248,6 +2340,7 @@ msgstr "Εγγραφή 1/%d" msgid "Equal" msgstr "Ίσο" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD @@ -2263,12 +2356,20 @@ msgid "" msgstr "" ======= +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Error" msgstr "Σφάλμα" +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 +======= +#: Source/Core/DolphinWX/Src/Main.cpp:356 +>>>>>>> Update Greek and Czech translations msgid "Error loading selected language. Falling back to system default." msgstr "" "Αποτυχία φόρτωσης της επιλεγμένης γλώσσας. Επαναφορά στην προεπιλογή " @@ -2357,7 +2458,7 @@ msgstr "Εξαγωγή αποθήκευσης ως..." msgid "Extension" msgstr "Επέκταση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 msgid "External Frame Buffer" msgstr "Εξωτερικό Frame Buffer" @@ -2480,7 +2581,7 @@ msgstr "Αποτυχία φόρτωσης hid.dll" msgid "Failed to read banner.bin" msgstr "Αποτυχία ανάγνωσης banner.bin" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:150 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:150 msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" @@ -2488,7 +2589,7 @@ msgstr "" "Αποτυχία σωστής ανάγνωσης του αντιγράφου ασφαλείας του BAT\n" "(0x8000-0x9FFF)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:144 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:144 msgid "" "Failed to read block allocation table correctly\n" "(0x6000-0x7FFF)" @@ -2501,7 +2602,7 @@ msgstr "" msgid "Failed to read data from file %d" msgstr "Αποτυχία ανάγνωσης δεδομένων από το αρχείο %d" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:138 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:138 msgid "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" @@ -2509,7 +2610,7 @@ msgstr "" "Αποτυχία σωστής ανάγνωσης του αντιγράφου ασφαλείας των φακέλων\n" "(0x4000-0x5FFF)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:132 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:132 msgid "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" @@ -2517,7 +2618,7 @@ msgstr "" "Αποτυχία σωστής ανάγνωσης των φακέλων\n" "(0x2000-0x3FFF)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:121 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:121 msgid "" "Failed to read header correctly\n" "(0x0000-0x1FFF)" @@ -2525,7 +2626,7 @@ msgstr "" "Αποτυχία σωστής ανάγνωσης της κεφαλίδας\n" "(0x0000-0x1FFF)" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:222 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:222 msgid "" "Failed to read save data\n" "(0xA000-)\n" @@ -2554,6 +2655,7 @@ msgstr "Αποτυχία εγγραφής της κεφαλίδας για το msgid "Failed to write header for file %d" msgstr "Αποτυχία εγγραφής της κεφαλίδας για το αρχείο %d" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 msgid "Fast" <<<<<<< HEAD @@ -2570,6 +2672,8 @@ msgid "Fast Mipmaps" msgstr "" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Fast version of the MMU. Does not work for every game." msgstr "Γρήγορη έκδοση του MMU. Δε δουλεύει για όλα τα παιχνίδια." @@ -2598,7 +2702,7 @@ msgstr "" "Το αρχείο απέτυχε στο άνοιγμα\n" "ή δεν έχει έγκυρη επέκταση" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:86 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:86 #, c-format msgid "" "File has the extension \"%s\"\n" @@ -2636,11 +2740,11 @@ msgstr "Πρώτο Μπλοκ" msgid "Fix Checksums" msgstr "Επιδιόρθωση Checksum" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Force 16:9" msgstr "Επιβολή 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Force 4:3" msgstr "Επιβολή 4:3" @@ -2648,11 +2752,11 @@ msgstr "Επιβολή 4:3" msgid "Force Console as NTSC-J" msgstr "Επιβολή της Κονσόλας ως NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 msgid "Force Texture Filtering" msgstr "Επιβολή Φιλτραρίσματος Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2688,7 +2792,7 @@ msgstr "" "Άμα αφεθεί αποεπιλεγμένο, το dolphin προεπιλέγει τη NTSC-U και ενεργοποιεί " "αυτόματα αυτήν την ρύθμιση όταν παίζονται Ιαπωνικά παιχνίδια." -#: Source/Core/Core/Src/HW/GCMemcard.cpp:76 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:73 msgid "" "Format as ascii (NTSC\\PAL)?\n" "Choose no for sjis (NTSC-J)" @@ -2714,7 +2818,7 @@ msgstr "Καρέ" msgid "Frame Advance" msgstr "Προώθηση ανά Καρέ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:514 msgid "Frame Dumps use FFV1" msgstr "FFV1 Για Τα Εξαγώμενα Καρέ" @@ -2734,10 +2838,11 @@ msgstr "Περιορισμός Καρέ:" msgid "Frames To Record" msgstr "Καρέ Προς Εγγραφή" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:512 msgid "Free Look" msgstr "Ελεύθερη Ματιά" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2747,6 +2852,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/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +>>>>>>> Update Greek and Czech translations msgid "French" msgstr "Γαλλικά" @@ -2763,7 +2873,7 @@ msgstr "Από" msgid "FullScr" msgstr "Πλήρης Οθόνη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 msgid "Fullscreen resolution:" msgstr "Ανάλυση Πλήρους Οθόνης:" @@ -2812,12 +2922,17 @@ msgstr "Gamecube" msgid "Gamecube &Pad Settings" msgstr "Ρυθμίσεις Gamecube &Pad" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< 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:1007 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +>>>>>>> Update Greek and Czech translations msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Κάρτες Μνήμης Gamecube (*.raw,*.gcp)" @@ -2839,6 +2954,7 @@ msgstr "" "Ο Κωδικός Gecko απέτυχε να εκτελεστεί (CT%i CST%i) (%s)\n" "(ή είναι ένας κακός κωδικός ή ο τύπος του κωδικού δεν υποστηρίζεται.)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 @@ -2847,6 +2963,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +>>>>>>> Update Greek and Czech translations msgid "General" msgstr "Γενικά" @@ -2854,6 +2975,7 @@ msgstr "Γενικά" msgid "General Settings" msgstr "Γενικές Ρυθμίσεις" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2863,6 +2985,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/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +>>>>>>> Update Greek and Czech translations msgid "German" msgstr "Γερμανικά" @@ -2885,17 +3012,19 @@ msgstr "Ρυθμίσεις Γραφικών" msgid "Greater Than" msgstr "Μεγαλύτερο από" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 <<<<<<< HEAD ======= +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +>>>>>>> Update Greek and Czech translations #, fuzzy >>>>>>> Update translation files for recent changes in the code. msgid "" -"Greatly increases quality of textures generated using render to texture " +"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" "\n" "If unsure, leave this checked." msgstr "" @@ -2931,11 +3060,11 @@ msgstr "Κιθάρα" msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "Γίνεται κλήση του HCI_CMD_INQUIRY, παρακαλώ αναφέρετε!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:420 msgid "Hacks" msgstr "Hacks" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:160 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:160 msgid "Header checksum failed" msgstr "Αποτυχία ελέγχου κεφαλίδας" @@ -2971,7 +3100,7 @@ msgstr "" msgid "Hide" msgstr "Απόκρυψη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "Απόκρυψη Δείκτη Ποντικιού" @@ -2999,6 +3128,7 @@ msgstr "Host" msgid "Hotkey Configuration" msgstr "Ρυθμίσεις Πλήκτρων Συντόμευσης" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 @@ -3006,6 +3136,10 @@ msgstr "Ρυθμίσεις Πλήκτρων Συντόμευσης" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 +>>>>>>> Update Greek and Czech translations msgid "Hotkeys" msgstr "Πλήκτρα Συντόμευσης" @@ -3100,11 +3234,11 @@ msgstr "" "θα πρέπει επίσης να απενεργοποιήσετε το Throttle Ήχου στο DSP για να έχει " "αποτέλεσμα. " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 msgid "Ignore Format Changes" msgstr "Αγνόηση Αλλαγών Format" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -3118,7 +3252,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το επιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 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 " @@ -3161,7 +3295,7 @@ msgstr "" "Το εισαγώμενο αρχείο έχει sav επέκταση\n" "άλλα δεν έχει σωστή κεφαλίδα." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3173,7 +3307,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Improves performance but causes lighting to disappear in most games.\n" "\n" @@ -3192,8 +3326,8 @@ msgstr "Εντός Παιχνιδιού" msgid "In-Game" msgstr "Εντός Παιχνιδιού" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 msgid "Info" msgstr "Πληροφορίες" @@ -3236,11 +3370,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:1361 +>>>>>>> Update Greek and Czech translations msgid "Installing WAD..." msgstr "Γίνεται εγκατάσταση WAD..." @@ -3269,7 +3407,7 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "Εσωτερικό Σφάλμα LZO - αποτυχία lzo_init()" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:349 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 msgid "Internal Resolution:" msgstr "Εσωτερική Ανάλυση:" @@ -3322,6 +3460,7 @@ msgstr "Μη έγκυρο αρχείο εγγραφής" msgid "Invalid state" msgstr "Μη έγκυρο κατάσταση" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3331,6 +3470,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/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +>>>>>>> Update Greek and Czech translations msgid "Italian" msgstr "Ιταλικά" @@ -3392,8 +3536,8 @@ msgstr "Τελευταίο Επαναγραμμένο Σημείο Αποθ." msgid "Last Saved State" msgstr "Τελευταίο Αποθηκευμένο Σημείο Αποθ." -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 msgid "Left" msgstr "Αριστερά" @@ -3440,7 +3584,7 @@ msgstr "Περιορισμός με βάση τα Καρέ" msgid "Load" msgstr "Φόρτωσ." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509 msgid "Load Custom Textures" msgstr "Φόρτωση Τροποποιημένων Υφών" @@ -3488,6 +3632,7 @@ msgstr "Φόρτωση Σημείου Αποθήκευσης 8" msgid "Load State..." msgstr "Φόρτωση Σημείου Αποθήκευσης..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3501,11 +3646,18 @@ msgstr "Φόρτωση Μενού Συστήματος Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1400 +msgid "Load Wii System Menu" +msgstr "Φόρτωση Μενού Συστήματος Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +>>>>>>> Update Greek and Czech translations #, c-format msgid "Load Wii System Menu %d%c" msgstr "Φόρτωση Μενού Συστήματος Wii %d%c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3547,8 +3699,8 @@ msgstr "Τύποι Καταγραφής" msgid "Logger Outputs" msgstr "Έξοδοι Καταγραφής" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 #: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 msgid "Logging" msgstr "Καταγραφή" @@ -3582,12 +3734,16 @@ 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. +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 msgid "Main Stick" msgstr "Κύριο Stick" @@ -3616,12 +3772,17 @@ msgstr "Η κάρτα μνήμης είναι ήδη ανοιχτή" msgid "Memory Byte" msgstr "Memory Byte" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< 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:84 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 +>>>>>>> Update Greek and Czech translations msgid "Memory Card" msgstr "Κάρτα Μνήμης" @@ -3650,7 +3811,7 @@ msgstr "" "%s\n" "Θέλετε να αντιγράψετε το παλιό αρχείο σε αυτή την νέα τοποθεσία;\n" -#: Source/Core/Core/Src/HW/GCMemcard.cpp:126 +#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" msgstr "" "Το μέγεθος του αρχείου της κάρτας μνήμης δεν ταιριάζει με το μέγεθος της " @@ -3669,7 +3830,7 @@ msgstr "Μικρόφωνο" msgid "Min" msgstr "Ελάχιστη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 msgid "Misc" msgstr "Διάφορα" @@ -3682,7 +3843,7 @@ msgstr "Διάφορες Ρυθμίσεις" msgid "Modifier" msgstr "Modifier" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3708,7 +3869,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Μοτέρ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:634 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3821,13 +3982,17 @@ 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. +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 msgid "Name:" msgstr "Όνομα:" @@ -3912,11 +4077,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:607 +>>>>>>> Update Greek and Czech translations msgid "Not connected" msgstr "Μη Συνδεδεμένο" @@ -3945,8 +4114,8 @@ msgstr "Num Lock" msgid "Number Of Codes: " msgstr "Αριθμός Κωδικών: " -#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 msgid "Nunchuk" msgstr "Nunchuk" @@ -3975,12 +4144,15 @@ msgstr "Offset:" msgid "Only %d blocks available" 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/FrameTools.cpp:433 +>>>>>>> Update Greek and Czech translations msgid "Open" msgstr "Άνοιγμα" @@ -4010,11 +4182,11 @@ msgstr "OpenAL: αδυναμία εύρεσης συσκευών ήχου" msgid "OpenAL: can't open device %s" msgstr "OpenAL: αδυναμία ανοίγματος της συσκευής %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 msgid "OpenCL Texture Decoder" msgstr "OpenCL Αποκωδικοποιητής Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "OpenMP Texture Decoder" msgstr "OpenMP Αποκωδικοποιητής Υφών" @@ -4046,8 +4218,8 @@ msgstr "" "Κάντε δεξί κλίκ, εξάγετε όλα τα αρχεία αποθήκευσης\n" "και εισάγετέ τα σε μία νέα κάρτα μνήμης.\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 msgid "Other" msgstr "Άλλα" @@ -4112,6 +4284,7 @@ msgstr "Patches" msgid "Paths" msgstr "Φάκελοι" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -4119,11 +4292,15 @@ msgstr "Φάκελοι" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1603 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1604 msgid "Pause" msgstr "Παύση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Per-Pixel Lighting" msgstr "Φωτισμός ανά Pixel" @@ -4136,15 +4313,20 @@ msgstr "Τέλειο" msgid "Perspective %d" 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:1612 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1613 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 +>>>>>>> Update Greek and Czech translations msgid "Play" msgstr "Αναπαραγωγή" @@ -4170,11 +4352,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:1052 +>>>>>>> Update Greek and Czech translations msgid "Please confirm..." msgstr "Παρακαλώ επιβεβαιώστε..." @@ -4219,7 +4405,7 @@ msgstr "Πορτογαλικά" msgid "Portuguese (Brazilian)" msgstr "Πορτογαλικά (Βραζιλιάνικα)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "Post-Processing Εφέ:" @@ -4293,7 +4479,7 @@ msgstr "R Button" msgid "R-Analog" msgstr "R-Αναλογική" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 msgid "RAM" msgstr "RAM" @@ -4310,7 +4496,7 @@ msgstr "Εύρος" msgid "Read-only mode" msgstr "Μόνο Για Ανάγνωση (Εγγραφής)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 msgid "Real" msgstr "Πραγματικό" @@ -4370,9 +4556,9 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, επιλέξτε Καμία." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 msgid "Refresh" msgstr "Ανανέωση" @@ -4385,6 +4571,7 @@ msgstr "Ανανέωση Λίστας" msgid "Refresh game list" msgstr "Ανανέωση λίστας παιχνιδιών" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4396,10 +4583,16 @@ 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/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +>>>>>>> Update Greek and Czech translations msgid "Remove" msgstr "Αφαίρεση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4409,16 +4602,20 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "Αναπαραγωγή στο Κεντρικό Παράθυρο" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 msgid "Reset" msgstr "Επανεκκίνηση" @@ -4430,8 +4627,8 @@ msgstr "Αποτελέσματα" msgid "Return" msgstr "Return" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 msgid "Right" msgstr "Δεξιά" @@ -4456,6 +4653,7 @@ msgstr "Ρώσικα" msgid "Sa&ve State" msgstr "Απ&οθήκευση Σημείου Αποθήκευσης" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 msgid "Safe" <<<<<<< HEAD @@ -4465,14 +4663,16 @@ msgstr "Ασφαλής" ======= msgstr "" +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 >>>>>>> Update translation files for recent changes in the code. msgid "Sample Rate:" msgstr "Ρυθμός Δειγματοληψίας:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 msgid "Save" msgstr "Αποθήκ." @@ -4548,6 +4748,7 @@ msgstr "" "Η ταινία του σημείου αποθήκευσης %s είναι αλλοιωμένη, γίνεται διακοπή της " "εγγραφής της ταινίας..." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Scaled EFB Copy" <<<<<<< HEAD @@ -4557,6 +4758,9 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 +>>>>>>> Update Greek and Czech translations #, c-format msgid "Scanning %s" msgstr "Ανίχνευση %s" @@ -4591,8 +4795,8 @@ msgstr "Αναζήτηση σε Υποφακέλους" msgid "Section %s not found in SYSCONF" msgstr "Η ενότητα %s δε βρέθηκε στο SYSCONF" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 msgid "Select" msgstr "Επιλογή" @@ -4605,12 +4809,16 @@ msgstr "Επιλέξτε το Αρχείο Εγγραφής" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 msgid "Select The Recording File" msgstr "Επιλέξτε το Αρχείο Εγγραφής" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1349 +>>>>>>> Update Greek and Czech translations msgid "Select a Wii WAD file to install" msgstr "Επιλέξτε ένα Wii WAD αρχείο για εγκατάσταση" @@ -4636,6 +4844,7 @@ msgstr "Επιλέξτε αιωρούμενα παράθυρα" msgid "Select the file to load" msgstr "Επιλέξτε το αρχείο για φόρτωση" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4648,15 +4857,22 @@ msgstr "Επιλέξτε το σημείο φόρτωσης" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1306 +>>>>>>> Update Greek and Czech translations msgid "Select the save file" msgstr "Επιλέξτε αρχείο αποθήκευσης" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1455 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:1469 +>>>>>>> Update Greek and Czech translations msgid "Select the state to save" msgstr "Επιλέξτε το σημείο αποθήκευσης" @@ -4803,11 +5019,11 @@ msgstr "Εμφάνιση Γραμμής &Εργαλείων" msgid "Show Drives" msgstr "Εμφάνιση Οδηγών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Show EFB Copy Regions" msgstr "Εμφάνιση Περιοχών EFB Αντιγραφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Show FPS" msgstr "Εμφάνιση FPS" @@ -4819,7 +5035,7 @@ msgstr "Εμφάνιση Γαλλίας" msgid "Show GameCube" msgstr "Εμφάνιση GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Show Input Display" msgstr "Εμφάνιση Προβολής Χειρισμών" @@ -4855,7 +5071,7 @@ msgstr "Εμφάνιση Πλατφόρμας" msgid "Show Regions" msgstr "Εμφάνιση Περιοχών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Show Statistics" msgstr "Εμφάνιση Στατιστικών" @@ -4910,7 +5126,7 @@ msgstr "Εμφάνιση αποθηκευμένου εικονιδίου" msgid "Show save title" msgstr "Εμφάνιση αποθηκευμένου τίτλου" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4930,7 +5146,7 @@ msgstr "Εμφάνιση αυτού του μηνύματος βοήθειας" msgid "Show unknown" msgstr "Εμφάνιση Αγνώστων" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Show various statistics.\n" "\n" @@ -4956,16 +5172,20 @@ msgstr "Μέγεθος" msgid "Skip BIOS" msgstr "Παράλειψη BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Skip Dest. Alpha Pass" msgstr "Παράλειψη Dest. Alpha Pass" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 msgid "Skip EFB Access from CPU" msgstr "Παράλειψη EFB Πρόσβασης από τη CPU" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 <<<<<<< HEAD +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +>>>>>>> Update Greek and Czech translations msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4977,6 +5197,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" @@ -5014,6 +5235,8 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/FrameTools.cpp:387 #: Source/Core/DolphinWX/Src/FrameTools.cpp:399 #, c-format @@ -5067,6 +5290,7 @@ msgstr "Αποτυχία δημιουργίας buffer ήχου: %s" msgid "Space" msgstr "Space" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -5076,6 +5300,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/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +>>>>>>> Update Greek and Czech translations msgid "Spanish" msgstr "Ισπανικά" @@ -5083,7 +5312,7 @@ msgstr "Ισπανικά" msgid "Speaker Volume:" msgstr "Ένταση ηχείου:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 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 " @@ -5120,13 +5349,17 @@ msgstr "Τετράγωνο Stick" msgid "Standard Controller" msgstr "Τυπικός 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. +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 msgid "Start" msgstr "Εκκίνηση" @@ -5156,17 +5389,21 @@ msgstr "Σημεία Αποθήκευσης" msgid "Stick" msgstr "Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 -#: 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/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Διακοπή" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Store EFB copies in GPU texture objects.\n" @@ -5185,6 +5422,9 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +>>>>>>> Update Greek and Czech translations msgid "Stretch to Window" msgstr "Προσαρμογή στο Παράθυρο" @@ -5218,8 +5458,8 @@ msgstr "Γλώσσα Συστήματος:" msgid "TAIWAN" msgstr "ΤΑΪΒΑΝ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 msgid "TAS Input" msgstr "TAS Είσοδος" @@ -5239,13 +5479,17 @@ msgstr "Αριστερό Table" msgid "Table Right" msgstr "Δεξί Table" +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Greek and Czech translations msgid "Take Screenshot" msgstr "Δημιουργία Στιγμιότυπου" @@ -5257,6 +5501,7 @@ msgstr "" msgid "Test" msgstr "Τέστ" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 <<<<<<< HEAD msgid "Texture" @@ -5277,6 +5522,9 @@ msgstr "Καθαρισμός Cache" >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +>>>>>>> Update Greek and Czech translations msgid "Texture Format Overlay" msgstr "Επικάλυψη Του Format Υφών" @@ -5321,7 +5569,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "Το αρχείο %s ήταν ήδη ανοιχτό, η κεφαλίδα του αρχείου δε θα γραφεί." -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:281 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Το αρχείο που επιλέξατε (%s) δεν υπάρχει" @@ -5339,6 +5587,7 @@ msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" "Το αποτέλεσμα αποκρυπτογράφησης του κωδικού AR δεν περιέχει καθόλου γραμμές." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " @@ -5354,12 +5603,14 @@ msgstr "" ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> 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 "" "Το σημείο αποθήκευσης που προσπαθείτε να αντιγράψετε έχει μη έγκυρο μέγεθος" -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:363 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5431,7 +5682,7 @@ msgstr "" "Αυτό μπορεί να προκαλέσει καθυστερήσεις στο Μενού Wii και σε μερικά " "παιχνίδια." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 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. " @@ -5512,9 +5763,9 @@ msgstr "Εώς" msgid "Toggle All Log Types" 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. @@ -5527,6 +5778,14 @@ msgstr "Εναλλαγή Πλήρους Οθόνης" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +msgid "Toggle Fullscreen" +msgstr "Εναλλαγή Πλήρους Οθόνης" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +>>>>>>> Update Greek and Czech translations msgid "Top" msgstr "Κορυφή" @@ -5534,7 +5793,7 @@ msgstr "Κορυφή" msgid "Traditional Chinese" msgstr "Κινέζικα Παραδοσιακά " -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:375 msgid "Tried to load an unknown file type." msgstr "Προσπάθεια φόρτωσης ενός άγνωστου τύπου αρχείο." @@ -5570,8 +5829,8 @@ msgstr "Τύπος" msgid "UDP Port:" msgstr "Πόρτα UDP:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5647,9 +5906,13 @@ msgstr "" "Άγνωστος δείκτης %#08x\n" "Συνέχεια;" +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 +======= +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 msgid "Up" msgstr "Πάνω" @@ -5666,7 +5929,7 @@ msgstr "Κάθετη Θέση Wiimote" msgid "Use EuRGB60 Mode (PAL60)" msgstr "Χρήση Λειτουργίας EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 msgid "Use Fullscreen" msgstr "Χρήση Πλήρους Οθόνης" @@ -5678,7 +5941,7 @@ msgstr "Χρήση Hex" msgid "Use Panic Handlers" msgstr "Χρήση Οθονών Πανικού" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5691,7 +5954,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5706,11 +5969,11 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Utility" msgstr "Εργαλεία" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:292 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:288 msgid "V-Sync" msgstr "Κάθετος Συγχρονισμός" @@ -5734,7 +5997,8 @@ msgstr "Αναλυτικότητα" msgid "Video" msgstr "Βίντεο" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451 msgid "Virtual" msgstr "Εικονικό" @@ -5762,21 +6026,21 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." -#: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/Common/Src/MsgHandler.cpp:67 msgid "Warning" msgstr "Προειδοποίηση" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:240 msgid "Warning - starting DOL in wrong console mode!" msgstr "Προειδοποίηση - εκκίνηση DOL σε λάθος λειτουργία κονσόλας!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:290 msgid "Warning - starting ELF in wrong console mode!" msgstr "Προειδοποίηση - εκκίνηση ELF σε λάθος λειτουργία κονσόλας!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:185 msgid "Warning - starting ISO in wrong console mode!" msgstr "Προειδοποίηση - εκκίνηση ISO σε λάθος λειτουργία κονσόλας!" @@ -5850,7 +6114,7 @@ msgstr "WaveFileWriter - το αρχείο δεν είναι ανοιχτό." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Widescreen Hack" msgstr "Hack Ευρείας Οθόνης" @@ -5874,11 +6138,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:1308 +>>>>>>> Update Greek and Czech translations msgid "Wii save files (*.bin)|*.bin" msgstr "Αρχεία αποθήκευσης Wii (*.bin)|*.bin" @@ -5886,8 +6154,8 @@ msgstr "Αρχεία αποθήκευσης Wii (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Αδυναμία ανάγνωσης από αρχείο" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 #: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/Core/Src/HW/Wiimote.cpp:16 msgid "Wiimote" msgstr "Wiimote" @@ -5909,11 +6177,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:609 +>>>>>>> Update Greek and Czech translations msgid "Wiimote Connected" msgstr "Συνδεδεμένο Wiimote" @@ -5945,12 +6217,16 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "Αναδίπλωση Λέξεων" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1362 +>>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. @@ -6058,7 +6334,7 @@ msgstr "Άγνωστος Zero code: %08x" msgid "[ waiting ]" msgstr "[ σε αναμονή ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -6074,7 +6350,7 @@ msgstr "" msgid "[Custom]" msgstr "[Προσαρμοζόμενο]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -6093,7 +6369,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -6165,6 +6441,7 @@ msgstr "zNear Διόρθωση: " msgid "| OR" msgstr "| OR" +<<<<<<< HEAD <<<<<<< HEAD #~ msgid "Cannot record movies in read-only mode." #~ msgstr "" @@ -6180,3 +6457,84 @@ msgstr "| OR" #~ msgid "Disable Wiimote Speaker" #~ msgstr "Απενεργοποίηση Ηχείου Wiimote" >>>>>>> Update translation files for recent changes in the code. +======= +#~ msgid "Accuracy:" +#~ msgstr "Ακρίβεια:" + +#~ msgid "Alternate Wiimote Timing" +#~ msgstr "Εναλλακτικός Χρονισμός Wiimote" + +#~ msgid "" +#~ "Automatically generate mipmaps rather than decoding them from memory.\n" +#~ "Increases performance a bit but might cause minor texture defects.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "Δημιουργεί αυτόματα τα mipmaps αντί να τα αποκωδικοποιεί από την μνήμη.\n" +#~ "Αυξάνει λίγο τις επιδόσεις, αλλά μπορεί να προκαλέσει μικρά ελαττώματα " +#~ "στις υφές.\n" +#~ "\n" +#~ "Αν δεν είστε σίγουροι, αφήστε το επιλεγμένο." + +#~ msgid "Enable Cache" +#~ msgstr "Ενεργοποίηση Cache" + +#~ msgid "Fast" +#~ msgstr "Γρήγορη" + +#~ msgid "Fast Mipmaps" +#~ msgstr "Γρήγορα Mipmaps" + +#~ msgid "Safe" +#~ msgstr "Ασφαλής" + +#~ msgid "Scaled EFB Copy" +#~ msgstr "Κλιμακούμενα EFB Αντίγραφα" + +#~ 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" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Επιταχύνει ελαφρώς τα EFB σε RAM αντίγραφα θυσιάζοντας την ακρίβεια της " +#~ "εξομοίωσης.\n" +#~ "Μερικές φορές μπορεί να βελτιώσει την οπτική ποιότητα.\n" +#~ "Αν αντιμετωπίζετε προβλήματα, δοκιμάστε να αυξήσετε την ακρίβεια της " +#~ "cache υφών ή απενεργοποιήστε αυτήν την επιλογή.\n" +#~ "\n" +#~ "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." + +#~ 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" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "Αποθήκευση των EFB αντιγράφων σε GPU αντικείμενα υφών.\n" +#~ "Αυτό δεν είναι τόσο ακριβές, αλλά δουλεύει αρκετά καλά για τα περισσότερα " +#~ "παιχνίδια και προσφέρει μεγάλη επιτάχυνση σε σχέση με EFB σε RAM.\n" +#~ "\n" +#~ "Αν δεν είστε σίγουροι, αφήστε το επιλεγμένο." + +#~ msgid "Texture" +#~ msgstr "Υφή" + +#~ msgid "Texture Cache" +#~ msgstr "Cache Υφών" + +#~ msgid "" +#~ "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" +#~ "\n" +#~ "Αν δεν είστε σίγουροι, χρησιμοποιήστε την δεύτερη γρηγορότερη τιμή από " +#~ "δεξιά." +>>>>>>> Update Greek and Czech translations From 5f21e0150b5bcea2660d81a79b736e7921f2461a Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Sat, 15 Oct 2011 11:26:41 -0500 Subject: [PATCH 03/14] The actual update of the Greek and Czech translations. The last commit was a partial reversion by accident. --- Languages/po/cs.po | 718 +++++++++++++++++-------- Languages/po/el.po | 1284 ++++++++++++++++++++++++-------------------- 2 files changed, 1210 insertions(+), 792 deletions(-) diff --git a/Languages/po/cs.po b/Languages/po/cs.po index 5de197a7a6..00f3a3c290 100644 --- a/Languages/po/cs.po +++ b/Languages/po/cs.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-15 14:50+0100\n" ======= @@ -17,6 +18,9 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= "POT-Creation-Date: 2011-08-10 08:30-0500\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +>>>>>>> The actual update of the Greek and Czech translations. The last commit "PO-Revision-Date: 2011-10-15 14:50+0100\n" >>>>>>> Update Greek and Czech translations "Last-Translator: Zbyněk Schwarz \n" @@ -40,7 +44,7 @@ msgstr " Hra : " msgid "! NOT" msgstr "! NE" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:69 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:72 #, c-format msgid "" "\"%s\" does not exist.\n" @@ -82,7 +86,7 @@ msgstr "%s už existuje, přepsat?" msgid "%s failed to be scrubbed. Probably the image is corrupt." msgstr "%s nelze vyčistit. Obraz je pravděpodobně poškozen." -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:97 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:97 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -91,7 +95,7 @@ msgstr "" "%s nelze načíst jako paměťovou kartu\n" "Soubor karty je neplatný (0x%x bajtů)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:112 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:112 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -100,7 +104,7 @@ msgstr "" "%s nelze načíst jako paměťovou kartu\n" "Velikost karty je neplatná (0x%x bajtů)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:92 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:92 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -317,7 +321,7 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(NEZNÁMÝ)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:381 msgid "(off)" msgstr "(vypnuto)" @@ -329,7 +333,7 @@ msgstr "16 bit" msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 msgid "3D Vision" msgstr "3D Vision" @@ -341,7 +345,7 @@ msgstr "8 bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:258 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262 msgid "" msgstr "<Žádné rozlišení nenalezeno>" @@ -428,10 +432,15 @@ msgstr "O Dolphinu" msgid "Acceleration" msgstr "Zrychlení" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +msgid "Accuracy:" +msgstr "Přesnost:" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Accurate VBeam emulation" msgstr "Precizní emulace VBeam" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 <<<<<<< HEAD @@ -441,12 +450,15 @@ msgstr "Precizní emulace VBeam" >>>>>>> Update Greek and Czech translations #, fuzzy >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +>>>>>>> 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" "\n" -"If unsure, leave this checked." +"If unsure, check EFB to Texture instead." msgstr "" "Přesně emulovat EFB kopie.\n" "Některé hry na tomto závisí pro určité grafické efekty nebo herní funkce.\n" @@ -545,12 +557,12 @@ msgstr "Action Replay: Normální Kód %i: Neplatný podtyp %08x (%s)" msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: Normální Kód 0: Neplatný Podtyp %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:245 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:249 msgid "Adapter:" msgstr "Adaptér:" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 msgid "Add" msgstr "Přidat" @@ -566,6 +578,7 @@ msgstr "Přidat Záplatu" msgid "Add new pane" msgstr "Přidat nový panel" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -581,6 +594,11 @@ msgstr "Přidat nový panel" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: 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 msgid "Add..." msgstr "Přidat..." @@ -628,7 +646,7 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "Upravte tlak analogového ovládání potřebný k aktivaci tlačítek." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:486 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Advanced" msgstr "Pokročilé" @@ -648,6 +666,7 @@ msgstr "Všechny obrazy GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Všechny soubory Gamecube GCM )gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -660,6 +679,10 @@ msgstr "Všechny soubory Gamecube GCM )gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update Greek and Czech translations +======= +#: 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 msgid "All Save States (sav, s##)" msgstr "Všechny Uložené Stavy (sav, s##)" @@ -675,7 +698,7 @@ msgstr "Všechny komprimované soubory GC/WII ISO (gcz)" msgid "All files (*.*)|*.*" msgstr "Všechny soubory (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: 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" @@ -687,6 +710,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 <<<<<<< HEAD @@ -702,10 +726,17 @@ msgstr "Emulovaný Wiimote" ======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +msgid "Alternate Wiimote Timing" +msgstr "Střídat časování Wiimote" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Anisotropic Filtering:" msgstr "Anizotropní Filtrování:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:355 msgid "Anti-Aliasing:" msgstr "Vyhlazení okrajů" @@ -725,7 +756,7 @@ msgstr "Zavaděč aplikace:" msgid "Apply" msgstr "Použít" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -761,11 +792,15 @@ msgstr "Opravdu chcete smazat tento soubor? Bude navždy ztracen!" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 ======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Aspect Ratio:" msgstr "Poměr Stran:" @@ -790,23 +825,27 @@ msgstr "AudioCommon: Chyba při otevírání zařízení zvukového výstupu.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 ======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Auto" msgstr "Auto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Multiple of 640x528)" msgstr "Auto (Násobek 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Window Size)" msgstr "Auto (Velikost Okna)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Auto adjust Window Size" msgstr "Automaticky upravovat Velikost Okna" @@ -820,6 +859,18 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +msgid "" +"Automatically generate mipmaps rather than decoding them from memory.\n" +"Increases performance a bit but might cause minor texture defects.\n" +"\n" +"If unsure, leave this checked." +msgstr "" +"Automaticky vytvořit mipmapy, raději než dekódovat je z paměti.\n" +"Trochu zlepší výkon, ale může způsobit malé chyby paměti.\n" +"\n" +"Pokud si nejste jisti, nechejte toto zaškrtnuté." + #: Source/Core/DolphinWX/Src/WXInputBase.cpp:27 msgid "Back" msgstr "Zpět" @@ -828,8 +879,8 @@ msgstr "Zpět" msgid "Backend Settings" msgstr "Nastavení Backendu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:209 #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:213 msgid "Backend:" msgstr "Backend:" @@ -863,7 +914,7 @@ msgstr "Plakát:" msgid "Bar" msgstr "Vibráto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Basic" msgstr "Základní" @@ -875,7 +926,7 @@ msgstr "Základní nastavení" msgid "Bass" msgstr "Basy" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:188 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:188 msgid "Block Allocation Table checksum failed" msgstr "Kontrolní součet Alokační Tabulky Bloku selhal" @@ -895,6 +946,7 @@ msgstr "Modrá vlevo" msgid "Blue Right" msgstr "Modrá vpravo" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD @@ -906,6 +958,10 @@ msgstr "Modrá vpravo" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 >>>>>>> Update Greek and Czech translations +======= +#: 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 msgid "Bottom" msgstr "Dole" @@ -938,6 +994,7 @@ msgstr "Procházet pro výstupní adresář" msgid "Buffer:" msgstr "Vyrovnávací paměť:" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 @@ -949,7 +1006,11 @@ msgstr "Vyrovnávací paměť:" >>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" msgstr "Tlačítka" @@ -965,11 +1026,11 @@ msgstr "Kr-Stick" msgid "CPU Emulator Engine" msgstr "Jádro Emulátoru Procesoru" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Cache Display Lists" msgstr "Ukládat předvyt. obj. do vyr. pam." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +#: 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 " @@ -984,7 +1045,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto zaškrtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -999,8 +1060,8 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Zrušit" @@ -1044,10 +1105,10 @@ msgstr "Nelze najít Wiimote podle bz: %02x:%02x:%02x:%02x:%02x:%02x" msgid "Cant find WiiMote by connection handle %02x" msgstr "Nelze najít Wiimote pomocí obslužné rutiny spojení %02x" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "Nelze číst ze zásuvného modulu DVD - DVD-Rozhraní: Závažná chyba" @@ -1170,10 +1231,10 @@ msgstr "Kruhový Stick" msgid "Classic" msgstr "Klasické" +#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 msgid "Clear" msgstr "Vyčistit" @@ -1188,18 +1249,22 @@ msgid "" msgstr "" "Klient odpojen při běhu hry!! NetPlay je vypnut. Hru musíte ukončit ručně." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 ======= #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Close" msgstr "Zavřít" @@ -1307,6 +1372,7 @@ msgstr "Připojit Wiimote 3" msgid "Connect Wiimote 4" msgstr "Připojit Wiimote 4" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 @@ -1316,6 +1382,9 @@ msgstr "Připojit Wiimote 4" ======= #: Source/Core/DolphinWX/Src/Main.cpp:608 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Connecting..." msgstr "Připojuji..." @@ -1383,7 +1452,7 @@ msgstr "" "Nelze nastavit pady. Hráč odešel, nebo hra v současnosti běží!.\n" "(nastavení padů za běhu hry není ještě podporováno)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1453,11 +1522,11 @@ msgstr "Tvůrce:" msgid "Critical" msgstr "Kritické" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 msgid "Crop" msgstr "Oříznout" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1504,6 +1573,7 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "Jádro Emulátoru DSP" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD @@ -1515,6 +1585,10 @@ msgstr "Jádro Emulátoru DSP" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulace (rychlé)" @@ -1563,7 +1637,7 @@ msgstr "Mrtvá Zóna" msgid "Debug" msgstr "Ladění" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Debugging" msgstr "Ladění" @@ -1596,8 +1670,8 @@ msgstr "Výchozí ISO:" msgid "Default font" msgstr "Výchozí typ písma" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 msgid "Delete" msgstr "Smazat" @@ -1605,12 +1679,12 @@ msgstr "Smazat" msgid "Delete Save" msgstr "Smazat Uloženou Hru" -#: Source/Core/VideoCommon/Src/AVIDump.cpp:73 +#: Source/Core/VideoCommon/Src/AVIDump.cpp:77 #, c-format msgid "Delete the existing file '%s'?" msgstr "Vymazat existující soubor '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:651 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 msgid "Description" msgstr "Popis" @@ -1641,15 +1715,15 @@ msgstr "Nastavení Zařízení" msgid "Dial" msgstr "Kruhová stupnice" -#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:147 +#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146 msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:129 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128 msgid "Direct3D9" msgstr "Direct3D9" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:169 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:169 msgid "" "Directory checksum failed\n" " and Directory backup checksum failed" @@ -1657,32 +1731,28 @@ msgstr "" "Kontrolní součet adresáře\n" "i záložní kontrolní součet Adresáře selhal" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 msgid "Disable" msgstr "Zakázat" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "Disable Fog" msgstr "Zakázat Mlhu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Disable Lighting" msgstr "Zakázat Osvětlení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 msgid "Disable Per-Pixel Depth" msgstr "Zakázat Hloubku Podle Pixelu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Disable Textures" msgstr "Zakázat Textury" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -msgid "Disable Wiimote Speaker" -msgstr "Zakázat Reproduktor Wiimote" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: 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 " @@ -1696,7 +1766,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto zaškrtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: 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 " @@ -1712,7 +1782,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Disable texturing.\n" "\n" @@ -1731,11 +1801,11 @@ msgstr "Disk" msgid "Disc Read Error" msgstr "Chyba čtení disku" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 msgid "Display" msgstr "Obraz" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1749,6 +1819,7 @@ msgstr "" msgid "Divide" msgstr "Rozdělit" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1758,6 +1829,9 @@ msgstr "Rozdělit" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1051 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Do you want to stop the current emulation?" msgstr "Chcete současnou emulaci zastavit?" @@ -1765,7 +1839,7 @@ msgstr "Chcete současnou emulaci zastavit?" msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:185 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s Grafická Nastavení" @@ -1786,6 +1860,7 @@ msgstr "Nastavení Emulovaného Dolphin Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1799,16 +1874,23 @@ msgstr "Dolphin GCPad Nastavení" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1202 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Nastavení" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Dolphin TAS Movies (*.dtm)" msgstr "Doplhin Filmy TAS (*.dtm)" @@ -1836,8 +1918,8 @@ msgstr "" "Dolphin je v současnosti nastaven na skrytí všech her. Klikněte zde dvakrát " "pro zobrazení všech her..." -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Down" msgstr "Dolů" @@ -1862,19 +1944,19 @@ msgstr "Atrapa" msgid "Dump Audio" msgstr "Vypsat Zvuk" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Dump EFB Target" msgstr "Vypsat Cíl EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 msgid "Dump Frames" msgstr "Vypsat Snímky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:508 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Dump Textures" msgstr "Vypsat Textury" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1884,7 +1966,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1894,7 +1976,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1904,6 +1986,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1919,6 +2002,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: 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 msgid "Dutch" msgstr "Nizozemština" @@ -1926,7 +2014,7 @@ msgstr "Nizozemština" msgid "E&xit" msgstr "O&dejít" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:430 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "EFB Copies" msgstr "EFB Kopie" @@ -1979,7 +2067,7 @@ msgstr "Upravit" msgid "Effect" msgstr "Efekt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Embedded Frame Buffer" msgstr "Vnořená Vyr. Pamět Snímků" @@ -1987,7 +2075,7 @@ msgstr "Vnořená Vyr. Pamět Snímků" msgid "Emu Thread already running" msgstr "Vlákno Emulace již běží" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -2001,7 +2089,7 @@ msgstr "" "\n" "Pokud si nejste jisti, zaškrtněte místo tohoto virtuální emulaci XFB." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: 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 " @@ -2029,7 +2117,7 @@ msgstr "Stav Emulace:" msgid "Enable" msgstr "Povolit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: 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" @@ -2061,6 +2149,7 @@ msgstr "Zapnout BAT" msgid "Enable Block Merging" msgstr "Zapnout Slučování Bloků" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 @@ -2069,15 +2158,20 @@ msgstr "" ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Povolit vyrovnávací paměť" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= ======= >>>>>>> Update Greek and Czech translations +======= +>>>>>>> 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. msgid "Enable Cheats" @@ -2095,7 +2189,7 @@ msgstr "Povolit dvojité jádro" msgid "Enable Dual Core (speedup)" msgstr "Zapnout dvojité jádro (zrychlení)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 msgid "Enable Hotkeys" msgstr "Povolit klávesové zkratky" @@ -2111,8 +2205,8 @@ msgstr "Povolit Přeskakování Nečinných Příkazů (zrychlení)" msgid "Enable MMU" msgstr "Zapnout MMU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 msgid "Enable Progressive Scan" msgstr "Povolit Progresivní Skenování" @@ -2124,7 +2218,7 @@ msgstr "Povolit Spořič Obrazovky" msgid "Enable WideScreen" msgstr "Povolit Širokoúhlou obrazovku" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Enable Wireframe" msgstr "Povolit Drátěný Model" @@ -2221,7 +2315,7 @@ msgstr "" "Povolí Jednotku Správy Paměti, potřebnou v nějakých hrách. (ZAPNUTO = " "Kompatibilní, VYPNUTO = Rychlé)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2235,6 +2329,7 @@ msgstr "" msgid "End" msgstr "End" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2250,11 +2345,16 @@ msgstr "End" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: 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 msgid "English" msgstr "Angličtina" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:334 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:411 msgid "Enhancements" msgstr "Vylepšení" @@ -2276,6 +2376,7 @@ msgstr "Záznam 1/%d" msgid "Equal" msgstr "Rovná se" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 @@ -2296,16 +2397,24 @@ msgstr "" >>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +======= +>>>>>>> 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 msgid "Error" msgstr "Chyba" +<<<<<<< HEAD <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 ======= #: Source/Core/DolphinWX/Src/Main.cpp:356 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/Main.cpp:346 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Error loading selected language. Falling back to system default." msgstr "" "Chyba při nahrávání zvoleného jazyka. Vracím se na výchozí jazyk systému." @@ -2388,7 +2497,7 @@ msgstr "Exportovat Uloženou hru jako..." msgid "Extension" msgstr "Rozšíření" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "External Frame Buffer" msgstr "Vnější Vyr. Paměť Snímků" @@ -2510,7 +2619,7 @@ msgstr "Nelze nahrát hid.dll" msgid "Failed to read banner.bin" msgstr "Nelze číst z banner.bin" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:150 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:150 msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" @@ -2518,7 +2627,7 @@ msgstr "" "Nelze správně číst zálohu alokační tabulky bloku\n" "(0x8000-0x9FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:144 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:144 msgid "" "Failed to read block allocation table correctly\n" "(0x6000-0x7FFF)" @@ -2531,7 +2640,7 @@ msgstr "" msgid "Failed to read data from file %d" msgstr "Nelze číst data ze souboru %d" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:138 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:138 msgid "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" @@ -2539,7 +2648,7 @@ msgstr "" "Nelze správně číst zálohu adresáře\n" "(0x4000-0x5FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:132 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:132 msgid "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" @@ -2547,7 +2656,7 @@ msgstr "" "Nelze správně číst adresář\n" "(0x2000-0x3FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:121 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:121 msgid "" "Failed to read header correctly\n" "(0x0000-0x1FFF)" @@ -2555,7 +2664,7 @@ msgstr "" "Nelze správně číst hlavičku\n" "(0x0000-0x1FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:222 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:222 msgid "" "Failed to read save data\n" "(0xA000-)\n" @@ -2587,6 +2696,14 @@ msgstr "Zápis hlavičky selhal pro %s" msgid "Failed to write header for file %d" msgstr "Selhal zápis hlavičky souboru %d" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +msgid "Fast" +msgstr "Rychlá" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +msgid "Fast Mipmaps" +msgstr "Rychlé Mipmapy" + #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Fast version of the MMU. Does not work for every game." msgstr "Rychlá verze MMU. Nefunguje v každé hře." @@ -2615,7 +2732,7 @@ msgstr "" "Soubor nelze otevřít\n" "nebo nemá platnou příponu" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:86 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:86 #, c-format msgid "" "File has the extension \"%s\"\n" @@ -2653,11 +2770,11 @@ msgstr "První blok" msgid "Fix Checksums" msgstr "Spravit Kontrolní Součty" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 16:9" msgstr "Vynutit 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 4:3" msgstr "Vynutit 4:3" @@ -2665,11 +2782,11 @@ msgstr "Vynutit 4:3" msgid "Force Console as NTSC-J" msgstr "Donutit konzoli být jako NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 msgid "Force Texture Filtering" msgstr "Vynutit Filtrování Textur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2703,7 +2820,7 @@ msgstr "" "Pokud není zaškrtnuto, Dolphin standardně přejde na NTSC-U a automaticky " "zapne toto nastavení při hraní Japonských her." -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:73 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" "Format as ascii (NTSC\\PAL)?\n" "Choose no for sjis (NTSC-J)" @@ -2729,7 +2846,7 @@ msgstr "Snímek" msgid "Frame Advance" msgstr "Postup Snímkem" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:514 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 msgid "Frame Dumps use FFV1" msgstr "Uložení snímků použije FFV1" @@ -2749,10 +2866,11 @@ msgstr "Limit Snímků:" msgid "Frames To Record" msgstr "Snímky k Nahrání" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 msgid "Free Look" msgstr "Rozhlížení pomocí myši" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2768,6 +2886,11 @@ msgstr "Rozhlížení pomocí myši" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: 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 msgid "French" msgstr "Francouzština" @@ -2784,7 +2907,7 @@ msgstr "Z" msgid "FullScr" msgstr "CelObr" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 msgid "Fullscreen resolution:" msgstr "Rozlišení celé obrazovky:" @@ -2833,6 +2956,7 @@ msgstr "Gamecube" msgid "Gamecube &Pad Settings" msgstr "Nastavení Gamecube &Pad" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD @@ -2844,6 +2968,10 @@ msgstr "Nastavení Gamecube &Pad" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 >>>>>>> Update Greek and Czech translations +======= +#: 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 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Paměťové karty Gamecube (*.raw,*.gcp)" @@ -2865,6 +2993,7 @@ msgstr "" "Nelze spustit GeckoKód (CT%i CST%i) (%s)\n" "(buď špatný kód, nebo typ kódu není ještě podporován.)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD @@ -2879,6 +3008,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:200 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "General" msgstr "Obecné" @@ -2886,6 +3020,7 @@ msgstr "Obecné" msgid "General Settings" msgstr "Obecná Nastavení" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2901,6 +3036,11 @@ msgstr "Obecná Nastavení" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: 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 msgid "German" msgstr "Němčina" @@ -2921,6 +3061,7 @@ msgstr "Grafická nastavení" msgid "Greater Than" msgstr "Větší než" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 <<<<<<< HEAD @@ -2930,10 +3071,15 @@ msgstr "Větší než" >>>>>>> Update Greek and Czech translations #, fuzzy >>>>>>> Update translation files for recent changes in the code. +======= +#: 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 " +"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" "\n" "If unsure, leave this checked." msgstr "" @@ -2968,11 +3114,11 @@ msgstr "Kytara" msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "Byl zavolán HCI_CMD_INQUIRY, prosím ohlaste!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:420 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425 msgid "Hacks" msgstr "Hacky" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:160 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:160 msgid "Header checksum failed" msgstr "Kontrolní součet hlavičky selhal" @@ -3008,7 +3154,7 @@ msgstr "" msgid "Hide" msgstr "Skrýt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Hide Mouse Cursor" msgstr "Skrýt kurzor myši" @@ -3035,6 +3181,7 @@ msgstr "Hostovat" msgid "Hotkey Configuration" msgstr "Nastavení klávesových zkratek" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD @@ -3047,6 +3194,10 @@ msgstr "Nastavení klávesových zkratek" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 >>>>>>> Update Greek and Czech translations +======= +#: 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 msgid "Hotkeys" msgstr "Klávesové zkratky" @@ -3133,11 +3284,11 @@ msgstr "" "Pokud nastavíte limit snímků větší než plná rychlost hry (NTSC:60, PAL:50), " "měli byste také vypnout Přiškrcení Zvuku v DSP, aby to bylo účinné." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" msgstr "Ignorovat Změny Formátu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: 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 " @@ -3151,7 +3302,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto zaškrtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: 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 " @@ -3193,7 +3344,7 @@ msgstr "" "\"Importovaný soubor má příponu sav\n" "ale nemá správnou hlavičku\"" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3205,7 +3356,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Improves performance but causes lighting to disappear in most games.\n" "\n" @@ -3223,8 +3374,8 @@ msgstr "Ve Hře" msgid "In-Game" msgstr "Ve Hře" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Info" msgstr "Info" @@ -3267,6 +3418,7 @@ msgstr "" "Byl zavolán InstallExceptionHandler, ale tato platforma toto ještě " "nepodporuje." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3276,6 +3428,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1361 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Installing WAD..." msgstr "Instaluji WAD..." @@ -3304,7 +3459,7 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "Vnitřní chyba LZO - lzo_init() selhalo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:349 msgid "Internal Resolution:" msgstr "Vnitřní Rozlišení:" @@ -3357,6 +3512,7 @@ msgstr "Neplatný soubor s nahrávkou" msgid "Invalid state" msgstr "Neplatný stav" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3372,6 +3528,11 @@ msgstr "Neplatný stav" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: 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 msgid "Italian" msgstr "Italština" @@ -3433,8 +3594,8 @@ msgstr "Poslední Přepsaný Stav" msgid "Last Saved State" msgstr "Poslední Uložený Stav" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 msgid "Left" msgstr "Vlevo" @@ -3481,7 +3642,7 @@ msgstr "Limitovat podle SzS" msgid "Load" msgstr "Nahrát" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Load Custom Textures" msgstr "Nahrát Vlastní Textury" @@ -3529,6 +3690,7 @@ msgstr "Nahrát Slot Stavu 8" msgid "Load State..." msgstr "Nahrát Stav..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3550,11 +3712,18 @@ msgstr "Nahrát Systémové Menu Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +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 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Nahrát Systémové Menu Wii %d%c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3596,8 +3765,8 @@ msgstr "Typy Záznamu" msgid "Logger Outputs" msgstr "Výstup Zapisovače" -#: Source/Core/DolphinWX/Src/Frame.cpp:398 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/Frame.cpp:398 msgid "Logging" msgstr "Protokolování" @@ -3631,6 +3800,7 @@ msgstr "MMU Hack Rychlosti" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Soubory MadCatz Gameshark (*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 @@ -3640,7 +3810,10 @@ msgstr "Soubory MadCatz Gameshark (*.gcs)" ======= >>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Hlavní Stick" @@ -3669,6 +3842,7 @@ msgstr "Pam. karta již otevřena" msgid "Memory Byte" msgstr "Bajt Paměti" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD @@ -3680,6 +3854,10 @@ msgstr "Bajt Paměti" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 >>>>>>> Update Greek and Czech translations +======= +#: 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 msgid "Memory Card" msgstr "Paměťová karta" @@ -3708,7 +3886,7 @@ msgstr "" "%s\n" "Chtěli byste starý soubor zkopírovat do nového umístění?\n" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:126 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" msgstr "Velikost paměťové karty se neshoduje s velikosti hlavičky" @@ -3725,7 +3903,7 @@ msgstr "Mikrofon" msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 msgid "Misc" msgstr "Ostatní" @@ -3738,7 +3916,7 @@ msgstr "Ostatní Nastavení" msgid "Modifier" msgstr "Modifikátor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: 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" @@ -3763,7 +3941,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:634 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3877,6 +4055,7 @@ msgstr "NK Tab" msgid "NP Up" msgstr "NK Nahoru" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3885,9 +4064,11 @@ msgstr "NK Nahoru" >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 msgid "Name:" msgstr "Jméno:" @@ -3972,6 +4153,7 @@ msgstr "Nerovná se" msgid "Not Set" msgstr "Nenastaven" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 @@ -3981,6 +4163,9 @@ msgstr "Nenastaven" ======= #: Source/Core/DolphinWX/Src/Main.cpp:607 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Not connected" msgstr "Nepřipojen" @@ -4009,8 +4194,8 @@ msgstr "Num Lock" msgid "Number Of Codes: " msgstr "Počet Kódů:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 msgid "Nunchuk" msgstr "Nunčak" @@ -4039,6 +4224,7 @@ msgstr "Logická Adresa:" msgid "Only %d blocks available" msgstr "Pouze bloky %d jsou dostupné" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD <<<<<<< HEAD @@ -4048,6 +4234,10 @@ msgstr "Pouze bloky %d jsou dostupné" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Open" msgstr "Otevřít" @@ -4077,11 +4267,11 @@ msgstr "OpenAL: nelze nalézt zvuková zařízení" msgid "OpenAL: can't open device %s" msgstr "OpenAL: nelze otevřít zařízení %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 msgid "OpenCL Texture Decoder" msgstr "OpenCL Dekodér Textury" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 msgid "OpenMP Texture Decoder" msgstr "OpenMP Dekodér Textury" @@ -4112,8 +4302,8 @@ msgstr "" "Klikněte pravým tlačítkem a exportujte všechna uložení,\n" "a importujte je do nové paměťové karty\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 msgid "Other" msgstr "Jiné" @@ -4177,6 +4367,7 @@ msgstr "Záplaty" msgid "Paths" msgstr "Cesty" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4187,13 +4378,15 @@ msgstr "Cesty" >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update Greek and Czech translations +======= +#: 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/WXInputBase.cpp:48 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1603 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1604 msgid "Pause" msgstr "Pozastavit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "Per-Pixel Lighting" msgstr "Osvětlení Podle Pixelu" @@ -4206,6 +4399,7 @@ msgstr "Dokonalá" msgid "Perspective %d" msgstr "Perspektiva %d" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD @@ -4220,6 +4414,12 @@ msgstr "Perspektiva %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1613 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +#: 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 msgid "Play" msgstr "Spustit" @@ -4245,6 +4445,7 @@ msgstr "Možnosti Přehrávání" msgid "Players" msgstr "Hráči" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4254,6 +4455,9 @@ msgstr "Hráči" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Please confirm..." msgstr "Prosím potvrďte..." @@ -4298,7 +4502,7 @@ msgstr "Portugalština" msgid "Portuguese (Brazilian)" msgstr "Portugalština (Brazilská)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396 msgid "Post-Processing Effect:" msgstr "Efekt Následného Zpracování:" @@ -4372,7 +4576,7 @@ msgstr "Tlačítko R" msgid "R-Analog" msgstr "Pravý Analog" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "RAM" msgstr "RAM" @@ -4389,7 +4593,7 @@ msgstr "Rozsah" msgid "Read-only mode" msgstr "Režim pouze pro čtení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 msgid "Real" msgstr "Opravdová" @@ -4449,9 +4653,9 @@ msgstr "" "\n" "Pokud si nejste jisti, vyberte Žádný." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "Obnovit" @@ -4464,6 +4668,7 @@ msgstr "Obnovit Seznam" msgid "Refresh game list" msgstr "Obnovit seznam her" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4482,10 +4687,16 @@ msgstr "Obnovit seznam her" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: 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 msgid "Remove" msgstr "Odstranit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4495,10 +4706,11 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 msgid "Render to Main Window" msgstr "Vykreslit do Hlavního okna" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD @@ -4508,7 +4720,10 @@ msgstr "Vykreslit do Hlavního okna" ======= >>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Resetovat" @@ -4520,8 +4735,8 @@ msgstr "Výsledky" msgid "Return" msgstr "Enter" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 msgid "Right" msgstr "Vpravo" @@ -4547,23 +4762,29 @@ msgid "Sa&ve State" msgstr "Uložit Sta&v" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 msgid "Safe" msgstr "Bezpečná" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= ======= >>>>>>> Update Greek and Czech translations +======= +>>>>>>> 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. msgid "Sample Rate:" msgstr "Vzorkovací frekvence:" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "Uložit" @@ -4638,15 +4859,21 @@ msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Uložený stav filmu %s je poškozen, nahrávání filmu je zastaveno..." <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Scaled EFB Copy" msgstr "EFB Kopie Změněné Velikosti" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= ======= >>>>>>> Update Greek and Czech translations +======= +>>>>>>> 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. #, c-format @@ -4683,8 +4910,8 @@ msgstr "Hledat Podadresáře" msgid "Section %s not found in SYSCONF" msgstr "Sekce %s nebyla v SYSCONF nalezena" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 msgid "Select" msgstr "Vybrat" @@ -4697,16 +4924,20 @@ msgstr "Vyberte Soubor s Nahrávkou" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 msgid "Select The Recording File" msgstr "Vyberte Soubor s Nahrávkou" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1349 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Select a Wii WAD file to install" msgstr "Vyberte soubor Wii WAD k instalování" @@ -4732,6 +4963,7 @@ msgstr "Vybrat plovoucí okna" msgid "Select the file to load" msgstr "Vyberte soubor k nahrání" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 @@ -4748,19 +4980,26 @@ msgstr "Vyberte stav k nahrání" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1306 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Select the save file" msgstr "Vyberte soubor s uloženou hrou" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1455 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 msgid "Select the state to load" msgstr "Vyberte stav k nahrání" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1469 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Select the state to save" msgstr "Vyberte stav k uložení" @@ -4898,11 +5137,11 @@ msgstr "Zobrazit Panel Nás&trojů" msgid "Show Drives" msgstr "Zobrazit Disky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 msgid "Show EFB Copy Regions" msgstr "Zobrazit EFB Regiony Kopie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Show FPS" msgstr "Zobrazit Snímky za Sekundu" @@ -4914,7 +5153,7 @@ msgstr "Zobrazit Francii" msgid "Show GameCube" msgstr "Zobrazit GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Show Input Display" msgstr "Zobrazit Obrazovku Vstupu" @@ -4950,7 +5189,7 @@ msgstr "Zobrazit Platformy" msgid "Show Regions" msgstr "Zobrazit Regiony" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Show Statistics" msgstr "Zobrazit Statistiky" @@ -5004,7 +5243,7 @@ msgstr "Zobrazit ikonu uložení" msgid "Show save title" msgstr "Zobrazit název uložení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -5024,7 +5263,7 @@ msgstr "Zobrazit tuto zprávu nápovědy" msgid "Show unknown" msgstr "Zobrazit neznámé" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Show various statistics.\n" "\n" @@ -5050,15 +5289,15 @@ msgstr "Velikost" msgid "Skip BIOS" msgstr "Přeskočit BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Skip Dest. Alpha Pass" msgstr "Vypnout Průchod Cíl. Průhl." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 msgid "Skip EFB Access from CPU" msgstr "Přeskočit EFB Přístup z Procesoru" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -5070,6 +5309,22 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +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" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"Lehce zrychlí kopie EFB do RAM obětováním přesnosti emulace.\n" +"Někdy také zvýší kvalitu obrazu.\n" +"Pokud se setkáváte s jakýmikoliv problémy, zkuste zvýšit přesnost textury, " +"nebo tuto možnost vypnout.\n" +"\n" +"Pokud si nejste jisti, nechejte toto odškrtnuté." + #: Source/Core/DolphinWX/Src/FrameTools.cpp:387 #: Source/Core/DolphinWX/Src/FrameTools.cpp:399 #, c-format @@ -5123,6 +5378,7 @@ msgstr "Vytvoření vyrovnávací paměti zvuku selhalo: %s" msgid "Space" msgstr "Mezerník" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5138,6 +5394,11 @@ msgstr "Mezerník" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: 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 msgid "Spanish" msgstr "Španělština" @@ -5145,7 +5406,7 @@ msgstr "Španělština" msgid "Speaker Volume:" msgstr "Hlasitost Reproduktoru:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: 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 " @@ -5181,6 +5442,7 @@ msgstr "Čtvercový Stick" msgid "Standard Controller" msgstr "Standardní Ovladač" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 @@ -5189,9 +5451,11 @@ msgstr "Standardní Ovladač" >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 msgid "Start" msgstr "Start" @@ -5221,6 +5485,7 @@ msgstr "Ukládání stavu" msgid "Stick" msgstr "Stick" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD <<<<<<< HEAD @@ -5231,11 +5496,30 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Zastavit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: 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" +"\n" +"If unsure, leave this checked." +msgstr "" +"Ukládat EFB kopie do objektů textury grafického procesoru.\n" +"Toto není přesné, ale pro většinu her funguje dostatečně dobře a dává větší " +"zrychlení než EFB do RAM.\n" +"\n" +"Pokud si nejste jisti, nechejte toto odškrtnuté." + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Stretch to Window" msgstr "Roztáhnout do Okna" @@ -5269,8 +5553,8 @@ msgstr "Jazyk Systému:" msgid "TAIWAN" msgstr "TCHAJ-WAN" -#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "TAS Vstup" @@ -5290,10 +5574,10 @@ msgstr "Deska vlevo" msgid "Table Right" msgstr "Deska vpravo" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 @@ -5301,6 +5585,9 @@ msgstr "Deska vpravo" >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Take Screenshot" msgstr "Vytvořit Snímek Obrazovky" @@ -5312,7 +5599,15 @@ msgstr "" msgid "Test" msgstr "Test" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +msgid "Texture" +msgstr "Textura" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 +msgid "Texture Cache" +msgstr "Vyrovnávací Paměť Textur" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Texture Format Overlay" msgstr "Překryv Formátu Textury" @@ -5357,7 +5652,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "Soubor %s je už otevřen, hlavička souboru nebude zapsána." -#: Source/Core/Core/Src/Boot/Boot.cpp:281 +#: Source/Core/Core/Src/Boot/Boot.cpp:313 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Zadaný soubor (%s) neexistuje" @@ -5374,11 +5669,23 @@ msgstr "Jméno nemůže obsahovat znak ','" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "Výsledný rozšifrovaný kód AR neobsahuje žádné řádky." +#: 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" +"\n" +"If unsure, use the second-fastest value from the right." +msgstr "" +"Čím bezpečnější toto bude, tím bude méně pravděpodobné, že emulátoru budou " +"chybět jakékoliv aktualizace textur z RAM.\n" +"\n" +"Pokud si nejste jisti, použijte druhou nejrychlejší hodnotu zprava." + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 msgid "The save you are trying to copy has an invalid file size" msgstr "Uložená hra, kterou se snažíte zkopírovat má neplatnou délku souboru" -#: Source/Core/DolphinWX/Src/Main.cpp:363 +#: Source/Core/DolphinWX/Src/Main.cpp:353 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5447,7 +5754,7 @@ msgstr "" msgid "This could cause slow down in Wii Menu and some games." msgstr "Toto může způsobit zpomalení ve Wii Menu a v některých hrách." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: 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. " @@ -5522,6 +5829,7 @@ msgstr "Do" msgid "Toggle All Log Types" msgstr "Zapnout Všechny Typy Záznamů" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD <<<<<<< HEAD @@ -5538,13 +5846,19 @@ msgstr "Přepnout na Celou Obrazovku" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. ======= +======= +>>>>>>> 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 msgid "Toggle Fullscreen" msgstr "Přepnout na Celou Obrazovku" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< 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 msgid "Top" msgstr "Nahoře" @@ -5552,7 +5866,7 @@ msgstr "Nahoře" msgid "Traditional Chinese" msgstr "Tradiční Čínština" -#: Source/Core/Core/Src/Boot/Boot.cpp:375 +#: Source/Core/Core/Src/Boot/Boot.cpp:407 msgid "Tried to load an unknown file type." msgstr "Pokus o načtení souboru neznámého typu." @@ -5588,8 +5902,8 @@ msgstr "Typ" msgid "UDP Port:" msgstr "UDP Port:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5664,13 +5978,17 @@ msgstr "" "Neznámý ukazatel %#08x\n" "Pokračovat?" +<<<<<<< HEAD <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 ======= >>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" msgstr "Nahoru" @@ -5687,7 +6005,7 @@ msgstr "Svislý Wiimote" msgid "Use EuRGB60 Mode (PAL60)" msgstr "Použít režim EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 msgid "Use Fullscreen" msgstr "Použít Celou Obrazovku" @@ -5699,7 +6017,7 @@ msgstr "Použít Šestnáctkovou soustavu" msgid "Use Panic Handlers" msgstr "Použít Obslužné Rutiny Paniky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5712,7 +6030,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: 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 " @@ -5726,11 +6044,11 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Utility" msgstr "Pomůcky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:288 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:292 msgid "V-Sync" msgstr "V-Synch" @@ -5754,8 +6072,7 @@ msgstr "Úroveň" msgid "Video" msgstr "Obraz" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 msgid "Virtual" msgstr "Virtuální" @@ -5782,21 +6099,21 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 #: Source/Core/Common/Src/MsgHandler.cpp:67 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Varování" -#: Source/Core/Core/Src/Boot/Boot.cpp:240 +#: Source/Core/Core/Src/Boot/Boot.cpp:272 msgid "Warning - starting DOL in wrong console mode!" msgstr "Varování - DOL se spouští ve špatném režimu konzole!" -#: Source/Core/Core/Src/Boot/Boot.cpp:290 +#: Source/Core/Core/Src/Boot/Boot.cpp:322 msgid "Warning - starting ELF in wrong console mode!" msgstr "Varování - ELF se spouští ve špatném režimu konzole!" -#: Source/Core/Core/Src/Boot/Boot.cpp:185 +#: Source/Core/Core/Src/Boot/Boot.cpp:217 msgid "Warning - starting ISO in wrong console mode!" msgstr "Varování - ISO se spouští ve špatném režimu konzole!" @@ -5868,7 +6185,7 @@ msgstr "WaveFileWriter - soubor není otevřen." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Widescreen Hack" msgstr "Hack Širokoúhlého obrazu" @@ -5892,6 +6209,7 @@ msgstr "Wii Kořen NAND:" msgid "Wii Save Import" msgstr "Import uložených pozic Wii" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5901,6 +6219,9 @@ msgstr "Import uložených pozic Wii" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Wii save files (*.bin)|*.bin" msgstr "Wii soubory s uložením (*.bin)|*.bin" @@ -5908,8 +6229,8 @@ msgstr "Wii soubory s uložením (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD Nelze číst ze souboru" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 #: Source/Core/Core/Src/HW/Wiimote.cpp:16 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Wiimote" msgstr "Wiimote" @@ -5931,6 +6252,7 @@ msgstr "" "nebo je to vypršení limitu neaktivity, nebo z jiného důvodu.\n" "Chcete ho hned znovu připojit?" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 @@ -5940,6 +6262,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/Main.cpp:609 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Wiimote Connected" msgstr "Wiimote Připojen" @@ -5971,6 +6296,7 @@ msgstr "Klávesa Windows Vpravo" msgid "Word Wrap" msgstr "Zalamování textu" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -5981,6 +6307,9 @@ msgstr "Zalamování textu" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1362 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. @@ -6089,7 +6418,7 @@ msgstr "Nulový kód, který dolphin nezná: %08x" msgid "[ waiting ]" msgstr "[ čekám ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -6105,7 +6434,7 @@ msgstr "" msgid "[Custom]" msgstr "[Vlastní]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -6124,7 +6453,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -6231,9 +6560,6 @@ msgstr "| NEBO" #~ msgid "< as Default Profile >" #~ msgstr "< jako Výchozí Profil >" -#~ msgid "Accuracy:" -#~ msgstr "Přesnost:" - #~ msgid "Accurate Texture Cache" #~ msgstr "Precizní Vyrovnávací Paměť Textur" @@ -6253,9 +6579,6 @@ msgstr "| NEBO" #~ "ale zapnutí této možnosti může mít také velký negativní dopad na výkon " #~ "pokud hra tuto funkci hodně využívá." -#~ msgid "Alternate Wiimote Timing" -#~ msgstr "Střídat časování Wiimote" - #~ msgid "Auto [recommended]" #~ msgstr "Auto [doporučeno]" @@ -6268,17 +6591,6 @@ msgstr "| NEBO" #~ "nastavená pomocí změny velikosti EFB.\n" #~ "Při používání tohoto je nejlepší nastavit poměr stran na roztáhnutí." -#~ msgid "" -#~ "Automatically generate mipmaps rather than decoding them from memory.\n" -#~ "Increases performance a bit but might cause minor texture defects.\n" -#~ "\n" -#~ "If unsure, leave this checked." -#~ msgstr "" -#~ "Automaticky vytvořit mipmapy, raději než dekódovat je z paměti.\n" -#~ "Trochu zlepší výkon, ale může způsobit malé chyby paměti.\n" -#~ "\n" -#~ "Pokud si nejste jisti, nechejte toto zaškrtnuté." - #~ msgid "" #~ "Calculates lighting of 3D graphics on a per-pixel basis rather than per " #~ "vertex.\n" @@ -6315,6 +6627,9 @@ msgstr "| NEBO" #~ msgid "Danish" #~ msgstr "Dánština" +#~ msgid "Disable Wiimote Speaker" +#~ msgstr "Zakázat Reproduktor Wiimote" + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -6360,9 +6675,6 @@ msgstr "| NEBO" #~ msgid "Enable CPU Access" #~ msgstr "Povolit Přístup k Procesoru" -#~ msgid "Enable Cache" -#~ msgstr "Povolit vyrovnávací paměť" - #~ msgid "Enable Copy to EFB" #~ msgstr "Povolit Kopírování do EFB" @@ -6421,12 +6733,6 @@ msgstr "| NEBO" #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "Nelze nahrát DSP ROM : %s" -#~ msgid "Fast" -#~ msgstr "Rychlá" - -#~ msgid "Fast Mipmaps" -#~ msgstr "Rychlé Mipmapy" - #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -6540,15 +6846,9 @@ msgstr "| NEBO" #~ msgid "Required for using the Japanese ROM font." #~ msgstr "Nutné pro použití Japonského písma ROM" -#~ msgid "Safe" -#~ msgstr "Bezpečná" - #~ msgid "Scale:" #~ msgstr "Změna Velikosti:" -#~ msgid "Scaled EFB Copy" -#~ msgstr "EFB Kopie Změněné Velikosti" - #~ msgid "Select resolution for fullscreen mode" #~ msgstr "Vyberte rozlišení v režimu celé obrazovky" @@ -6593,21 +6893,6 @@ msgstr "| NEBO" #~ "Zobrazí různé statistiky.\n" #~ "Jsou užitečné pouze pro účely ladění." -#~ 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" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "Lehce zrychlí kopie EFB do RAM obětováním přesnosti emulace.\n" -#~ "Někdy také zvýší kvalitu obrazu.\n" -#~ "Pokud se setkáváte s jakýmikoliv problémy, zkuste zvýšit přesnost " -#~ "textury, nebo tuto možnost vypnout.\n" -#~ "\n" -#~ "Pokud si nejste jisti, nechejte toto odškrtnuté." - #~ msgid "Slot" #~ msgstr "Slot" @@ -6641,6 +6926,7 @@ msgstr "| NEBO" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Spustí vykreslovací okno v režimu celé obrazovky." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #~ msgid "" @@ -6684,6 +6970,8 @@ msgstr "| NEBO" #~ "Pokud si nejste jisti, použijte druhou nejrychlejší hodnotu zprava." >>>>>>> Update Greek and Czech translations +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #~ msgid "Use FPS For Limiting" #~ msgstr "Použít SzS pro Omezení" diff --git a/Languages/po/el.po b/Languages/po/el.po index c9e9dda7d7..7a97de70b5 100644 --- a/Languages/po/el.po +++ b/Languages/po/el.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-12-18 13:39-0600\n" ======= @@ -17,6 +18,9 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= "POT-Creation-Date: 2011-08-10 08:30-0500\n" +======= +"POT-Creation-Date: 2011-10-11 23:25-0500\n" +>>>>>>> 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 "Last-Translator: Linktothepast \n" @@ -42,7 +46,7 @@ msgstr "Παιχνίδι : " msgid "! NOT" msgstr "! NOT" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:69 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:72 #, c-format msgid "" "\"%s\" does not exist.\n" @@ -54,8 +58,7 @@ 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 @@ -83,10 +86,9 @@ 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/DolphinWX/Src/MemoryCards/GCMemcard.cpp:97 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:97 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -95,7 +97,7 @@ msgstr "" "%s απέτυχε να φορτώσει ως κάρτα μνήμης\n" " Το μέγεθος του αρχείου της κάρτας δεν είναι έγκυρο (0x%x bytes)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:112 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:112 #, c-format msgid "" "%s failed to load as a memorycard \n" @@ -104,15 +106,14 @@ msgstr "" "%s απέτυχε να φορτώσει ως κάρτα μνήμης\n" " Το μέγεθος της κάρτας δεν είναι έγκυρο (0x%x bytes)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:92 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:92 #, c-format 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)" +"το αρχείο δεν είναι αρκετά μεγάλο ώστε να αποτελεί έγκυρο αρχείο κάρτας μνήμης (0x%x bytes)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 #, c-format @@ -143,9 +144,7 @@ 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 @@ -323,7 +322,7 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(ΑΓΝΩΣΤΟ)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:381 msgid "(off)" msgstr "(ανενεργό)" @@ -335,7 +334,7 @@ msgstr "16 bit" msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 msgid "3D Vision" msgstr "3D Vision" @@ -347,7 +346,7 @@ msgstr "8 bit" msgid "" msgstr "<Εισάγετε όνομα εδώ>" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:258 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:262 msgid "" msgstr "<Δε βρέθηκαν αναλύσεις>" @@ -386,13 +385,11 @@ 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" @@ -406,12 +403,10 @@ msgstr "" " - Δύο Πυρήνες [ΑΝΕΝΕΡΓΟ]\n" " - Throttle Ήχου [ΑΝΕΝΕΡΓΟ]\n" " - DSP-HLE με \"Null Audio\" ή DSP-LLE\n" -" - Χειροκίνητη εισαγωγή του ακριβούς αριθμού των ελεγκτών που θα " -"χρησιμοποιηθούν σαν [Τυπικός Ελεγκτής]\n" +" - Χειροκίνητη εισαγωγή του ακριβούς αριθμού των ελεγκτών που θα χρησιμοποιηθούν σαν [Τυπικός Ελεγκτής]\n" "\n" "Όλοι οι παίκτες πρέπει να έχουν την ίδια έκδοση και ρυθμίσεις του Dolphin.\n" -"Απενεργοποιήστε όλες τις κάρτες μνήμης ή στείλτε τες σε όλους τους παίκτες " -"πριν την εκκίνηση.\n" +"Απενεργοποιήστε όλες τις κάρτες μνήμης ή στείλτε τες σε όλους τους παίκτες πριν την εκκίνηση.\n" "Η υποστήριξη Wiimote δεν έχει ακόμα υλοποιηθεί.\n" "\n" "Θα πρέπει να έχετε κάνει προώθηση της πόρτας TCP στον host!!" @@ -434,6 +429,7 @@ msgstr "Σχετικά με το Dolphin" msgid "Acceleration" msgstr "Επιτάχυνση" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Accuracy:" @@ -445,10 +441,17 @@ msgstr "" ======= >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +msgid "Accuracy:" +msgstr "Ακρίβεια:" + +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Accurate VBeam emulation" msgstr "Ακριβής VBeam εξομοίωση" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 <<<<<<< HEAD @@ -458,16 +461,17 @@ msgstr "Ακριβής VBeam εξομοίωση" >>>>>>> Update Greek and Czech translations #, fuzzy >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +>>>>>>> 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, leave this checked." +"If unsure, check EFB to Texture instead." msgstr "" "Εξομοιώνει με ακρίβεια τα EFB αντίγραφα.\n" -"Κάποια παιχνίδια βασίζονται σε αυτό για ορισμένα εφέ γραφικών ή λειτουργίες " -"του gameplay.\n" +"Κάποια παιχνίδια βασίζονται σε αυτό για ορισμένα εφέ γραφικών ή λειτουργίες του gameplay.\n" "\n" "Αν δεν είστε σίγουροι, επιλέξτε EFB Αντίγραφα σε Υφή." @@ -493,38 +497,23 @@ 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 @@ -533,11 +522,8 @@ 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 @@ -564,12 +550,12 @@ msgstr "Action Replay: Normal Code %i: Μη έγκυρο subtype %08x (%s)" msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: Normal Code 0: Μη έγκυρο Subtype %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:245 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:249 msgid "Adapter:" msgstr "Προσαρμογέας:" -#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:73 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 msgid "Add" msgstr "Προσθήκη" @@ -585,6 +571,7 @@ msgstr "Προσθήκη Patch" msgid "Add new pane" msgstr "Προσθήκη νέου pane" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -600,6 +587,11 @@ msgstr "Προσθήκη νέου pane" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 +#: 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 msgid "Add..." msgstr "Προσθήκη..." @@ -611,8 +603,7 @@ 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." @@ -622,8 +613,7 @@ 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." @@ -631,11 +621,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:486 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Advanced" msgstr "Για προχωρημένους" @@ -655,6 +643,7 @@ msgstr "Όλες οι εικόνες GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Όλα τα αρχεία Gamecube GCM (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -667,6 +656,10 @@ msgstr "Όλα τα αρχεία Gamecube GCM (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update Greek and Czech translations +======= +#: 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 msgid "All Save States (sav, s##)" msgstr "Όλα τα Σημεία Αποθήκευσης(sav, s##)" @@ -682,18 +675,17 @@ msgstr "Όλα τα συμπιεσμένα αρχεία GC/Wii ISO (gcz)" msgid "All files (*.*)|*.*" msgstr "Όλα τα αρχεία (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: 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" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 <<<<<<< HEAD @@ -709,10 +701,17 @@ msgstr "Εξομοιωμένο Wiimote" ======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +msgid "Alternate Wiimote Timing" +msgstr "Εναλλακτικός Χρονισμός Wiimote" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Anisotropic Filtering:" msgstr "Ανισοτροπικό Φιλτράρισμα:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:355 msgid "Anti-Aliasing:" msgstr "Εξομάλυνση Ορίων:" @@ -732,7 +731,7 @@ msgstr "Apploader:" msgid "Apply" msgstr "Εφαρμογή" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -761,20 +760,22 @@ 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 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 ======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Aspect Ratio:" msgstr "Αναλογία Οθόνης:" @@ -799,23 +800,27 @@ msgstr "AudioCommon: Σφάλμα ανοίγματος AO συσκευής.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 ======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Auto" msgstr "Αυτόματα" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Multiple of 640x528)" msgstr "Αυτόματα (Πολλαπλάσιο του 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:342 msgid "Auto (Window Size)" msgstr "Αυτόματα (Μέγεθος Παραθύρου)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Auto adjust Window Size" msgstr "Αυτόματη Προσαρμογή Μεγέθους Παραθύρου" @@ -825,12 +830,14 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Προσαρμόζει αυτόματα το μέγεθος του παραθύρου σύμφωνα με την εσωτερική " -"ανάλυση.\n" +"Προσαρμόζει αυτόματα το μέγεθος του παραθύρου σύμφωνα με την εσωτερική ανάλυση.\n" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Automatically generate mipmaps rather than decoding them from memory.\n" @@ -839,6 +846,7 @@ msgid "" "If unsure, leave this checked." msgstr "" <<<<<<< HEAD +<<<<<<< HEAD "Δημιουργεί αυτόματα τα mipmaps αντί να τα αποκωδικοποιεί από την μνήμη.\n" "Αυξάνει λίγο τις επιδόσεις, αλλά μπορεί να προκαλέσει μικρά ελαττώματα στις " "υφές.\n" @@ -849,6 +857,13 @@ msgstr "" ======= >>>>>>> Update Greek and Czech translations +======= +"Δημιουργεί αυτόματα τα mipmaps αντί να τα αποκωδικοποιεί από την μνήμη.\n" +"Αυξάνει λίγο τις επιδόσεις, αλλά μπορεί να προκαλέσει μικρά ελαττώματα στις υφές.\n" +"\n" +"Αν δεν είστε σίγουροι, αφήστε το επιλεγμένο." + +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/WXInputBase.cpp:27 msgid "Back" msgstr "Πίσω" @@ -857,8 +872,8 @@ msgstr "Πίσω" msgid "Backend Settings" msgstr "Backend Ρυθμίσεις" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:209 #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:213 msgid "Backend:" msgstr "Backend:" @@ -892,7 +907,7 @@ msgstr "Εικονίδιο:" msgid "Bar" msgstr "Bar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Basic" msgstr "Βασικές" @@ -904,7 +919,7 @@ msgstr "Βασικές Ρυθμίσεις" msgid "Bass" msgstr "Μπάσο" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:188 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:188 msgid "Block Allocation Table checksum failed" msgstr "Αποτυχία ελέγχου checksum για τον BAT" @@ -924,6 +939,7 @@ msgstr "Αριστερό Μπλε" msgid "Blue Right" msgstr "Δεξί Μπλε" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD @@ -935,6 +951,10 @@ msgstr "Δεξί Μπλε" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 >>>>>>> Update Greek and Czech translations +======= +#: 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 msgid "Bottom" msgstr "Βάση" @@ -967,6 +987,7 @@ msgstr "Εύρεση φακέλου προορισμού" msgid "Buffer:" msgstr "Buffer:" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 @@ -978,7 +999,11 @@ msgstr "Buffer:" >>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/Core/Src/HW/GCPadEmu.cpp:68 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" msgstr "Κουμπιά" @@ -994,27 +1019,23 @@ msgstr "Stick Κάμερας" msgid "CPU Emulator Engine" msgstr "Μηχανή Εξομοίωσης CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:465 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Cache Display Lists" msgstr "Cache Display Lists" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 +#: 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" "Αν δεν είστε σίγουροι, αφήστε το επιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -1024,13 +1045,12 @@ msgid "" msgstr "" "Υπολογίζει τον φωτισμό των 3D γραφικών ανά pixel αντί ανά vertex.\n" "Μειώνει την ταχύτητα εξομοίωσης κατά κάποιο ποσοστό (ανάλογα με την GPU).\n" -"Αυτή συνήθως είναι μια ασφαλής βελτίωση, αλλά μπορεί να προκαλέσει ορισμένες " -"φορές προβλήματα.\n" +"Αυτή συνήθως είναι μια ασφαλής βελτίωση, αλλά μπορεί να προκαλέσει ορισμένες φορές προβλήματα.\n" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Άκυρο" @@ -1074,10 +1094,10 @@ msgstr "Αποτυχία εύρεσης WiiMote με bd: %02x:%02x:%02x:%02x:%02 msgid "Cant find WiiMote by connection handle %02x" msgstr "Αδυναμία εύρεσης του WiiMote με handle σύνδεσης %02x" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:643 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "Αδυναμία ανάγνωσης από το DVD_Plugin - DVD-Interface: Κρίσιμο Σφάλμα" @@ -1183,6 +1203,7 @@ msgstr "Επιλέξτε μια κάρτα μνήμης:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " @@ -1190,6 +1211,10 @@ msgid "" msgstr "" "Επιλέξτε ένα αρχείο για χρήση ως apploader: (έχει εφαρμογή σε δίσκους που " "απαρτίζονται μόνο από φακέλους)" +======= +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 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 @@ -1204,10 +1229,10 @@ msgstr "Κυκλικό Stick" msgid "Classic" msgstr "Κλασικό Χειριστήριο" +#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 msgid "Clear" msgstr "Καθάρισ." @@ -1216,25 +1241,25 @@ 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/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 ======= #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Close" msgstr "Κλείσιμο" @@ -1342,6 +1367,7 @@ msgstr "Σύνδεση Wiimote 3" msgid "Connect Wiimote 4" msgstr "Σύνδεση Wiimote 4" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:597 @@ -1351,6 +1377,9 @@ msgstr "Σύνδεση Wiimote 4" ======= #: Source/Core/DolphinWX/Src/Main.cpp:608 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/Main.cpp:598 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Connecting..." msgstr "Γίνεται Σύνδεση..." @@ -1391,15 +1420,10 @@ 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 @@ -1416,23 +1440,19 @@ 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:118 +#: 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'!" @@ -1473,12 +1493,17 @@ msgstr "Δημιουργήθηκε από KDE-Look.org" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Δημιουργήθηκε από Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart." "com]" +======= +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 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Created by VistaIcons.com" @@ -1486,9 +1511,7 @@ 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: " @@ -1498,11 +1521,11 @@ msgstr "Δημιουργός: " msgid "Critical" msgstr "Κρίσιμο" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 msgid "Crop" msgstr "Κόψιμο" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1549,6 +1572,7 @@ msgstr "Ήχος (DSP)" msgid "DSP Emulator Engine" msgstr "Μηχανή Εξομοίωσης DSP" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD @@ -1560,6 +1584,10 @@ msgstr "Μηχανή Εξομοίωσης DSP" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "DSP HLE emulation (fast)" msgstr "DSP HLE εξομοίωση (γρήγορη)" @@ -1608,7 +1636,7 @@ msgstr "Νεκρή Ζώνη" msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Debugging" msgstr "Debugging" @@ -1641,8 +1669,8 @@ msgstr "Προεπιλεγμένο ISO:" msgid "Default font" msgstr "Προεπιλεγμένη γραμματοσειρά" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 msgid "Delete" msgstr "Διαγραφή" @@ -1650,12 +1678,12 @@ msgstr "Διαγραφή" msgid "Delete Save" msgstr "Διαγραφή Αποθήκευσης" -#: Source/Core/VideoCommon/Src/AVIDump.cpp:73 +#: Source/Core/VideoCommon/Src/AVIDump.cpp:77 #, c-format msgid "Delete the existing file '%s'?" msgstr "Διαγραφή του υπάρχοντος αρχείου '%s';" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:651 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 msgid "Description" msgstr "Περιγραφή" @@ -1665,12 +1693,8 @@ 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 @@ -1686,15 +1710,15 @@ msgstr "Ρυθμίσεις Συσκευής" msgid "Dial" msgstr "Dial" -#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:147 +#: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146 msgid "Direct3D11" msgstr "Direct3D11" -#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:129 +#: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128 msgid "Direct3D9" msgstr "Direct3D9" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:169 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:169 msgid "" "Directory checksum failed\n" " and Directory backup checksum failed" @@ -1702,62 +1726,52 @@ msgstr "" "Το checksum του Καταλόγου απέτυχε\n" " καθώς και το checksum του εφεδρικού Καταλόγου απέτυχε" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 msgid "Disable" msgstr "Απενεργοποίηση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "Disable Fog" msgstr "Απενεργοποίηση Ομίχλης" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Disable Lighting" msgstr "Απενεργοποίηση Φωτισμού" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 msgid "Disable Per-Pixel Depth" msgstr "Απενεργοποίηση Βάθους ανά Pixel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Disable Textures" msgstr "Απενεργοποίηση Υφών" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -msgid "Disable Wiimote Speaker" -msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: 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:93 +#: 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" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Disable texturing.\n" "\n" @@ -1776,11 +1790,11 @@ msgstr "Δίσκος" msgid "Disc Read Error" msgstr "Σφάλμα Ανάγνωσης Δίσκου" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 msgid "Display" msgstr "Οθόνη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1794,6 +1808,7 @@ msgstr "" msgid "Divide" msgstr "Divide" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1803,6 +1818,9 @@ msgstr "Divide" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1051 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Do you want to stop the current emulation?" msgstr "Θέλετε να σταματήσετε την τρέχουσα εξομοίωση;" @@ -1810,7 +1828,7 @@ msgstr "Θέλετε να σταματήσετε την τρέχουσα εξο msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:185 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:189 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Ρυθμίσεις Γραφικών Dolphin %s" @@ -1831,6 +1849,7 @@ msgstr "Ρυθμίσεις Εξοιμοιωμένου Dolphin Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1844,16 +1863,23 @@ msgstr "Ρυθμίσεις Dolphin GCPad" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1202 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Dolphin GCPad Configuration" msgstr "Ρυθμίσεις Dolphin GCPad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:742 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Ταινίες (*.dtm)" @@ -1869,6 +1895,7 @@ msgstr "Dolphin στο &Google Code" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " @@ -1876,11 +1903,16 @@ msgid "" msgstr "" "Το Dolphin δεν μπόρεσε να βρει GC/Wii ISO. Κάντε διπλό κλίκ εδώ για εύρεση " "αρχείων..." +======= +msgid "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for files..." +msgstr "Το Dolphin δεν μπόρεσε να βρει GC/Wii ISO. Κάντε διπλό κλίκ εδώ για εύρεση αρχείων..." +>>>>>>> The actual update of the Greek and Czech translations. The last commit <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " @@ -1888,9 +1920,13 @@ msgid "" msgstr "" "Το Dolphin είναι ρυθμισμένο να αποκρύπτει όλα τα παιχνίδια. Κάντε διπλό κλίκ " "εδώ για να εμφανιστούν όλα τα παιχνίδια..." +======= +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 -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Down" msgstr "Κάτω" @@ -1915,41 +1951,39 @@ msgstr "Dummy" msgid "Dump Audio" msgstr "Εξαγωγή Ήχου" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Dump EFB Target" msgstr "Εξαγωγή EFB Target" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 msgid "Dump Frames" msgstr "Εξαγωγή Καρέ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:508 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Dump Textures" msgstr "Εξαγωγή Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Εξαγωγή όλων των απεικονισμένων καρέ σε ένα AVI αρχείο στο User/Dump/" -"Frames/\n" +"Εξαγωγή όλων των απεικονισμένων καρέ σε ένα AVI αρχείο στο User/Dump/Frames/\n" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Εξαγωγή των αποκωδικοποιημένων υφών του παιχνιδιού στο User/Dump/Textures/" -"/\n" +"Εξαγωγή των αποκωδικοποιημένων υφών του παιχνιδιού στο User/Dump/Textures//\n" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1959,6 +1993,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1974,6 +2009,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: 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 msgid "Dutch" msgstr "Ολλανδικά" @@ -1981,22 +2021,14 @@ msgstr "Ολλανδικά" msgid "E&xit" msgstr "Έ&ξοδος" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:430 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "EFB Copies" 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" @@ -2035,7 +2067,7 @@ msgstr "Επεξεργασία..." msgid "Effect" msgstr "Εφέ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Embedded Frame Buffer" msgstr "Embedded Frame Buffer" @@ -2043,34 +2075,27 @@ msgstr "Embedded Frame Buffer" msgid "Emu Thread already running" msgstr "Το νήμα εξομοίωσης εκτελείται ήδη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: 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:107 +#: 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" "Αν δεν είστε σίγουροι, αφήστε το επιλεγμένο." @@ -2086,17 +2111,15 @@ msgstr "Κατάσταση Λειτουργίας:" msgid "Enable" msgstr "Ενεργοποίηση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: 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" @@ -2118,16 +2141,20 @@ msgstr "Ενεργοποίηση BAT" msgid "Enable Block Merging" msgstr "Ενεργοποίηση Block Merging" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" msgstr "" +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Ενεργοποίηση Cache" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 @@ -2137,6 +2164,8 @@ msgstr "Ενεργοποίηση Cheat" ======= >>>>>>> Update Greek and Czech translations +======= +>>>>>>> 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. msgid "Enable Cheats" @@ -2154,7 +2183,7 @@ msgstr "Ενεργοποίηση Διπλού Πυρήνα" msgid "Enable Dual Core (speedup)" msgstr "Ενεργοποίηση Διπλού Πυρήνα (επιτάχυνση)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 msgid "Enable Hotkeys" msgstr "Ενεργοποίηση Συντομεύσεων" @@ -2170,8 +2199,8 @@ msgstr "Ενεργοποίηση Idle Skipping (επιτάχυνση)" msgid "Enable MMU" msgstr "Ενεργοποίηση MMU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 msgid "Enable Progressive Scan" msgstr "Ενεργοποίηση Προοδευτικής Σάρωσης" @@ -2183,7 +2212,7 @@ msgstr "Ενεργοποίηση Προφύλαξης Οθόνης" msgid "Enable WideScreen" msgstr "Ενεργοποίηση Ευρείας Οθόνης" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Enable Wireframe" msgstr "Ενεργοποίηση Wireframe" @@ -2196,19 +2225,14 @@ 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" @@ -2221,21 +2245,18 @@ 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" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." @@ -2243,6 +2264,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " @@ -2250,16 +2272,14 @@ msgid "" msgstr "" "Ενεργοποιήστε το για να επιταχύνετε το The Legend of Zelda: Twilight " "Princess. Απενεργοποιήστε το για τα υπόλοιπα παιχνίδια." +======= +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 #: 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" @@ -2272,20 +2292,15 @@ 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:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2299,6 +2314,7 @@ msgstr "" msgid "End" msgstr "Τέλος" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2314,11 +2330,16 @@ msgstr "Τέλος" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: 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 msgid "English" msgstr "Αγγλικά" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:406 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:334 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:411 msgid "Enhancements" msgstr "Βελτιώσεις" @@ -2340,6 +2361,7 @@ msgstr "Εγγραφή 1/%d" msgid "Equal" msgstr "Ίσο" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 @@ -2360,10 +2382,15 @@ msgstr "" >>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 +======= +>>>>>>> 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 msgid "Error" msgstr "Σφάλμα" +<<<<<<< HEAD <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 @@ -2375,6 +2402,11 @@ msgstr "" "Αποτυχία φόρτωσης της επιλεγμένης γλώσσας. Επαναφορά στην προεπιλογή " "συστήματος." <<<<<<< HEAD +======= +#: Source/Core/DolphinWX/Src/Main.cpp:346 +msgid "Error loading selected language. Falling back to system default." +msgstr "Αποτυχία φόρτωσης της επιλεγμένης γλώσσας. Επαναφορά στην προεπιλογή συστήματος." +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/Common/Src/ChunkFile.h:180 #, c-format @@ -2387,13 +2419,8 @@ 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 γραμματοσειρών αλλά δεν είναι " -"φορτωμένες. Τα παιχνίδια μπορεί να μη δείχνουν τις γραμματοσειρές σωστά, ή " -"να κρασάρουν." +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" @@ -2406,8 +2433,7 @@ 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" @@ -2458,7 +2484,7 @@ msgstr "Εξαγωγή αποθήκευσης ως..." msgid "Extension" msgstr "Επέκταση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "External Frame Buffer" msgstr "Εξωτερικό Frame Buffer" @@ -2559,12 +2585,10 @@ 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 @@ -2581,7 +2605,7 @@ msgstr "Αποτυχία φόρτωσης hid.dll" msgid "Failed to read banner.bin" msgstr "Αποτυχία ανάγνωσης banner.bin" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:150 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:150 msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" @@ -2589,7 +2613,7 @@ msgstr "" "Αποτυχία σωστής ανάγνωσης του αντιγράφου ασφαλείας του BAT\n" "(0x8000-0x9FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:144 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:144 msgid "" "Failed to read block allocation table correctly\n" "(0x6000-0x7FFF)" @@ -2602,7 +2626,7 @@ msgstr "" msgid "Failed to read data from file %d" msgstr "Αποτυχία ανάγνωσης δεδομένων από το αρχείο %d" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:138 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:138 msgid "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" @@ -2610,7 +2634,7 @@ msgstr "" "Αποτυχία σωστής ανάγνωσης του αντιγράφου ασφαλείας των φακέλων\n" "(0x4000-0x5FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:132 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:132 msgid "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" @@ -2618,7 +2642,7 @@ msgstr "" "Αποτυχία σωστής ανάγνωσης των φακέλων\n" "(0x2000-0x3FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:121 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:121 msgid "" "Failed to read header correctly\n" "(0x0000-0x1FFF)" @@ -2626,7 +2650,7 @@ msgstr "" "Αποτυχία σωστής ανάγνωσης της κεφαλίδας\n" "(0x0000-0x1FFF)" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:222 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:222 msgid "" "Failed to read save data\n" "(0xA000-)\n" @@ -2655,15 +2679,21 @@ msgstr "Αποτυχία εγγραφής της κεφαλίδας για το msgid "Failed to write header for file %d" msgstr "Αποτυχία εγγραφής της κεφαλίδας για το αρχείο %d" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 msgid "Fast" <<<<<<< HEAD +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +msgid "Fast" +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgstr "Γρήγορη" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Fast Mipmaps" msgstr "Γρήγορα Mipmaps" +<<<<<<< HEAD ======= msgstr "" @@ -2674,6 +2704,9 @@ msgstr "" ======= >>>>>>> Update Greek and Czech translations +======= + +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Fast version of the MMU. Does not work for every game." msgstr "Γρήγορη έκδοση του MMU. Δε δουλεύει για όλα τα παιχνίδια." @@ -2702,7 +2735,7 @@ msgstr "" "Το αρχείο απέτυχε στο άνοιγμα\n" "ή δεν έχει έγκυρη επέκταση" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:86 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:86 #, c-format msgid "" "File has the extension \"%s\"\n" @@ -2740,11 +2773,11 @@ msgstr "Πρώτο Μπλοκ" msgid "Fix Checksums" msgstr "Επιδιόρθωση Checksum" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 16:9" msgstr "Επιβολή 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Force 4:3" msgstr "Επιβολή 4:3" @@ -2752,11 +2785,11 @@ msgstr "Επιβολή 4:3" msgid "Force Console as NTSC-J" msgstr "Επιβολή της Κονσόλας ως NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 msgid "Force Texture Filtering" msgstr "Επιβολή Φιλτραρίσματος Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2764,8 +2797,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Επιβάλλει φιλτράρισμα υφών ακόμα κι αν το παιχνίδι το έχει απενεργοποιήσει.\n" -"Βελτιώνει ελαφρώς την ποιότητα των υφών αλλά μπορεί να προκαλέσει προβλήματα " -"σε ορισμένα παιχνίδια.\n" +"Βελτιώνει ελαφρώς την ποιότητα των υφών αλλά μπορεί να προκαλέσει προβλήματα σε ορισμένα παιχνίδια.\n" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." @@ -2784,15 +2816,12 @@ 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/DolphinWX/Src/MemoryCards/GCMemcard.cpp:73 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" "Format as ascii (NTSC\\PAL)?\n" "Choose no for sjis (NTSC-J)" @@ -2818,7 +2847,7 @@ msgstr "Καρέ" msgid "Frame Advance" msgstr "Προώθηση ανά Καρέ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:514 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 msgid "Frame Dumps use FFV1" msgstr "FFV1 Για Τα Εξαγώμενα Καρέ" @@ -2838,10 +2867,11 @@ msgstr "Περιορισμός Καρέ:" msgid "Frames To Record" msgstr "Καρέ Προς Εγγραφή" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 msgid "Free Look" msgstr "Ελεύθερη Ματιά" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2857,6 +2887,11 @@ msgstr "Ελεύθερη Ματιά" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: 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 msgid "French" msgstr "Γαλλικά" @@ -2873,7 +2908,7 @@ msgstr "Από" msgid "FullScr" msgstr "Πλήρης Οθόνη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 msgid "Fullscreen resolution:" msgstr "Ανάλυση Πλήρους Οθόνης:" @@ -2922,6 +2957,7 @@ msgstr "Gamecube" msgid "Gamecube &Pad Settings" msgstr "Ρυθμίσεις Gamecube &Pad" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD @@ -2933,6 +2969,10 @@ msgstr "Ρυθμίσεις Gamecube &Pad" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 >>>>>>> Update Greek and Czech translations +======= +#: 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 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Κάρτες Μνήμης Gamecube (*.raw,*.gcp)" @@ -2954,6 +2994,7 @@ msgstr "" "Ο Κωδικός Gecko απέτυχε να εκτελεστεί (CT%i CST%i) (%s)\n" "(ή είναι ένας κακός κωδικός ή ο τύπος του κωδικού δεν υποστηρίζεται.)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD @@ -2968,6 +3009,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:200 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "General" msgstr "Γενικά" @@ -2975,6 +3021,7 @@ msgstr "Γενικά" msgid "General Settings" msgstr "Γενικές Ρυθμίσεις" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2990,15 +3037,18 @@ msgstr "Γενικές Ρυθμίσεις" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 +#: 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 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" @@ -3012,6 +3062,7 @@ msgstr "Ρυθμίσεις Γραφικών" msgid "Greater Than" msgstr "Μεγαλύτερο από" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 <<<<<<< HEAD @@ -3021,18 +3072,19 @@ msgstr "Μεγαλύτερο από" >>>>>>> Update Greek and Czech translations #, fuzzy >>>>>>> Update translation files for recent changes in the code. +======= +#: 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" "\n" "If unsure, leave this checked." msgstr "" -"Βελτιώνει πολύ την ποιότητα των υφών που παράγονται χρησιμοποιώντας render " -"to texture εφέ.\n" +"Βελτιώνει πολύ την ποιότητα των υφών που παράγονται χρησιμοποιώντας render to texture εφέ.\n" "Μία αύξηση της εσωτερικής ανάλυσης θα βελτιώσει το εφέ αυτής της ρύθμισης.\n" -"Μειώνει ελαφρώς την επίδοση και είναι πιθανό να προκαλέσει προβλήματα (αν " -"και σπάνια).\n" +"Μειώνει ελαφρώς την επίδοση και είναι πιθανό να προκαλέσει προβλήματα (αν και σπάνια).\n" "\n" "Αν δεν είστε σίγουροι, αφήστε το επιλεγμένο." @@ -3060,11 +3112,11 @@ msgstr "Κιθάρα" msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "Γίνεται κλήση του HCI_CMD_INQUIRY, παρακαλώ αναφέρετε!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:420 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:425 msgid "Hacks" msgstr "Hacks" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:160 +#: Source/Core/Core/Src/HW/GCMemcard.cpp:160 msgid "Header checksum failed" msgstr "Αποτυχία ελέγχου κεφαλίδας" @@ -3100,7 +3152,7 @@ msgstr "" msgid "Hide" msgstr "Απόκρυψη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Hide Mouse Cursor" msgstr "Απόκρυψη Δείκτη Ποντικιού" @@ -3110,8 +3162,7 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"Αποκρύπτει τον δείκτη του ποντικιού αν βρίσκεται πάνω από το παράθυρο " -"εξομοίωσης.\n" +"Αποκρύπτει τον δείκτη του ποντικιού αν βρίσκεται πάνω από το παράθυρο εξομοίωσης.\n" "\n" "Αν δεν είστε σίγουροι, αφήστε το επιλεγμένο." @@ -3128,6 +3179,7 @@ msgstr "Host" msgid "Hotkey Configuration" msgstr "Ρυθμίσεις Πλήκτρων Συντόμευσης" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 <<<<<<< HEAD @@ -3140,6 +3192,10 @@ msgstr "Ρυθμίσεις Πλήκτρων Συντόμευσης" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 >>>>>>> Update Greek and Czech translations +======= +#: 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 msgid "Hotkeys" msgstr "Πλήκτρα Συντόμευσης" @@ -3154,20 +3210,16 @@ 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 πιθανότατα θα κολλήσει τώρα." @@ -3214,56 +3266,50 @@ 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 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. 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." +======= +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 msgstr "" -"Αν θέσετε τιμή υψηλότερη από την πλήρη ταχύτητα του παιχνιδιού (NTSC:60, " -"PAL:50),\n" -"θα πρέπει επίσης να απενεργοποιήσετε το Throttle Ήχου στο DSP για να έχει " -"αποτέλεσμα. " +"Αν θέσετε τιμή υψηλότερη από την πλήρη ταχύτητα του παιχνιδιού (NTSC:60, PAL:50),\n" +"θα πρέπει επίσης να απενεργοποιήσετε το Throttle Ήχου στο DSP για να έχει αποτέλεσμα. " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" msgstr "Αγνόηση Αλλαγών Format" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: 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:91 +#: 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" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." @@ -3295,26 +3341,23 @@ msgstr "" "Το εισαγώμενο αρχείο έχει sav επέκταση\n" "άλλα δεν έχει σωστή κεφαλίδα." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: 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" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Improves performance but causes lighting to disappear in most games.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Βελτιώνει τις επιδόσεις αλλά προκαλεί την εξαφάνιση του φωτισμού στα " -"περισσότερα παιχνίδια.\n" +"Βελτιώνει τις επιδόσεις αλλά προκαλεί την εξαφάνιση του φωτισμού στα περισσότερα παιχνίδια.\n" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." @@ -3326,8 +3369,8 @@ msgstr "Εντός Παιχνιδιού" msgid "In-Game" msgstr "Εντός Παιχνιδιού" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Info" msgstr "Πληροφορίες" @@ -3364,12 +3407,10 @@ 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 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3379,6 +3420,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1361 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Installing WAD..." msgstr "Γίνεται εγκατάσταση WAD..." @@ -3407,7 +3451,7 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "Εσωτερικό Σφάλμα LZO - αποτυχία lzo_init()" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:349 msgid "Internal Resolution:" msgstr "Εσωτερική Ανάλυση:" @@ -3460,6 +3504,7 @@ msgstr "Μη έγκυρο αρχείο εγγραφής" msgid "Invalid state" msgstr "Μη έγκυρο κατάσταση" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3475,6 +3520,11 @@ msgstr "Μη έγκυρο κατάσταση" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: 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 msgid "Italian" msgstr "Ιταλικά" @@ -3536,8 +3586,8 @@ msgstr "Τελευταίο Επαναγραμμένο Σημείο Αποθ." msgid "Last Saved State" msgstr "Τελευταίο Αποθηκευμένο Σημείο Αποθ." -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 msgid "Left" msgstr "Αριστερά" @@ -3584,7 +3634,7 @@ msgstr "Περιορισμός με βάση τα Καρέ" msgid "Load" msgstr "Φόρτωσ." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:509 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Load Custom Textures" msgstr "Φόρτωση Τροποποιημένων Υφών" @@ -3632,6 +3682,7 @@ msgstr "Φόρτωση Σημείου Αποθήκευσης 8" msgid "Load State..." msgstr "Φόρτωση Σημείου Αποθήκευσης..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3653,11 +3704,18 @@ msgstr "Φόρτωση Μενού Συστήματος Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "Φόρτωση Μενού Συστήματος Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> The actual update of the Greek and Czech translations. The last commit #, c-format msgid "Load Wii System Menu %d%c" msgstr "Φόρτωση Μενού Συστήματος Wii %d%c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3699,8 +3757,8 @@ msgstr "Τύποι Καταγραφής" msgid "Logger Outputs" msgstr "Έξοδοι Καταγραφής" -#: Source/Core/DolphinWX/Src/Frame.cpp:398 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/Frame.cpp:398 msgid "Logging" msgstr "Καταγραφή" @@ -3734,6 +3792,7 @@ msgstr "MMU Speed Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Αρχεία MadCatz Gameshark (*.gcs)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 @@ -3743,7 +3802,10 @@ msgstr "Αρχεία MadCatz Gameshark (*.gcs)" ======= >>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 +#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Κύριο Stick" @@ -3772,6 +3834,7 @@ msgstr "Η κάρτα μνήμης είναι ήδη ανοιχτή" msgid "Memory Byte" msgstr "Memory Byte" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD @@ -3783,16 +3846,16 @@ msgstr "Memory Byte" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 >>>>>>> Update Greek and Czech translations +======= +#: 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 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 @@ -3811,11 +3874,9 @@ msgstr "" "%s\n" "Θέλετε να αντιγράψετε το παλιό αρχείο σε αυτή την νέα τοποθεσία;\n" -#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:126 +#: 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" @@ -3830,7 +3891,7 @@ msgstr "Μικρόφωνο" msgid "Min" msgstr "Ελάχιστη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 msgid "Misc" msgstr "Διάφορα" @@ -3843,15 +3904,13 @@ msgstr "Διάφορες Ρυθμίσεις" msgid "Modifier" msgstr "Modifier" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: 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" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." @@ -3869,7 +3928,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Μοτέρ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:634 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3879,8 +3938,7 @@ msgid "" "\n" "\n" msgstr "" -"Μετακινήστε τον δείκτη του ποντικιού πάνω από μία επιλογή για να εμφανιστεί " -"μία λεπτομερής περιγραφή.\n" +"Μετακινήστε τον δείκτη του ποντικιού πάνω από μία επιλογή για να εμφανιστεί μία λεπτομερής περιγραφή.\n" "\n" "\n" "\n" @@ -3891,12 +3949,8 @@ 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" @@ -3982,6 +4036,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3990,9 +4045,11 @@ msgstr "NP Up" >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 msgid "Name:" msgstr "Όνομα:" @@ -4077,6 +4134,7 @@ msgstr "Όχι ίσο" msgid "Not Set" msgstr "Μη Ορισμένο" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:596 @@ -4086,6 +4144,9 @@ msgstr "Μη Ορισμένο" ======= #: Source/Core/DolphinWX/Src/Main.cpp:607 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/Main.cpp:597 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Not connected" msgstr "Μη Συνδεδεμένο" @@ -4114,8 +4175,8 @@ msgstr "Num Lock" msgid "Number Of Codes: " msgstr "Αριθμός Κωδικών: " -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 msgid "Nunchuk" msgstr "Nunchuk" @@ -4144,6 +4205,7 @@ msgstr "Offset:" msgid "Only %d blocks available" msgstr "Διαθέσιμα μόνο %d μπλοκ" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 <<<<<<< HEAD <<<<<<< HEAD @@ -4153,6 +4215,10 @@ msgstr "Διαθέσιμα μόνο %d μπλοκ" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Open" msgstr "Άνοιγμα" @@ -4182,11 +4248,11 @@ msgstr "OpenAL: αδυναμία εύρεσης συσκευών ήχου" msgid "OpenAL: can't open device %s" msgstr "OpenAL: αδυναμία ανοίγματος της συσκευής %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 msgid "OpenCL Texture Decoder" msgstr "OpenCL Αποκωδικοποιητής Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 msgid "OpenMP Texture Decoder" msgstr "OpenMP Αποκωδικοποιητής Υφών" @@ -4213,23 +4279,18 @@ 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" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 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" @@ -4284,6 +4345,7 @@ msgstr "Patches" msgid "Paths" msgstr "Φάκελοι" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4294,13 +4356,15 @@ msgstr "Φάκελοι" >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update Greek and Czech translations +======= +#: 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/WXInputBase.cpp:48 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1603 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1604 msgid "Pause" msgstr "Παύση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "Per-Pixel Lighting" msgstr "Φωτισμός ανά Pixel" @@ -4313,6 +4377,7 @@ msgstr "Τέλειο" msgid "Perspective %d" msgstr "Οπτική %d" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD @@ -4327,6 +4392,12 @@ msgstr "Οπτική %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1613 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 +#: 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 msgid "Play" msgstr "Αναπαραγωγή" @@ -4352,6 +4423,7 @@ msgstr "Ρυθμίσεις Αναπαραγωγής" msgid "Players" msgstr "Παίχτες" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4361,6 +4433,9 @@ msgstr "Παίχτες" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Please confirm..." msgstr "Παρακαλώ επιβεβαιώστε..." @@ -4405,7 +4480,7 @@ msgstr "Πορτογαλικά" msgid "Portuguese (Brazilian)" msgstr "Πορτογαλικά (Βραζιλιάνικα)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396 msgid "Post-Processing Effect:" msgstr "Post-Processing Εφέ:" @@ -4479,7 +4554,7 @@ msgstr "R Button" msgid "R-Analog" msgstr "R-Αναλογική" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "RAM" msgstr "RAM" @@ -4496,7 +4571,7 @@ msgstr "Εύρος" msgid "Read-only mode" msgstr "Μόνο Για Ανάγνωση (Εγγραφής)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 msgid "Real" msgstr "Πραγματικό" @@ -4556,9 +4631,9 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, επιλέξτε Καμία." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "Ανανέωση" @@ -4571,6 +4646,7 @@ msgstr "Ανανέωση Λίστας" msgid "Refresh game list" msgstr "Ανανέωση λίστας παιχνιδιών" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4589,10 +4665,16 @@ msgstr "Ανανέωση λίστας παιχνιδιών" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: 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 msgid "Remove" msgstr "Αφαίρεση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4602,10 +4684,11 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 msgid "Render to Main Window" msgstr "Αναπαραγωγή στο Κεντρικό Παράθυρο" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 <<<<<<< HEAD @@ -4615,7 +4698,10 @@ msgstr "Αναπαραγωγή στο Κεντρικό Παράθυρο" ======= >>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Επανεκκίνηση" @@ -4627,8 +4713,8 @@ msgstr "Αποτελέσματα" msgid "Return" msgstr "Return" -#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 msgid "Right" msgstr "Δεξιά" @@ -4653,6 +4739,7 @@ msgstr "Ρώσικα" msgid "Sa&ve State" msgstr "Απ&οθήκευση Σημείου Αποθήκευσης" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 msgid "Safe" @@ -4665,14 +4752,20 @@ msgstr "" ======= >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +msgid "Safe" +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. msgid "Sample Rate:" msgstr "Ρυθμός Δειγματοληψίας:" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:181 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "Αποθήκ." @@ -4744,9 +4837,11 @@ 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 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 @@ -4789,14 +4884,16 @@ 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" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 msgid "Select" msgstr "Επιλογή" @@ -4809,16 +4906,20 @@ msgstr "Επιλέξτε το Αρχείο Εγγραφής" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1140 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 msgid "Select The Recording File" msgstr "Επιλέξτε το Αρχείο Εγγραφής" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1349 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Select a Wii WAD file to install" msgstr "Επιλέξτε ένα Wii WAD αρχείο για εγκατάσταση" @@ -4844,6 +4945,7 @@ msgstr "Επιλέξτε αιωρούμενα παράθυρα" msgid "Select the file to load" msgstr "Επιλέξτε το αρχείο για φόρτωση" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 @@ -4860,19 +4962,26 @@ msgstr "Επιλέξτε το σημείο φόρτωσης" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1306 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Select the save file" msgstr "Επιλέξτε αρχείο αποθήκευσης" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1455 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 msgid "Select the state to load" msgstr "Επιλέξτε το σημείο φόρτωσης" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1469 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Select the state to save" msgstr "Επιλέξτε το σημείο αποθήκευσης" @@ -4890,8 +4999,7 @@ msgstr "" "Αυτόματα: Χρήση της τοπικής αναλογίας οθόνης (4:3)\n" "Επιβολή 16:9: Προσαρμόζει την εικόνα σε αναλογία οθόνης 16:9.\n" "Επιβολή 4:3: Προσαρμόζει την εικόνα σε αναλογία οθόνης 4:3.\n" -"Προσαρμογή στο παράθυρο: Προσαρμόζει την εικόνα στην αναλογία του " -"παραθύρου.\n" +"Προσαρμογή στο παράθυρο: Προσαρμόζει την εικόνα στην αναλογία του παραθύρου.\n" "\n" "Αν δεν είστε σίγουροι επιλέξτε Αυτόματα." @@ -4902,32 +5010,26 @@ 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." @@ -4952,12 +5054,17 @@ msgstr "Σερβικά" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" "Σειριακή Θύρα 1 - Αυτή είναι η θύρα που χρησιμοποιούν οι συσκευές όπως ο " "προσαρμογέας δικτύου" +======= +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 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 msgid "Set" @@ -4975,9 +5082,7 @@ 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..." @@ -5019,11 +5124,11 @@ msgstr "Εμφάνιση Γραμμής &Εργαλείων" msgid "Show Drives" msgstr "Εμφάνιση Οδηγών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 msgid "Show EFB Copy Regions" msgstr "Εμφάνιση Περιοχών EFB Αντιγραφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Show FPS" msgstr "Εμφάνιση FPS" @@ -5035,7 +5140,7 @@ msgstr "Εμφάνιση Γαλλίας" msgid "Show GameCube" msgstr "Εμφάνιση GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Show Input Display" msgstr "Εμφάνιση Προβολής Χειρισμών" @@ -5071,7 +5176,7 @@ msgstr "Εμφάνιση Πλατφόρμας" msgid "Show Regions" msgstr "Εμφάνιση Περιοχών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Show Statistics" msgstr "Εμφάνιση Στατιστικών" @@ -5098,12 +5203,10 @@ 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 @@ -5126,15 +5229,13 @@ msgstr "Εμφάνιση αποθηκευμένου εικονιδίου" msgid "Show save title" msgstr "Εμφάνιση αποθηκευμένου τίτλου" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: 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" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." @@ -5146,7 +5247,7 @@ msgstr "Εμφάνιση αυτού του μηνύματος βοήθειας" msgid "Show unknown" msgstr "Εμφάνιση Αγνώστων" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Show various statistics.\n" "\n" @@ -5172,28 +5273,44 @@ msgstr "Μέγεθος" msgid "Skip BIOS" msgstr "Παράλειψη BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Skip Dest. Alpha Pass" msgstr "Παράλειψη Dest. Alpha Pass" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 msgid "Skip EFB Access from CPU" msgstr "Παράλειψη EFB Πρόσβασης από τη CPU" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 <<<<<<< HEAD ======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 >>>>>>> Update Greek and Czech translations +======= +#: 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" +"Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +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" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"Επιταχύνει ελαφρώς τα EFB σε RAM αντίγραφα θυσιάζοντας την ακρίβεια της εξομοίωσης.\n" +"Μερικές φορές μπορεί να βελτιώσει την οπτική ποιότητα.\n" +"Αν αντιμετωπίζετε προβλήματα, δοκιμάστε να αυξήσετε την ακρίβεια της cache υφών ή απενεργοποιήστε αυτήν την επιλογή.\n" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." @@ -5261,16 +5378,13 @@ 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" @@ -5290,6 +5404,7 @@ msgstr "Αποτυχία δημιουργίας buffer ήχου: %s" msgid "Space" msgstr "Space" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5305,6 +5420,11 @@ msgstr "Space" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: 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 msgid "Spanish" msgstr "Ισπανικά" @@ -5312,24 +5432,15 @@ msgstr "Ισπανικά" msgid "Speaker Volume:" msgstr "Ένταση ηχείου:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: 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." @@ -5349,6 +5460,7 @@ msgstr "Τετράγωνο Stick" msgid "Standard Controller" msgstr "Τυπικός Controller" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 @@ -5357,9 +5469,11 @@ msgstr "Τυπικός Controller" >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49 msgid "Start" msgstr "Εκκίνηση" @@ -5389,6 +5503,7 @@ msgstr "Σημεία Αποθήκευσης" msgid "Stick" msgstr "Stick" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 <<<<<<< HEAD <<<<<<< HEAD @@ -5399,10 +5514,16 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Διακοπή" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" @@ -5425,6 +5546,21 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 >>>>>>> Update Greek and Czech translations +======= +#: 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" +"\n" +"If unsure, leave this checked." +msgstr "" +"Αποθήκευση των EFB αντιγράφων σε GPU αντικείμενα υφών.\n" +"Αυτό δεν είναι τόσο ακριβές, αλλά δουλεύει αρκετά καλά για τα περισσότερα παιχνίδια και προσφέρει μεγάλη επιτάχυνση σε σχέση με EFB σε RAM.\n" +"\n" +"Αν δεν είστε σίγουροι, αφήστε το επιλεγμένο." + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Stretch to Window" msgstr "Προσαρμογή στο Παράθυρο" @@ -5458,8 +5594,8 @@ msgstr "Γλώσσα Συστήματος:" msgid "TAIWAN" msgstr "ΤΑΪΒΑΝ" -#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "TAS Είσοδος" @@ -5479,10 +5615,10 @@ msgstr "Αριστερό Table" msgid "Table Right" msgstr "Δεξί Table" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 @@ -5490,6 +5626,9 @@ msgstr "Δεξί Table" >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Take Screenshot" msgstr "Δημιουργία Στιγμιότυπου" @@ -5501,15 +5640,20 @@ msgstr "" msgid "Test" msgstr "Τέστ" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 <<<<<<< HEAD +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Texture" msgstr "Υφή" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 msgid "Texture Cache" msgstr "Cache Υφών" +<<<<<<< HEAD ======= #, fuzzy msgid "Texture" @@ -5525,6 +5669,10 @@ msgstr "Καθαρισμός Cache" ======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 >>>>>>> Update Greek and Czech translations +======= + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Texture Format Overlay" msgstr "Επικάλυψη Του Format Υφών" @@ -5557,19 +5705,15 @@ 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 msgid "The file %s was already open, the file header will not be written." msgstr "Το αρχείο %s ήταν ήδη ανοιχτό, η κεφαλίδα του αρχείου δε θα γραφεί." -#: Source/Core/Core/Src/Boot/Boot.cpp:281 +#: Source/Core/Core/Src/Boot/Boot.cpp:313 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Το αρχείο που επιλέξατε (%s) δεν υπάρχει" @@ -5584,8 +5728,17 @@ msgstr "Το όνομα δεν μπορεί να περιέχει τον χαρ #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:141 msgid "The resulting decrypted AR code doesn't contain any lines." +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" +"\n" +"If unsure, use the second-fastest value from the right." msgstr "" -"Το αποτέλεσμα αποκρυπτογράφησης του κωδικού AR δεν περιέχει καθόλου γραμμές." +"Όσο πιο ασφαλής είναι αυτή η ρύθμιση, τόσο λιγότερο πιθανό ο εξομοιωτής να χάσει ανανεώσεις των υφών από την RAM.\n" +"\n" +"Αν δεν είστε σίγουροι, χρησιμοποιήστε την δεύτερη γρηγορότερη τιμή από δεξιά." <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 @@ -5607,16 +5760,11 @@ 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:363 -msgid "" -"The selected language is not supported by your system. Falling back to " -"system default." -msgstr "" -"Η επιλεγμένη γλώσσα δεν υποστηρίζεται από το σύστημά σας. Επαναφορά στην " -"προεπιλογή συστήματος." +#: Source/Core/DolphinWX/Src/Main.cpp:353 +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!" @@ -5652,12 +5800,8 @@ 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 "" @@ -5665,40 +5809,25 @@ 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:116 +#: 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" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." @@ -5710,14 +5839,11 @@ 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." @@ -5725,20 +5851,16 @@ 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 @@ -5763,6 +5885,7 @@ msgstr "Εώς" msgid "Toggle All Log Types" msgstr "Εναλλαγή Όλων Τύπων Καταγραφής " +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 <<<<<<< HEAD <<<<<<< HEAD @@ -5779,13 +5902,19 @@ msgstr "Εναλλαγή Πλήρους Οθόνης" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update translation files for recent changes in the code. ======= +======= +>>>>>>> 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 msgid "Toggle Fullscreen" msgstr "Εναλλαγή Πλήρους Οθόνης" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 +<<<<<<< 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 msgid "Top" msgstr "Κορυφή" @@ -5793,7 +5922,7 @@ msgstr "Κορυφή" msgid "Traditional Chinese" msgstr "Κινέζικα Παραδοσιακά " -#: Source/Core/Core/Src/Boot/Boot.cpp:375 +#: Source/Core/Core/Src/Boot/Boot.cpp:407 msgid "Tried to load an unknown file type." msgstr "Προσπάθεια φόρτωσης ενός άγνωστου τύπου αρχείο." @@ -5801,7 +5930,8 @@ 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" @@ -5829,8 +5959,8 @@ msgstr "Τύπος" msgid "UDP Port:" msgstr "Πόρτα UDP:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5853,13 +5983,10 @@ 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 @@ -5906,13 +6033,17 @@ msgstr "" "Άγνωστος δείκτης %#08x\n" "Συνέχεια;" +<<<<<<< HEAD <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 ======= >>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 +#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" msgstr "Πάνω" @@ -5929,7 +6060,7 @@ msgstr "Κάθετη Θέση Wiimote" msgid "Use EuRGB60 Mode (PAL60)" msgstr "Χρήση Λειτουργίας EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 msgid "Use Fullscreen" msgstr "Χρήση Πλήρους Οθόνης" @@ -5941,7 +6072,7 @@ msgstr "Χρήση Hex" msgid "Use Panic Handlers" msgstr "Χρήση Οθονών Πανικού" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5949,31 +6080,27 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Χρησιμοποίηση πολλαπλών νημάτων για την αποκωδικοποίηση υφών.\n" -"Μπορεί να βελτιώσει την ταχύτητα (ειδικά σε CPUs με περισσότερους από δύο " -"πυρήνες).\n" +"Μπορεί να βελτιώσει την ταχύτητα (ειδικά σε CPUs με περισσότερους από δύο πυρήνες).\n" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: 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" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Utility" msgstr "Εργαλεία" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:288 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:292 msgid "V-Sync" msgstr "Κάθετος Συγχρονισμός" @@ -5997,8 +6124,7 @@ msgstr "Αναλυτικότητα" msgid "Video" msgstr "Βίντεο" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:433 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:451 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 msgid "Virtual" msgstr "Εικονικό" @@ -6020,27 +6146,26 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Αναμονή για την κάθετη ανανέωση της οθόνης ώστε να μειωθεί το σπάσιμο της " -"εικόνας.\n" +"Αναμονή για την κάθετη ανανέωση της οθόνης ώστε να μειωθεί το σπάσιμο της εικόνας.\n" "Μειώνει τις επιδόσεις αν η ταχύτητα εξομοίωσης είναι μικρότερη από 100%.\n" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 #: Source/Core/Common/Src/MsgHandler.cpp:67 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Προειδοποίηση" -#: Source/Core/Core/Src/Boot/Boot.cpp:240 +#: Source/Core/Core/Src/Boot/Boot.cpp:272 msgid "Warning - starting DOL in wrong console mode!" msgstr "Προειδοποίηση - εκκίνηση DOL σε λάθος λειτουργία κονσόλας!" -#: Source/Core/Core/Src/Boot/Boot.cpp:290 +#: Source/Core/Core/Src/Boot/Boot.cpp:322 msgid "Warning - starting ELF in wrong console mode!" msgstr "Προειδοποίηση - εκκίνηση ELF σε λάθος λειτουργία κονσόλας!" -#: Source/Core/Core/Src/Boot/Boot.cpp:185 +#: Source/Core/Core/Src/Boot/Boot.cpp:217 msgid "Warning - starting ISO in wrong console mode!" msgstr "Προειδοποίηση - εκκίνηση ISO σε λάθος λειτουργία κονσόλας!" @@ -6051,8 +6176,7 @@ msgid "" "%s\n" "Do you wish to continue?" msgstr "" -"Προειδοποίηση! Συστήνεται η δημιουργία αντιγράφου ασφαλείας όλων των αρχείων " -"στον φάκελο:\n" +"Προειδοποίηση! Συστήνεται η δημιουργία αντιγράφου ασφαλείας όλων των αρχείων στον φάκελο:\n" "%s\n" "Θέλετε να συνεχίσετε;" @@ -6064,8 +6188,7 @@ msgid "" "and have the same name as a file on your memcard\n" "Continue?" msgstr "" -"Προειδοποίηση: Αυτό θα αντικαταστήσει όλα τα υπάρχοντα σημεία αποθήκευσης " -"που υπάρχουν στον φάκελο:\n" +"Προειδοποίηση: Αυτό θα αντικαταστήσει όλα τα υπάρχοντα σημεία αποθήκευσης που υπάρχουν στον φάκελο:\n" "%s\n" "και έχουν το ίδιο όνομα με αρχεία στη memcard\n" "Συνέχεια;" @@ -6114,7 +6237,7 @@ msgstr "WaveFileWriter - το αρχείο δεν είναι ανοιχτό." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Widescreen Hack" msgstr "Hack Ευρείας Οθόνης" @@ -6138,6 +6261,7 @@ msgstr "Wii NAND Ρίζα:" msgid "Wii Save Import" msgstr "Εισαγωγή Αποθήκευσης Wii" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -6147,6 +6271,9 @@ msgstr "Εισαγωγή Αποθήκευσης Wii" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Wii save files (*.bin)|*.bin" msgstr "Αρχεία αποθήκευσης Wii (*.bin)|*.bin" @@ -6154,8 +6281,8 @@ msgstr "Αρχεία αποθήκευσης Wii (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Αδυναμία ανάγνωσης από αρχείο" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 #: Source/Core/Core/Src/HW/Wiimote.cpp:16 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Wiimote" msgstr "Wiimote" @@ -6177,6 +6304,7 @@ msgstr "" "ή πιθανόν να οφείλεται σε χρόνο αδράνειας ή κάποιον άλλο λόγο.\n" "Θέλετε να γίνει άμεση επανασύνδεση;" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/Main.cpp:598 @@ -6186,6 +6314,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/Main.cpp:609 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/Main.cpp:599 +>>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Wiimote Connected" msgstr "Συνδεδεμένο Wiimote" @@ -6217,6 +6348,7 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "Αναδίπλωση Λέξεων" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -6227,6 +6359,9 @@ msgstr "Αναδίπλωση Λέξεων" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1362 >>>>>>> Update Greek and Czech translations +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 >>>>>>> Update translation files for recent changes in the code. @@ -6294,8 +6429,7 @@ 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 "" @@ -6334,7 +6468,7 @@ msgstr "Άγνωστος Zero code: %08x" msgid "[ waiting ]" msgstr "[ σε αναμονή ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -6350,26 +6484,21 @@ msgstr "" msgid "[Custom]" msgstr "[Προσαρμοζόμενο]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: 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" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -6412,9 +6541,7 @@ 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" @@ -6441,6 +6568,7 @@ msgstr "zNear Διόρθωση: " msgid "| OR" msgstr "| OR" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #~ msgid "Cannot record movies in read-only mode." @@ -6538,3 +6666,5 @@ msgstr "| OR" #~ "Αν δεν είστε σίγουροι, χρησιμοποιήστε την δεύτερη γρηγορότερη τιμή από " #~ "δεξιά." >>>>>>> Update Greek and Czech translations +======= +>>>>>>> The actual update of the Greek and Czech translations. The last commit From 6fef0b9a8ff56dec390307a243eb549a9411d667 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Sat, 15 Oct 2011 17:01:51 -0500 Subject: [PATCH 04/14] Updated Spanish translation --- Languages/po/es.po | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/Languages/po/es.po b/Languages/po/es.po index 10b8c05209..b16d557823 100644 --- a/Languages/po/es.po +++ b/Languages/po/es.po @@ -12,8 +12,12 @@ msgstr "" "PO-Revision-Date: 2011-12-09 00:28+0100\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" +<<<<<<< HEAD "PO-Revision-Date: 2011-08-11 15:30+0100\n" >>>>>>> Update translation files for recent changes in the code. +======= +"PO-Revision-Date: 2011-10-15 23:23+0100\n" +>>>>>>> Updated Spanish translation "Last-Translator: Petiso Carambanal \n" "Language-Team: DARIO_FF \n" "Language: Spanish\n" @@ -437,9 +441,12 @@ msgstr "Emulación de VBeam Precisa" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 <<<<<<< HEAD +<<<<<<< HEAD ======= #, fuzzy >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Updated Spanish translation msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -681,6 +688,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 <<<<<<< HEAD +<<<<<<< HEAD msgid "Alternate Wiimote Timing" msgstr "Sincronización alternativa del Wiimote" ======= @@ -688,6 +696,10 @@ msgstr "Sincronización alternativa del Wiimote" msgid "Alternate Wiimote Timing" msgstr "Wiimote emulado" >>>>>>> Update translation files for recent changes in the code. +======= +msgid "Alternate Wiimote Timing" +msgstr "Sincronización alternativa del Wiimote" +>>>>>>> Updated Spanish translation #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -2867,9 +2879,12 @@ msgstr "Mayor que" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 <<<<<<< HEAD +<<<<<<< HEAD ======= #, fuzzy >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Updated Spanish translation msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2887,9 +2902,14 @@ msgstr "" ======= "Aumenta bastante la calidad de las texturas generadas utilizando los efectos " "de renderización para la textura.\n" +<<<<<<< HEAD "Aumentar la resolución interna va a mejorar el efecto de esta definición.\n" "Diminuye ligeramente el desempenño y probablemente provoca fallos (aunque es " >>>>>>> Update translation files for recent changes in the code. +======= +"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 "improbable).\n" "\n" "Si está inseguro, déjelo marcado." From 510450999d74218ad8052387888ca7c39d3957d0 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Mon, 17 Oct 2011 16:36:56 -0500 Subject: [PATCH 05/14] Update Arabic and Japanese translations. --- Languages/po/ar.po | 89 ++++++++++++++++++++++++++++++++++++++++++++-- Languages/po/ja.po | 19 ++++++++-- 2 files changed, 104 insertions(+), 4 deletions(-) diff --git a/Languages/po/ar.po b/Languages/po/ar.po index 322a2c504f..59bf9c9782 100644 --- a/Languages/po/ar.po +++ b/Languages/po/ar.po @@ -13,9 +13,14 @@ msgstr "" "Last-Translator: mansoor\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" +<<<<<<< HEAD "PO-Revision-Date: 2011-07-20 13:33+0300\n" "Last-Translator: \n" >>>>>>> Update translation files for recent changes in the code. +======= +"PO-Revision-Date: 2011-10-16 11:25-0500\n" +"Last-Translator: mansoor\n" +>>>>>>> Update Arabic and Japanese translations. "Language-Team: \n" "Language: \n" "MIME-Version: 1.0\n" @@ -425,9 +430,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 <<<<<<< HEAD +<<<<<<< HEAD ======= #, fuzzy >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Arabic and Japanese translations. msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -637,6 +645,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 <<<<<<< HEAD +<<<<<<< HEAD msgid "Alternate Wiimote Timing" msgstr "بديل ويموت" ======= @@ -644,6 +653,10 @@ msgstr "بديل ويموت" msgid "Alternate Wiimote Timing" msgstr "محاكاة ويموت" >>>>>>> Update translation files for recent changes in the code. +======= +msgid "Alternate Wiimote Timing" +msgstr "بديل ويموت" +>>>>>>> Update Arabic and Japanese translations. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -947,11 +960,22 @@ msgstr "إلغاء" msgid "Cannot open %s" msgstr "لا يمكن فتح %s" +<<<<<<< HEAD +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:721 +msgid "Cannot record movies in read-only mode." +msgstr "لا يمكن تسجيل الأفلام في وضع للقراءة فقط." + +>>>>>>> Update Arabic and Japanese translations. #: Source/Core/Core/Src/CoreTiming.cpp:122 msgid "Cannot unregister events with events pending" msgstr "لا يمكن إلغاء تسجيل الأحداث مع الأحداث المعلقة" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1016 +>>>>>>> Update Arabic and Japanese translations. #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -2752,9 +2776,12 @@ msgstr "أكبر من" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 <<<<<<< HEAD +<<<<<<< HEAD ======= #, fuzzy >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Arabic and Japanese translations. msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -4373,11 +4400,15 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Scaled EFB Copy" <<<<<<< HEAD +<<<<<<< HEAD msgstr "EFB Copia a escala" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= msgstr "" +======= +msgstr "EFB Copia a escala" +>>>>>>> Update Arabic and Japanese translations. #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 >>>>>>> Update translation files for recent changes in the code. @@ -5042,6 +5073,7 @@ msgstr "اختبار" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 <<<<<<< HEAD +<<<<<<< HEAD msgid "Texture" msgstr "" @@ -5050,14 +5082,19 @@ msgid "Texture Cache" msgstr "" ======= #, fuzzy +======= +>>>>>>> Update Arabic and Japanese translations. msgid "Texture" -msgstr "Texturesتعطيل " +msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 -#, fuzzy msgid "Texture Cache" +<<<<<<< HEAD msgstr "إزالة التخزين المؤقت" >>>>>>> Update translation files for recent changes in the code. +======= +msgstr "" +>>>>>>> Update Arabic and Japanese translations. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Texture Format Overlay" @@ -5556,6 +5593,7 @@ msgstr "" "%s\n" "ولها نفس اسم الملف على بطاقة ذاكرة الخاصة بك\n" "تستمر?" +<<<<<<< HEAD #: Source/Core/Core/Src/Movie.cpp:629 #, c-format @@ -5591,6 +5629,8 @@ 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 "" +======= +>>>>>>> Update Arabic and Japanese translations. #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 @@ -5936,12 +5976,18 @@ msgstr "أو" #~ msgstr "< الوضع الافتراضي >" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update Arabic and Japanese translations. #, fuzzy #~ msgid "AOSound" #~ msgstr "&الصوت" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Arabic and Japanese translations. #~ msgid "Accurate Texture Cache" #~ msgstr "دقة المظهر السطحي المؤقت" @@ -5980,6 +6026,9 @@ msgstr "أو" #~ "ومن الأفضل ل تعيين نسبة العرض إلى الارتفاع لتمتد عند استخدامه." <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update Arabic and Japanese translations. #~ msgid "Bad gameini filename" #~ msgstr "Nombre de archivo gameini incorrecto" @@ -6007,15 +6056,21 @@ msgstr "أو" #~ msgid "Can't open %s, it has a missing function" #~ msgstr "No se puede abrir %s, no tiene una función" +<<<<<<< HEAD #~ msgid "Cannot record movies in read-only mode." #~ msgstr "لا يمكن تسجيل الأفلام في وضع للقراءة فقط." +======= +>>>>>>> Update Arabic and Japanese translations. #, fuzzy #~ msgid "Config..." #~ msgstr "إعدادات" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Arabic and Japanese translations. #~ msgid "Configuration profile" #~ msgstr "التكوين الشخصي" @@ -6117,6 +6172,9 @@ msgstr "أو" #~ msgstr "CPU Access تمكين" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update Arabic and Japanese translations. #~ msgid "Enable Copy to EFB" #~ msgstr "Habilitar Copiado al EFB" @@ -6132,8 +6190,11 @@ msgstr "أو" #~ msgid "Enable JIT Dynarec" #~ msgstr "تمكين صفحات" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Arabic and Japanese translations. #~ msgid "Enable OpenCL" #~ msgstr "OpenCL تمكين " @@ -6141,6 +6202,9 @@ msgstr "أو" #~ msgstr "تمكين شاشة التوقف" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update Arabic and Japanese translations. #, fuzzy #~ msgid "" #~ "Enables dynamic recompilation of DSP code.\n" @@ -6214,8 +6278,11 @@ msgstr "أو" #~ msgid "Force Bi/Trilinear Filtering" #~ msgstr "Forzar Filtro Bi/Tri-linear" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Arabic and Japanese translations. #~ msgid "Fractional" #~ msgstr "جزئي" @@ -6359,6 +6426,9 @@ msgstr "أو" #~ msgstr "اللازمة لاستعمال الخط القرص اليابانية." <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update Arabic and Japanese translations. #, fuzzy #~ msgid "Run" #~ msgstr "Enter" @@ -6366,8 +6436,11 @@ msgstr "أو" #~ msgid "Running script...\n" #~ msgstr "Ejecutando script...\n" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Arabic and Japanese translations. #~ msgid "Scale:" #~ msgstr "النطاق :" @@ -6426,6 +6499,9 @@ msgstr "أو" #~ "وهذا مفيد فقط لأغراض التصحيح." <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update Arabic and Japanese translations. #~ msgid "Skies of Arcadia" #~ msgstr "Skies of Arcadia" @@ -6465,8 +6541,11 @@ msgstr "أو" #~ msgid "Specify an audio plugin" #~ msgstr "حدد الخلفية ملف فيديو" +<<<<<<< HEAD ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Arabic and Japanese translations. #~ msgid "Start Renderer in Fullscreen" #~ msgstr "بدء في كمال ملء الشاشة" @@ -6474,6 +6553,9 @@ msgstr "أو" #~ msgstr "بدء التقديم في إطار وضع ملء الشاشة." <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update Arabic and Japanese translations. #~ msgid "The file " #~ msgstr "El archivo " @@ -6487,6 +6569,7 @@ msgstr "أو" #~ msgid "Type %d config not supported in plugin %s" #~ msgstr "Configuración de tipo %d no soportado en el plugin %s" +<<<<<<< HEAD #~ msgid "" #~ "Unknown pointer %#08x\n" #~ "Continue?" @@ -6496,6 +6579,8 @@ msgstr "أو" ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Arabic and Japanese translations. #~ msgid "Use FPS For Limiting" #~ msgstr "لحد عدد الاطارات" diff --git a/Languages/po/ja.po b/Languages/po/ja.po index dc9751b1b1..1392815cb3 100644 --- a/Languages/po/ja.po +++ b/Languages/po/ja.po @@ -12,8 +12,12 @@ msgstr "" "PO-Revision-Date: 2011-10-12 20:45+0900\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" +<<<<<<< HEAD "PO-Revision-Date: 2011-08-19 08:37-0500\n" >>>>>>> Update translation files for recent changes in the code. +======= +"PO-Revision-Date: 2011-10-12 20:45+0900\n" +>>>>>>> Update Arabic and Japanese translations. "Last-Translator: DanbSky\n" "Language-Team: \n" "Language: Japanese\n" @@ -432,9 +436,12 @@ msgstr "Accurate VBeam emulation" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 <<<<<<< HEAD +<<<<<<< HEAD ======= #, fuzzy >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Arabic and Japanese translations. msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -669,6 +676,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 <<<<<<< HEAD +<<<<<<< HEAD msgid "Alternate Wiimote Timing" msgstr "Wii リモコンの同期調整" ======= @@ -676,6 +684,10 @@ msgstr "Wii リモコンの同期調整" msgid "Alternate Wiimote Timing" msgstr "Wii リモコンをエミュレート" >>>>>>> Update translation files for recent changes in the code. +======= +msgid "Alternate Wiimote Timing" +msgstr "Wii リモコンの同期調整" +>>>>>>> Update Arabic and Japanese translations. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -2834,9 +2846,12 @@ msgstr "より大きい" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 <<<<<<< HEAD +<<<<<<< HEAD ======= #, fuzzy >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Arabic and Japanese translations. msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -5520,8 +5535,8 @@ msgid "" "Unknown pointer %#08x\n" "Continue?" msgstr "" -"不明なポインタ %#08x\n" -"続けますか？" +"Unknown pointer %#08x\n" +"Continue?" >>>>>>> Update translation files for recent changes in the code. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 From 3e8ca14e967578e15105f712a5bad1cb77b0adc2 Mon Sep 17 00:00:00 2001 From: Pascal Jouy Date: Fri, 28 Oct 2011 23:42:40 +0200 Subject: [PATCH 06/14] Update french translation. --- Languages/po/fr.po | 669 +++++++++++++++++---------------------------- 1 file changed, 247 insertions(+), 422 deletions(-) diff --git a/Languages/po/fr.po b/Languages/po/fr.po index 56cb368da8..891787bfb0 100644 --- a/Languages/po/fr.po +++ b/Languages/po/fr.po @@ -12,8 +12,12 @@ msgstr "" "PO-Revision-Date: 2011-10-28 23:40+0100\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" +<<<<<<< HEAD "PO-Revision-Date: 2011-08-10 17:42+0100\n" >>>>>>> Update translation files for recent changes in the code. +======= +"PO-Revision-Date: 2011-10-28 23:40+0100\n" +>>>>>>> Update french translation. "Last-Translator: Pascal\n" "Language-Team: \n" "Language: French\n" @@ -47,8 +51,7 @@ 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\" n'est pas un fichier GCM/ISO valide, ou n'est pas une ISO GC/Wii." +msgstr "\"%s\" n'est pas un fichier GCM/ISO valide, ou n'est pas une ISO GC/Wii." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:193 #, c-format @@ -103,8 +106,7 @@ msgid "" "file is not large enough to be a valid memory card file (0x%x bytes)" msgstr "" "%s n'a pas pu être chargé en tant que carte mémoire.\n" -"Le fichier n'est pas assez grand pour être un fichier de carte mémoire " -"valide (0x%x octets)" +"Le fichier n'est pas assez grand pour être un fichier de carte mémoire valide (0x%x octets)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 #, c-format @@ -376,13 +378,11 @@ 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" @@ -396,13 +396,10 @@ msgstr "" " - Dual Core désactivé\n" " - Audio Throttle désactivé\n" " - DSP-HLE avec \"Null Audio\" ou le DSL-LLE\n" -" - Spécifier manuellement le nombre de contôleurs qui seront utilisés dans " -"[Contrôleur standard]\n" +" - Spécifier manuellement le nombre de contôleurs qui seront utilisés dans [Contrôleur standard]\n" "\n" -"Tous les joueurs devraient essayer d'utiliser la même version de Dolphin et " -"les mêmes paramètres.\n" -"Désactiver toutes les cartes mémoires, ou sinon les envoyer à tous les " -"joueurs avant de démarrer.\n" +"Tous les joueurs devraient essayer d'utiliser la même version de Dolphin et les mêmes paramètres.\n" +"Désactiver toutes les cartes mémoires, ou sinon les envoyer à tous les joueurs avant de démarrer.\n" "La prise en charge de la Wiimote n'est pas encore implémentée.\n" "\n" "Vous devez indiquer le port TCP à l'hôte !!" @@ -435,19 +432,20 @@ msgstr "Emulation fidèle VBeam" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 <<<<<<< HEAD +<<<<<<< HEAD ======= #, fuzzy >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update french translation. 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 "" "Emule fidèlement les copies d'EFB.\n" -"Certains jeux requièrent ceci pour certains effets graphiques ou " -"fonctionnalités dans le jeu.\n" +"Certains jeux requièrent ceci pour certains effets graphiques ou fonctionnalités dans le jeu.\n" "\n" "Dans le doute, cochez plutôt EFB vers texture." @@ -473,51 +471,33 @@ msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:669 #, c-format -msgid "" -"Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" -msgstr "" -"Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans le " -"code Ajout (%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" +msgstr "Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans le code Ajout (%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 "" -"Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans le " -"code Remplir et déplacer (%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide (%s)" +msgstr "Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans le code Remplir et déplacer (%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 "" -"Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans " -"l'écriture de la RAM et Remplir (%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And Fill (%s)" +msgstr "Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans l'écriture de la RAM et Remplir (%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 "" -"Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans Ecrire " -"vers Pointeur (%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Write To Pointer (%s)" +msgstr "Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans Ecrire vers Pointeur (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:803 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" -msgstr "" -"Erreur Action Replay : Valeur non valide (%08x) dans la Copie de mémoire (%s)" +msgstr "Erreur Action Replay : Valeur non valide (%08x) dans la Copie de mémoire (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:684 #, c-format -msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" -msgstr "" -"Erreur Action Replay : Master Code et Write To CCXXXXXX non implémentés (%s)" +msgid "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +msgstr "Erreur Action Replay : Master Code et Write To CCXXXXXX non implémentés (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:196 #, c-format @@ -585,16 +565,14 @@ msgstr "Adresse :" 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." msgstr "" "Ajoute la valeur spécifiée au paramètre zFar.\n" "Il y a 2 façons d'indiquer les valeurs en virgule flottante.\n" -"Exemple : entrer \"'200\" ou \"0.0002\" directement produit le même effet, " -"la valeur retenue sera \"0.0002\".\n" +"Exemple : entrer \"'200\" ou \"0.0002\" directement produit le même effet, la valeur retenue sera \"0.0002\".\n" "Valeurs : (0->+/- Integer) ou (0->+/-FP[précision à 6 chiffres])\n" "\n" "NOTE: Consultez LogWindow/Console pour les valeurs acquises." @@ -603,24 +581,21 @@ 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." msgstr "" "Ajoute la valeur spécifiée au paramètre zNear.\n" "Il y a 2 façons d'indiquer les valeurs en virgule flottante.\n" -"Exemple : entrer \"'200\" ou \"0.0002\" directement produit le même effet, " -"la valeur retenue sera \"0.0002\".\n" +"Exemple : entrer \"'200\" ou \"0.0002\" directement produit le même effet, la valeur retenue sera \"0.0002\".\n" "Valeurs : (0->+/- Integer) ou (0->+/-FP[précision à 6 chiffres])\n" "\n" "NOTE: Consultez LogWindow/Console pour les valeurs acquises." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 msgid "Adjust the analog control pressure required to activate buttons." -msgstr "" -"Ajuste le contrôle analogique de pression requise pour activer les boutons." +msgstr "Ajuste le contrôle analogique de pression requise pour activer les boutons." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Advanced" @@ -666,18 +641,17 @@ msgstr "Tous les fichiers (*.*)|*.*" #: 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 "" -"Permet d'activer certaines options via les raccourcis clavier 3, 4, 5, 6 et " -"7 dans la fenêtre d'émulation.\n" +"Permet d'activer certaines options via les raccourcis clavier 3, 4, 5, 6 et 7 dans la fenêtre d'émulation.\n" "\n" "Dans le doute, décochez cette case." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 <<<<<<< HEAD +<<<<<<< HEAD msgid "Alternate Wiimote Timing" msgstr "Délai alternatif de communication avec la Wiimote" ======= @@ -685,6 +659,10 @@ msgstr "Délai alternatif de communication avec la Wiimote" msgid "Alternate Wiimote Timing" msgstr "Wiimote émulée" >>>>>>> Update translation files for recent changes in the code. +======= +msgid "Alternate Wiimote Timing" +msgstr "Délai alternatif de communication avec la Wiimote" +>>>>>>> Update french translation. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -716,8 +694,7 @@ msgid "" "\n" "If unsure, select (off)." msgstr "" -"Appliquer un effet de post-processing après avoir fini le rendu d'une " -"image.\n" +"Appliquer un effet de post-processing après avoir fini le rendu d'une image.\n" "\n" "Dans le doute, sélectionnez (aucun)." @@ -740,9 +717,7 @@ msgstr "" #: 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 !" +msgstr "Êtes-vous sûr de vouloir supprimer ce fichier ? Il sera supprimé définitivement !" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -807,10 +782,8 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"Génère automatiquement des mipmaps plutôt que de les décoder depuis la " -"mémoire.\n" -"Améliore un peu les performances mais peut provoquer des défauts mineurs de " -"texture.\n" +"Génère automatiquement des mipmaps plutôt que de les décoder depuis la mémoire.\n" +"Améliore un peu les performances mais peut provoquer des défauts mineurs de texture.\n" "\n" "Dans le doute, cochez cette case." @@ -871,9 +844,7 @@ msgstr "Basse" #: Source/Core/Core/Src/HW/GCMemcard.cpp:188 msgid "Block Allocation Table checksum failed" -msgstr "" -"Echec de la vérification de la somme de contrôle de la Table d'Allocation de " -"Blocs" +msgstr "Echec de la vérification de la somme de contrôle de la Table d'Allocation de Blocs" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Blocks" @@ -958,17 +929,12 @@ msgstr "Cache des listes d'affichage" #: 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 "" -"Calcule la profondeur par pixel des valeurs des graphiques 3D plutôt que par " -"vertex.\n" -"Contrairement à l'éclairage par pixel (qui est une bonne amélioration), les " -"calculs de profondeur par pixel sont nécessaires pour émuler correctement un " -"petit nombre de jeux.\n" +"Calcule la profondeur par pixel des valeurs des graphiques 3D plutôt que par vertex.\n" +"Contrairement à l'éclairage par pixel (qui est une bonne amélioration), les calculs de profondeur par pixel sont nécessaires pour émuler correctement un petit nombre de jeux.\n" "\n" "Dans le doute, cochez cette case." @@ -981,10 +947,8 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Calcule la lumière des graphiques 3D par pixel et non par vertex.\n" -"Diminue la vitesse d'émulation de quelques pourcents (en fonction de votre " -"GPU).\n" -"Cette amélioration est plutôt sûre, mais peut parfois provoquer quelques " -"pépins.\n" +"Diminue la vitesse d'émulation de quelques pourcents (en fonction de votre GPU).\n" +"Cette amélioration est plutôt sûre, mais peut parfois provoquer quelques pépins.\n" "\n" "Dans le doute, décochez cette case." @@ -1002,8 +966,7 @@ msgstr "Impossible d'ouvrir %s" #: 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." +msgstr "Impossible de désenregistrer des évènements alors qu'il y en a en attente." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 #, c-format @@ -1027,8 +990,7 @@ msgstr "" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1858 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" -msgstr "" -"Impossible de trouver la Wiimote par bd : %02x:%02x:%02x:%02x:%02x:%02x" +msgstr "Impossible de trouver la Wiimote par bd : %02x:%02x:%02x:%02x:%02x:%02x" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1872 #, c-format @@ -1040,8 +1002,7 @@ msgstr "Impossible de trouver la Wiimote par le gestionnaire de connexion %02x" #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" -msgstr "" -"Impossible de lire à partir de DVD_Plugin - DVD-Interface : Erreur fatale" +msgstr "Impossible de lire à partir de DVD_Plugin - DVD-Interface : Erreur fatale" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:49 msgid "Caps Lock" @@ -1145,6 +1106,7 @@ msgstr "Choisir une carte mémoire :" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " @@ -1152,6 +1114,10 @@ msgid "" msgstr "" "Choisir un fichier comme apploader : (uniquement pour les disques créés à " "partir de dossiers)" +======= +msgid "Choose file to use as apploader: (applies to discs constructed from directories only)" +msgstr "Choisir un fichier comme apploader : (uniquement pour les disques créés à partir de dossiers)" +>>>>>>> Update french translation. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 @@ -1178,12 +1144,8 @@ msgid "Clear failed." msgstr "Echec de l'éffacement" #: Source/Core/Core/Src/NetPlayServer.cpp:259 -msgid "" -"Client disconnect while game is running!! NetPlay is disabled. You must " -"manually stop the game." -msgstr "" -"Le client s'est déconnecté alors que le jeu est en cours !! NetPlay est " -"désactivé. Vous devez arrêter le jeu manuellement." +msgid "Client disconnect while game is running!! NetPlay is disabled. You must manually stop the game." +msgstr "Le client s'est déconnecté alors que le jeu est en cours !! NetPlay est désactivé. Vous devez arrêter le jeu manuellement." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 @@ -1345,15 +1307,8 @@ msgstr "Impossible d'initialiser le moteur %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." -msgstr "" -"Impossible de lire \"%s\". Il n'y a pas de disque dans le lecteur, ou ce " -"n'est pas un backup GC/Wii. Veuillez noter que les disques originaux de " -"GameCube et Wii ne peuvent pas être plus par la plupart des lecteurs DVD sur " -"PC." +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 "Impossible de lire \"%s\". Il n'y a pas de disque dans le lecteur, ou ce n'est pas un backup GC/Wii. Veuillez noter que les disques originaux de GameCube et Wii ne peuvent pas être plus par la plupart des lecteurs DVD sur PC." #: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format @@ -1370,23 +1325,19 @@ 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 "" -"Impossible de définir les manettes. Le joueur a quitté le jeu ou le jeu est " -"en cours d'exécution !\n" -"(le paramétrage des manettes pendant l'émulation du jeu n'est pas encore " -"pris en charge)" +"Impossible de définir les manettes. Le joueur a quitté le jeu ou le jeu est en cours d'exécution !\n" +"(le paramétrage des manettes pendant l'émulation du jeu n'est pas encore pris en charge)" #: 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 "" "Impossible d'écrire le fichier de carte mémoire %s.\n" "\n" -"Exécutez-vous Dolpin à partir d'un CD/DVD, ou le fichier de sauvegarde est " -"peut-être protégé contré l'écriture ?" +"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:1059 msgid "Couldn't find open command for extension 'ini'!" @@ -1427,11 +1378,16 @@ msgstr "Créé par KDE-Look.org" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Créé par Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +======= +msgid "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +msgstr "Créé par Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +>>>>>>> Update french translation. #: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Created by VistaIcons.com" @@ -1611,12 +1567,8 @@ msgstr "Détecter" #: 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 "" -"Détecté que le DVD a essayé de lire plus de données que ce que peut contenir " -"le buffer de sortie." +msgid "Detected attempt to read more data from the DVD than fit inside the out buffer. Clamp." +msgstr "Détecté que le DVD a essayé de lire plus de données que ce que peut contenir le buffer de sortie." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 @@ -1672,30 +1624,24 @@ msgstr "Désactiver les textures" #: 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 "" "Désactive l'émulation des XFB.\n" -"Accélère beaucoup l'émulation mais provoque de gros pépins dans les nombreux " -"jeux s'appuyant dessus (particulièrement les applications homebrew).\n" +"Accélère beaucoup l'émulation mais provoque de gros pépins dans les nombreux jeux s'appuyant dessus (particulièrement les applications homebrew).\n" "\n" "Dans le doute, cochez cette case." #: 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 "" "Désactive l'émulation de copies d'EFB.\n" -"Elles sont souvent utilisées pour du post-processing ou des effets de rendu " -"sur texture, donc cocher cette case va beaucoup accélérer l'émulation mais " -"aussi provoquer des pépins.\n" +"Elles sont souvent utilisées pour du post-processing ou des effets de rendu sur texture, donc cocher cette case va beaucoup accélérer l'émulation mais aussi provoquer des pépins.\n" "\n" "Dans le doute, décochez cette case." @@ -1799,6 +1745,7 @@ msgstr "Dolphin dans &Google Code" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " @@ -1806,11 +1753,16 @@ msgid "" msgstr "" "Dolphin n'a pas trouvé d'ISO GC/Wii. Double-cliquez ici pour chercher des " "fichiers..." +======= +msgid "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for files..." +msgstr "Dolphin n'a pas trouvé d'ISO GC/Wii. Double-cliquez ici pour chercher des fichiers..." +>>>>>>> Update french translation. <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " @@ -1818,6 +1770,10 @@ msgid "" msgstr "" "Dolphin est paramétré pour cacher tous les jeux. Double-cliquez ici pour " "afficher tous les jeux..." +======= +msgid "Dolphin is currently set to hide all games. Doubleclick here to show all games..." +msgstr "Dolphin est paramétré pour cacher tous les jeux. Double-cliquez ici pour afficher tous les jeux..." +>>>>>>> Update french translation. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 @@ -1863,8 +1819,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Copier toutes les images rendues (calculées) dans un fichier AVI dans User/" -"Dump/Frames/\n" +"Copier toutes les images rendues (calculées) dans un fichier AVI dans User/Dump/Frames/\n" "\n" "Dans le doute, décochez cette case." @@ -1910,16 +1865,8 @@ msgstr "Copies de l'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 "" -"ERREUR : cette version de Dolphin requiert un pilote TAP-Win32 qui ait au " -"moins la version %d.%d -- Si vous avez récemment mis à niveau votre " -"distribution de Dolphin, un redémarrage est probablement nécessaire pour que " -"Windows charge le nouveau pilote." +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 "ERREUR : cette version de Dolphin requiert un pilote TAP-Win32 qui ait au moins la version %d.%d -- Si vous avez récemment mis à niveau votre distribution de Dolphin, un redémarrage est probablement nécessaire pour que Windows charge le nouveau pilote." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 msgid "EUROPE" @@ -1969,31 +1916,24 @@ msgstr "Thread d'émulation déjà en cours d'exécution" #: 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 "" "Emule précisément les XFB.\n" -"Ralentit beaucoup l'émulation et empêche le rendu en haute résolution, mais " -"est nécessaire pour émuler certains jeux correctement.\n" +"Ralentit beaucoup l'émulation et empêche le rendu en haute résolution, mais est nécessaire pour émuler certains jeux correctement.\n" "\n" "Dans le doute, sélectionnez plutôt Virtuel." #: 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 "" "Emule les XFB en utilisant les objets de texture du GPU.\n" -"Corrige beaucoup de jeux qui ne fonctionnent pas sans émulation de XFB, sans " -"être aussi lent qu'une réelle émulation de l'XFB. Cependant, cela peut ne " -"pas fonctionner pour beaucoup d'autres jeux (particulièrement les " -"applications homebrew).\n" +"Corrige beaucoup de jeux qui ne fonctionnent pas sans émulation de XFB, sans être aussi lent qu'une réelle émulation de l'XFB. Cependant, cela peut ne pas fonctionner pour beaucoup d'autres jeux (particulièrement les applications homebrew).\n" "Dans le doute, sélectionnez cette case." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 @@ -2010,15 +1950,13 @@ msgstr "Activer" #: 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 "" -"Active les effets 3D via la stéréoscopie en utilisant la technologie nVidia " -"3D Vision, si elle est prise en charge par votre GPU.\n" +"Active les effets 3D via la stéréoscopie en utilisant la technologie nVidia 3D Vision, si elle est prise en charge par votre GPU.\n" "Peut provoquer des pépins.\n" "Ne fonctionne qu'en plein écran.\n" "\n" @@ -2113,19 +2051,14 @@ msgid "" "If unsure, select 1x." msgstr "" "Active le filtrage anisotropique.\n" -"Améliore la qualité visuelle des textures qui ont des angles de vue " -"obliques.\n" +"Améliore la qualité visuelle des textures qui ont des angles de vue obliques.\n" "Peut provoquer des soucis pour un petit nombre de jeux.\n" "\n" "Dans le doute, sélectionnez 1x." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 -msgid "" -"Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " -"Compatible)" -msgstr "" -"Activer l'accès disque rapide. Requis pour certains jeux. (MARCHE = Rapide, " -"ARRÊT = Compatible)" +msgid "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = Compatible)" +msgstr "Activer l'accès disque rapide. Requis pour certains jeux. (MARCHE = Rapide, ARRÊT = Compatible)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Enable pages" @@ -2138,21 +2071,18 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Sélectionnez ceci si vous souhaitez que le rendu se fasse sur l'intégralité " -"de l'écran.\n" +"Sélectionnez ceci si vous souhaitez que le rendu se fasse sur l'intégralité de l'écran.\n" "Si cette case est décochée, une fenêtre de rendu sera créée.\n" "\n" "Dans le doute, décochez cette case." #: 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 "" -"Cochez cette case si vous souhaitez que la fenêtre principale de Dolphin " -"soit utilisée pour le rendu, plutôt qu'une fenêtre séparée.\n" +"Cochez cette case si vous souhaitez que la fenêtre principale de Dolphin soit utilisée pour le rendu, plutôt qu'une fenêtre séparée.\n" "\n" "Dans le doute, décochez cette case." @@ -2160,6 +2090,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " @@ -2167,16 +2098,14 @@ msgid "" msgstr "" "Activer ceci pour accélérer La légende de Zelda : Twilight Princess. " "Désactiver pour TOUS les autres jeux." +======= +msgid "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for ANY other game." +msgstr "Activer ceci pour accélérer La légende de Zelda : Twilight Princess. Désactiver pour TOUS les autres jeux." +>>>>>>> Update french translation. #: 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 "" -"Activer la traduction de bloc d'adresse (BAT), une fonctionnalité de l'unité " -"de gesiton de mémoire. Fidèle au matériel de la console, mais lent à émuler. " -"(ON = Compatible, OFF = Rapide)" +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 "Activer la traduction de bloc d'adresse (BAT), une fonctionnalité de l'unité 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:337 msgid "Enables Custom Projection Hack" @@ -2195,12 +2124,8 @@ msgstr "" "Dans le doute, décochez cette case." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 -msgid "" -"Enables the Memory Management Unit, needed for some games. (ON = Compatible, " -"OFF = Fast)" -msgstr "" -"Activer le Memory Management Unit (unité de gestion de la mémoire), requis " -"pour certains jeux. (ON = Compatible, OFF = Vitesse)" +msgid "Enables the Memory Management Unit, needed for some games. (ON = Compatible, OFF = Fast)" +msgstr "Activer le Memory Management Unit (unité de gestion de la mémoire), requis pour certains jeux. (ON = Compatible, OFF = Vitesse)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" @@ -2273,9 +2198,7 @@ msgstr "Erreur" >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." -msgstr "" -"Erreur lors du chargement de la langue sélectionnée. Retour à la langue par " -"défaut du système." +msgstr "Erreur lors du chargement de la langue sélectionnée. Retour à la langue par défaut du système." #: Source/Core/Common/Src/ChunkFile.h:180 #, c-format @@ -2287,6 +2210,7 @@ msgstr "" #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format +<<<<<<< HEAD msgid "" ======= >>>>>>> Update translation files for recent changes in the code. @@ -2295,6 +2219,10 @@ msgid "" msgstr "" "Erreur : essai d'accès aux polices %s mais elles ne sont pas chargées. Les " "jeux peuvent ne pas afficher les polices correctement, ou planter." +======= +msgid "Error: Trying to access %s fonts but they are not loaded. Games may not show fonts correctly, or crash." +msgstr "Erreur : essai d'accès aux polices %s mais elles ne sont pas chargées. Les jeux peuvent ne pas afficher les polices correctement, ou planter." +>>>>>>> Update french translation. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:30 msgid "Escape" @@ -2307,8 +2235,7 @@ msgstr "Euphorie" #: Source/Core/Core/Src/MemTools.cpp:214 #, c-format msgid "Exception handler - access below memory space. %08llx%08llx" -msgstr "" -"Erreur d'exception : accès à un espace en-dessous de la mémoire. %08llx%08llx" +msgstr "Erreur d'exception : accès à un espace en-dessous de la mémoire. %08llx%08llx" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Execute" @@ -2463,8 +2390,7 @@ msgstr "" "Il n'est pas fourni avec Dolphin pour des raisons de copyright.\n" "Utilisez DSPSpy pour extraire le fichier de votre console.\n" "\n" -"Vous pouvez utiliser le moteur DSP HLE à la place, celui-ci ne requiert pas " -"d'extration de ROM.\n" +"Vous pouvez utiliser le moteur DSP HLE à la place, celui-ci ne requiert pas d'extration de ROM.\n" "(Sélectionnez-le depuis l'onglet \"Audio\" dans la fenêtre de configuration.)" #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:99 @@ -2486,8 +2412,7 @@ msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" msgstr "" -"Impossible de lire correctement la sauvegarde de la table d'allocation des " -"blocs\n" +"Impossible de lire correctement la sauvegarde de la table d'allocation des blocs\n" "(0x8000-0x9FFF)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:144 @@ -2657,8 +2582,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Force le filtrage de texture, même si le jeu l'a explicitement désactivé.\n" -"Améliore légèrement la qualité des textures, mais peut provoquer des pépins " -"dans certains jeux.\n" +"Améliore légèrement la qualité des textures, mais peut provoquer des pépins dans certains jeux.\n" "\n" "Dans le doute, décochez cette case." @@ -2669,8 +2593,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Force le jeu à sortir des graphiques pour les écrans larges (16/9è, " -"16/10è).\n" +"Force le jeu à sortir des graphiques pour les écrans larges (16/9è, 16/10è).\n" "Provoque des pépins graphiques dans certains jeux.\n" "\n" "Dans le doute, décochez cette case." @@ -2678,12 +2601,10 @@ 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 "" "Force le mode NTSC-J pour utiliser la police de la ROM japonaise.\n" -"Si cette case est décochée, Dolphin sera par défaut en NTSC-U et activera " -"automatiquement cette option lorsque des jeux japonais seront lancés." +"Si cette case est décochée, Dolphin sera par défaut en NTSC-U et activera automatiquement cette option lorsque des jeux japonais seront lancés." #: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" @@ -2866,8 +2787,7 @@ msgstr "Allemand" #: Source/Core/Core/Src/ActionReplay.cpp:451 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" -msgstr "" -"GetARCode : l'index est plus grand que la taille de la liste de codes %lu" +msgstr "GetARCode : l'index est plus grand que la taille de la liste de codes %lu" #: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Graphics" @@ -2883,18 +2803,20 @@ msgstr "Plus grand que" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 <<<<<<< HEAD +<<<<<<< HEAD ======= #, fuzzy >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update french translation. 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 "" +<<<<<<< HEAD "Améliore significativement la qualité des textures générées en utilisant les " "effets de rendu vers texture.\n" "Le fait d'augmenter la résolution interne améliore l'impact de cette " @@ -2904,6 +2826,11 @@ msgstr "" "peu probable).\n" ======= >>>>>>> Update translation files for recent changes in the code. +======= +"Améliore significativement la qualité des textures générées en utilisant les effets de rendu vers texture.\n" +"Le fait d'augmenter la résolution interne améliore l'impact de cette option.\n" +"Baisse légèrement les performances et peut provoquer quelques pépins (mais peu probable).\n" +>>>>>>> Update french translation. "\n" "Dans le doute, cochez cette case." @@ -2962,10 +2889,8 @@ msgid "" msgstr "" "Bonjour,\n" "\n" -"Dolphin requiert que votre processeur prenne en charge les instructions " -"SSE2.\n" -"Malheureusement, votre processeur ne les a pas, et donc Dolphin ne " -"s'exécutera pas.\n" +"Dolphin requiert que votre processeur prenne en charge les instructions SSE2.\n" +"Malheureusement, votre processeur ne les a pas, et donc Dolphin ne s'exécutera pas.\n" "\n" "Sayonara !\n" @@ -2983,8 +2908,7 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"Masquer le curseur de la souris s'il est au-dessus de la fenêtre " -"d'émulation.\n" +"Masquer le curseur de la souris s'il est au-dessus de la fenêtre d'émulation.\n" "\n" "Dans le doute, cochez cette case." @@ -3022,20 +2946,16 @@ msgstr "Wiimote hybride" #: 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 : Impossible d'obtenir des données à partir d'un ticket " -"inconnu : %08x/%08x" +msgstr "IOCTL_ES_GETVIEWS : Impossible d'obtenir des données à partir d'un ticket inconnu : %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 : Le jeu a essayé de recharger ios ou un titre qui n'est pas " -"disponible dans votre copie de la NAND\n" +"IOCTL_ES_LAUNCH : Le jeu a essayé de recharger ios ou un titre qui n'est pas disponible dans votre copie de la NAND\n" "ID du titre : %016llx.\n" " Dolphin va probablement figer maintenant" @@ -3082,16 +3002,14 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 -msgid "" -"If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" -msgstr "" -"Si les FPS ne sont pas corrects, cette option peut résoudre le souci. (ON = " -"Compatible, OFF = Vitesse)" +msgid "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" +msgstr "Si les FPS ne sont pas corrects, cette option peut résoudre le souci. (ON = Compatible, OFF = Vitesse)" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " @@ -3100,6 +3018,10 @@ msgstr "" "Si vous définissez le limitateur de vitesse (Image /s max) à une valeur plus " "élevée que la vitesse du jeu (NTSC:60, PAL:50), vous devez aussi désactiver " "le contrôle audio dans le DSP pour que cela fonctionne." +======= +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." +msgstr "Si vous définissez le limitateur de vitesse (Image /s max) à une valeur plus élevée que la vitesse du jeu (NTSC:60, PAL:50), vous devez aussi désactiver le contrôle audio dans le DSP pour que cela fonctionne." +>>>>>>> Update french translation. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" @@ -3108,28 +3030,24 @@ msgstr "Ignorer les changements de formats" #: 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 "" "Ignore tous les changements du format d'EFB.\n" -"Améliore les performances dans la plupart des jeux sans effet négatif. " -"Provoque des défauts graphiques dans un petit nombre de jeux.\n" +"Améliore les performances dans la plupart des jeux sans effet négatif. Provoque des défauts graphiques dans un petit nombre de jeux.\n" "\n" "Dans le doute, cochez cette case." #: 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 "" "Ignore les requêtes de lecture ou d'écriture vers l'EFB du CPU.\n" -"Améliore les performances dans certains jeux, mais peut désactiver certaines " -"fonctionnalités de gameplay ou effets graphiques.\n" +"Améliore les performances dans certains jeux, mais peut désactiver certaines fonctionnalités de gameplay ou effets graphiques.\n" "\n" "Dans le doute, décochez cette case." @@ -3163,13 +3081,11 @@ 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 "" -"Améliore les performances mais peut causer de petits pépins dans les jeux " -"s'appuyant sur une émulation de brouillard/fumée correcte.\n" +"Améliore les performances mais peut causer de petits pépins dans les jeux s'appuyant sur une émulation de brouillard/fumée correcte.\n" "\n" "Dans le doute, décochez cette case." @@ -3179,8 +3095,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Améliore les performances, mais peut faire disparaître l'éclairage dans la " -"plupart des jeux.\n" +"Améliore les performances, mais peut faire disparaître l'éclairage dans la plupart des jeux.\n" "\n" "Dans le doute, décochez cette case." @@ -3230,11 +3145,8 @@ msgid "Install to Wii Menu" msgstr "Installer dans le menu Wii" #: Source/Core/Core/Src/MemTools.cpp:248 -msgid "" -"InstallExceptionHandler called, but this platform does not yet support it." -msgstr "" -"InstallExceptionHandler a été appelé, mais cette plateforme ne le prend pas " -"encore en charge." +msgid "InstallExceptionHandler called, but this platform does not yet support it." +msgstr "InstallExceptionHandler a été appelé, mais cette plateforme ne le prend pas encore en charge." <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3517,9 +3429,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:49 msgid "Load preset values from hack patterns available." -msgstr "" -"Charger les valeurs de pré-réglage à partir de la palette de hack " -"disponibles." +msgstr "Charger les valeurs de pré-réglage à partir de la palette de hack disponibles." #: Source/Core/DolphinWX/Src/Main.cpp:134 msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" @@ -3628,12 +3538,8 @@ msgid "Memory Card" msgstr "Carte mémoire" #: Source/Core/DolphinWX/Src/MemcardManager.h:36 -msgid "" -"Memory Card Manager WARNING-Make backups before using, should be fixed but " -"could mangle stuff!" -msgstr "" -"Gestionnaire de cartes mémoires | ATTENTION : Faites des sauvegardes avant " -"utilisation, devrait être OK mais corruption possible de données !" +msgid "Memory Card Manager WARNING-Make backups before using, should be fixed but could mangle stuff!" +msgstr "Gestionnaire de cartes mémoires | ATTENTION : Faites des sauvegardes avant utilisation, devrait être OK mais corruption possible de données !" #: Source/Core/Core/Src/CoreParameter.cpp:369 #, c-format @@ -3654,9 +3560,7 @@ msgstr "" #: Source/Core/Core/Src/HW/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" -msgstr "" -"La taille du fichier de la carte mémoire ne correspond pas à la taille de " -"l'entête." +msgstr "La taille du fichier de la carte mémoire ne correspond pas à la taille de l'entête." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:47 msgid "Menu" @@ -3686,14 +3590,11 @@ msgstr "Modif." #: 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 "" -"Modifie les textures pour afficher le format dans lequel elles sont " -"encodées. Il faudra redémarrer l'émulation dans la plupart des cas pour que " -"cela prenne effet.\n" +"Modifie les textures pour afficher le format dans lequel elles sont encodées. Il faudra redémarrer l'émulation dans la plupart des cas pour que cela prenne effet.\n" "\n" "Dans le doute, décochez cette case." @@ -3733,12 +3634,8 @@ msgid "Multiply" msgstr "Multiplier" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -msgid "" -"Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " -"effect on emulated wiimotes." -msgstr "" -"Supprime le son du haut-parleur de la Wiimote. Corrige les déconnexions " -"aléatoires sur les Wiimotes physiques. N'affecte pas les Wiimotes émulées." +msgid "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No effect on emulated wiimotes." +msgstr "Supprime le son du haut-parleur de la Wiimote. Corrige les déconnexions aléatoires sur les Wiimotes physiques. N'affecte pas les Wiimotes émulées." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:126 msgid "NP Add" @@ -4044,8 +3941,7 @@ msgid "" "Right click and export all of the saves,\n" "and import the the saves to a new memcard\n" msgstr "" -"L'ordre des fichiers dans le Dossier de fichiers ne correspond pas à l'ordre " -"des blocs\n" +"L'ordre des fichiers dans le Dossier de fichiers ne correspond pas à l'ordre des blocs\n" "Faites un clic droit et exportez toutes les sauvegardes,\n" "et importez les sauvegardes vers une nouvelle carte mémoire\n" @@ -4055,12 +3951,8 @@ msgid "Other" msgstr "Autres" #: Source/Core/Core/Src/NetPlayClient.cpp:206 -msgid "" -"Other client disconnected while game is running!! NetPlay is disabled. You " -"manually stop the game." -msgstr "" -"Autre client déconnecté pendant que le jeu est en cours d'exécution !! " -"NetPlay est désactivé. Vous devez arrêter le jeu manuellement." +msgid "Other client disconnected while game is running!! NetPlay is disabled. You manually stop the game." +msgstr "Autre client déconnecté pendant que le jeu est en cours d'exécution !! NetPlay est désactivé. Vous devez arrêter le jeu manuellement." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 msgid "Output" @@ -4369,8 +4261,7 @@ msgid "" msgstr "" "Réduit la quantité d'aliasing causée par des graphiques 3D rasterisés.\n" "Ceci permet d'avoir une image moins carrée, avec moins d'effets d'escalier.\n" -"Impacte négativement les performances de l'émulation et peut provoquer des " -"pépins.\n" +"Impacte négativement les performances de l'émulation et peut provoquer des pépins.\n" "\n" "Dans le doute, sélectionnez Aucune." @@ -4546,9 +4437,7 @@ msgstr "Sauvegarder le fichier GCM/ISO décompressé" #: Source/Core/Core/Src/Movie.cpp:585 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." -msgstr "" -"Le film de sauvegarde d'état %s est corrompu, arrêt de l'enregistrement du " -"film..." +msgstr "Le film de sauvegarde d'état %s est corrompu, arrêt de l'enregistrement du film..." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Scaled EFB Copy" @@ -4583,8 +4472,10 @@ msgstr "Fitre de recherche" msgid "Search Subfolders" msgstr "Chercher dans sous-dossiers" -#: 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 "La section %s n'a pas été trouvée dans SYSCONF" @@ -4671,8 +4562,7 @@ msgstr "" "Sélectionner le format d'écran lors du rendu :\n" "Auto : Utiliser le format d'écran natif\n" "Forcer 16/9è : Dimensionner l'image pour un format d'écran 16/9è.\n" -"Forcer 4/3 : Dimensionner l'image pour un format d'écran de " -"4/3.\n" +"Forcer 4/3 : Dimensionner l'image pour un format d'écran de 4/3.\n" "Etirer à la fenêtre : Adapter l'image à la fenêtre.\n" "\n" "Dans le doute, choisissez Auto." @@ -4684,32 +4574,27 @@ msgstr "Police sélectionnée" #: 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 "" "Sélectionne la résolution d'affichage utilisée en mode Plein écran.\n" -"Elle devrait toujours être supérieure ou égale à la résolution interne. " -"L'impact sur les performances est négligeable.\n" +"Elle devrait toujours être supérieure ou égale à la résolution interne. L'impact sur les performances est négligeable.\n" "\n" "Dans le doute, utilisez la résolution de votre Bureau.\n" -"Si vous ne savez toujours pas, sélectionnez la plus haute résolution " -"affichée." +"Si vous ne savez toujours pas, sélectionnez la plus haute résolution affichée." #: 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 "" "Sélectionne l'API graphique à utiliser.\n" -"Direct3D 9 est généralement le plus rapide. OpenGL est cependant le plus " -"précis. Direct3D 11 est quelque part entre les deux.\n" +"Direct3D 9 est généralement le plus rapide. OpenGL est cependant le plus précis. Direct3D 11 est quelque part entre les deux.\n" "Les moteurs Direct3D ne sont disponibles que pour Windows.\n" "\n" "Dans le doute, sélectionnez Direct3D 9." @@ -4734,12 +4619,17 @@ msgstr "Serbe" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" "Port série 1 - C'est le port que les périphériques tels que l'adaptateur " "ethernet utilisent" +======= +msgid "Serial Port 1 - This is the port which devices such as the net adapter use" +msgstr "Port série 1 - C'est le port que les périphériques tels que l'adaptateur ethernet utilisent" +>>>>>>> Update french translation. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 msgid "Set" @@ -4757,9 +4647,7 @@ msgstr "Définir comme carte mémoire par défaut : %c" #: Source/Core/Core/Src/ActionReplay.cpp:462 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" -msgstr "" -"SetARCode_IsActive : L'index est plus grand que la taille de la liste des " -"codes AR %lu" +msgstr "SetARCode_IsActive : L'index est plus grand que la taille de la liste des codes AR %lu" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "Settings..." @@ -4880,13 +4768,10 @@ msgstr "Demande confirmation avant d'arrêter le jeu." #: 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 "" "Affiche un message lorsqu'une erreur sérieuse potentielle est arrivée.\n" -"Le désactiver évitera les messages embêtants et les messages non-fatals, " -"mais cela peut aussi signifier que Dolphin plante soudainement sans aucune " -"explication." +"Le désactiver évitera les messages embêtants et les messages non-fatals, mais cela peut aussi signifier que Dolphin plante soudainement sans aucune explication." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Show first block" @@ -4910,13 +4795,11 @@ msgstr "Afficher le titre de sauvegarde" #: 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 "" -"Affiche le nombre d'images rendues par seconde, afin de mesurer la vitesse " -"d'émulation.\n" +"Affiche le nombre d'images rendues par seconde, afin de mesurer la vitesse d'émulation.\n" "\n" "Dans le doute, décochez cette case." @@ -4986,13 +4869,11 @@ msgid "" msgstr "" ======= 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 "" -"Saute la passe alpha de destination, utilisée dans beaucoup de jeux pour " -"divers effets graphiques.\n" +"Saute la passe alpha de destination, utilisée dans beaucoup de jeux pour divers effets graphiques.\n" "\n" "Dans le doute, décochez cette case." @@ -5000,17 +4881,19 @@ 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 "" +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. "Accélère légèrement les copies d'EFB vers la RAM en sacrifiant la précision " "de l'émulation.\n" +======= +"Accélère légèrement les copies d'EFB vers la RAM en sacrifiant la précision de l'émulation.\n" +>>>>>>> Update french translation. "Améliore parfois la qualité visuelle.\n" -"Si vous rencontrez des problèmes, essayez d'augmenter la précision du cache " -"ou désactivez cette option.\n" +"Si vous rencontrez des problèmes, essayez d'augmenter la précision du cache ou désactivez cette option.\n" "\n" "Dans le doute, décochez cette case." @@ -5038,16 +4921,13 @@ msgstr "Rendu logiciel" #: 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 "" -"Le rendu logiciel est le plus lent de tous les moteurs, et n'utilise pas " -"l'accélération de votre carte graphique.\n" +"Le rendu logiciel est le plus lent de tous les moteurs, et n'utilise pas l'accélération de votre carte graphique.\n" "Il n'est utile qu'à des fins de débogage.\n" -"Êtes-vous certain d'activer le rendu logiciel ? Dans le doute, choisissez " -"'Non'." +"Êtes-vous certain d'activer le rendu logiciel ? Dans le doute, choisissez 'Non'." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" @@ -5085,21 +4965,13 @@ msgstr "Volume du haut-parleur :" #: 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 "" -"Spécifie la résolution de rendu. Une haute résolution améliore beaucoup la " -"qualité visuelle mais impacte beaucoup les performances et peut provoquer " -"quelques pépins dans certains jeux.\n" -"\"Multiple de 640x528\" est un peu plus lent que \"Taille de la fenêtre\" " -"mais provoque moins de problèmes. En général, plus la résolution interne est " -"petite, meilleures seront les performances.\n" +"Spécifie la résolution de rendu. Une haute résolution améliore beaucoup la qualité visuelle mais impacte beaucoup les performances et peut provoquer quelques pépins dans certains jeux.\n" +"\"Multiple de 640x528\" est un peu plus lent que \"Taille de la fenêtre\" mais provoque moins de problèmes. En général, plus la résolution interne est petite, meilleures seront les performances.\n" "\n" "Dans le doute, sélectionnez 640x528." @@ -5169,14 +5041,12 @@ msgstr "Arrêter" #: 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 "" "Enregistre les copies d'EFB dans les objets de texture du GPU.\n" -"Ce n'est pas précis, mais fonctionne suffisamment bien pour la plupart des " -"jeux et améliore sensiblement la vitesse comparé à l'EFB vers la RAM.\n" +"Ce n'est pas précis, mais fonctionne suffisamment bien pour la plupart des jeux et améliore sensiblement la vitesse comparé à l'EFB vers la RAM.\n" "\n" "Dans le doute, sélectionnez cette case." @@ -5294,12 +5164,8 @@ 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 "" -"Le fichier %s n'a pas pu être ouvert pour l'écriture. Vérifiez qu'il n'a pas " -"été ouvert par un autre programme." +msgid "The file %s could not be opened for writing. Please check if it's already opened by another program." +msgstr "Le fichier %s n'a pas pu être ouvert pour l'écriture. Vérifiez qu'il n'a pas été ouvert par un autre programme." #: Source/Core/AudioCommon/Src/WaveFile.cpp:44 #, c-format @@ -5325,28 +5191,21 @@ msgstr "Le code AR décrypté ne contient aucune ligne." #: 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 "" -"Plus vous allez vers Sûr, moins l'émulateur manquera les mises à jour de " -"texture depuis la RAM.\n" +"Plus vous allez vers Sûr, moins l'émulateur manquera les mises à jour de texture depuis la RAM.\n" "\n" "Dans le doute, utilisez la deuxième position depuis la droite." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 msgid "The save you are trying to copy has an invalid file size" -msgstr "" -"La sauvegarde que vous essayez de copier a une taille de fichier non valide" +msgstr "La sauvegarde que vous essayez de copier a une taille de fichier non valide" #: Source/Core/DolphinWX/Src/Main.cpp:353 -msgid "" -"The selected language is not supported by your system. Falling back to " -"system default." -msgstr "" -"La langue sélectionnée n'est pas prise en charge par votre système. Retour à " -"la langue par défaut du système." +msgid "The selected language is not supported by your system. Falling back to system default." +msgstr "La langue sélectionnée n'est pas prise en charge par votre système. Retour à la langue par défaut du système." #: Source/Core/Core/Src/NetPlayClient.cpp:43 msgid "The server and client's NetPlay versions are incompatible!" @@ -5382,12 +5241,8 @@ msgid "Theme selection went wrong" msgstr "La sélection du thème a rencontré un problème" #: 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 "" -"Il doit y avoir un ticket pour 00000001/00000002. Votre copie de la NAND est " -"probablement incomplète." +msgid "There must be a ticket for 00000001/00000002. Your NAND dump is probably incomplete." +msgstr "Il doit y avoir un ticket pour 00000001/00000002. Votre copie de la NAND est probablement incomplète." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "" @@ -5398,12 +5253,8 @@ msgstr "" "Indéterminé signifie que les paramètres de Dolphin sont appliqués." #: Source/Core/Core/Src/ActionReplay.cpp:356 -msgid "" -"This action replay simulator does not support codes that modify Action " -"Replay itself." -msgstr "" -"Ce simulateur d'Action Replay ne prend pas en charge les codes qui modifient " -"l'Action Replay lui-même." +msgid "This action replay simulator does not support codes that modify Action Replay itself." +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:513 msgid "This could cause slow down in Wii Menu and some games." @@ -5412,19 +5263,12 @@ msgstr "Ceci peut ralentir le Menu Wii et quelques jeux." #: 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 "" "Cette fonctionnalité vous permet de vous amuser avec la caméra du jeu.\n" -"Faites un clic droit et déplacez la souris pour changer l'orientation de la " -"caméra. Appuyez sur SHIFT et sur W, A, S ou D pour modifier pas à pas la " -"distance de la caméra (SHIFT et 0 déplace la caméra plus vite, SHIFT et 9 " -"la déplace plus lentement). Appuyez sur SHIFT et R pour réinitiliser la " -"position de la caméra.\n" +"Faites un clic droit et déplacez la souris pour changer l'orientation de la caméra. Appuyez sur SHIFT et sur W, A, S ou D pour modifier pas à pas la distance de la caméra (SHIFT et 0 déplace la caméra plus vite, SHIFT et 9 la déplace plus lentement). Appuyez sur SHIFT et R pour réinitiliser la position de la caméra.\n" "\n" "Dans le doute, décochez cette case." @@ -5437,12 +5281,10 @@ msgid "" "Keyboard Shortcut : Hold down to instantly disable Throttle." msgstr "" "Ceci est utiliser pour contrôler la vitesse du jeu par la constance du son.\n" -"Désactiver cette option peut causer une vitesse anormale du jeu, par exemple " -"trop rapide.\n" +"Désactiver cette option peut causer une vitesse anormale du jeu, par exemple trop rapide.\n" "Mais il se peut parfois qu'activer cette option produise un bruit constant.\n" "\n" -"Raccourci clavier : Appuyer pour instantanément désactiver cette " -"option." +"Raccourci clavier : Appuyer pour instantanément désactiver cette option." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." @@ -5450,21 +5292,15 @@ msgstr "Ceci est utilisé pour lire les pistes de musique, comme les BGM." #: 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 "" -"Ceci sépare les threads du processeur et de l'affichage, pour qu'ils " -"puissent être exécutés sur des coeurs séparés.\n" -"Cela a pour conséquence d'accélérer considérablement l'émulation sur les PC " -"qui plus d'un coeur, mais peut occasionnellement causer des petits pépins ou " -"des plantages." +"Ceci sépare les threads du processeur et de l'affichage, pour qu'ils puissent être exécutés sur des coeurs séparés.\n" +"Cela a pour conséquence d'accélérer considérablement l'émulation sur les PC qui plus d'un coeur, mais peut occasionnellement causer des petits pépins ou des plantages." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 msgid "This will let you Manually Edit the INI config file" -msgstr "" -"Ceci vous permettra de modifier manuellement le fichier de configuration INI" +msgstr "Ceci vous permettra de modifier manuellement le fichier de configuration INI" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:249 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:254 @@ -5519,7 +5355,8 @@ msgstr "Echec de chargement d'un type de fichier inconnu." msgid "Triggers" msgstr "Déclencheurs" -#: 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 "Essai de lecture d'un fichier SYSCONF non valide" @@ -5571,12 +5408,10 @@ 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 "" -"Impossible d'analyser la ligne %lu du code AR entré comme un code crypté ou " -"décrypté valide. Veuillez vérifier que vous l'avez correctement tapé.\n" +"Impossible d'analyser la ligne %lu du code AR entré comme un code crypté ou décrypté valide. Veuillez vérifier que vous l'avez correctement tapé.\n" "Voulez-vous ignorer cette ligne et continuer l'analyse ?" #: Source/Core/DolphinWX/Src/FrameTools.cpp:404 @@ -5611,9 +5446,13 @@ msgstr "Reception d'un message inconnu avec l'ID : %d" #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" <<<<<<< HEAD +<<<<<<< HEAD ======= msgstr "" "Message inconnu avec l'ID %d reçue du lecteur %d. Banissement du lecteur !" +======= +msgstr "Message inconnu avec l'ID %d reçue du lecteur %d. Banissement du lecteur !" +>>>>>>> Update french translation. #: Source/Core/Core/Src/HW/Memmap.cpp:633 #, c-format @@ -5662,23 +5501,19 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Utilise plusieurs threads pour décoder les textures.\n" -"Peut accélérer l'émulation, particulièrement avec des processeurs qui ont " -"plus de 2 coeurs.\n" +"Peut accélérer l'émulation, particulièrement avec des processeurs qui ont plus de 2 coeurs.\n" "\n" "Dans le doute, décochez cette case." #: 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 "" -"En cas d'échec de compilation de shader, un message est habituellement " -"affiché.\n" -"Cependant, certains préfèrent ne pas afficher ce message pour ne pas " -"interrompre le jeu en cochant cette case.\n" +"En cas d'échec de compilation de shader, un message est habituellement affiché.\n" +"Cependant, certains préfèrent ne pas afficher ce message pour ne pas interrompre le jeu en cochant cette case.\n" "\n" "Dans le doute, décochez cette case." @@ -5762,8 +5597,7 @@ msgid "" "%s\n" "Do you wish to continue?" msgstr "" -"Attention ! Il est conseillé de sauvegarder tous les fichiers dans le " -"dossier :\n" +"Attention ! Il est conseillé de sauvegarder tous les fichiers dans le dossier :\n" "%s\n" "Voulez-vous continuer ?" @@ -5775,8 +5609,7 @@ msgid "" "and have the same name as a file on your memcard\n" "Continue?" msgstr "" -"Attention : ceci va écraser toutes les sauvegardes existantes dans ce " -"dossier :\n" +"Attention : ceci va écraser toutes les sauvegardes existantes dans ce dossier :\n" "%s\n" "et vont avoir le même nom que le fichier sur votre carte mémoire\n" "Continuer ?" @@ -5969,8 +5802,7 @@ msgid "" "Only Zelda ucode games will work correctly with them.\n" msgstr "" "Vous utilisez des ROM de DSP gratuits créés par l'équipe de Dolphin.\n" -"Seuls les jeux basés sur les ucodes de Zelda fonctionneront correctement " -"avec ces ROM.\n" +"Seuls les jeux basés sur les ucodes de Zelda fonctionneront correctement avec ces ROM.\n" #: Source/Core/DolphinWX/Src/FrameAui.cpp:72 msgid "You can't close panes that have pages in them." @@ -6052,19 +5884,14 @@ msgstr "[Personnalisé]" #: 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 "" "[EXPERIMENTAL]\n" -"Tente d'accélérer l'émulation en déportant le décodage de texture vers le " -"GPU en utilisant le framework OpenCL.\n" -"Cependant, il est actuellement connu pour provoquer des défauts de textures " -"dans divers jeux. De plus, il est généralement plus lent qu'un classique " -"décodage par le CPU.\n" +"Tente d'accélérer l'émulation en déportant le décodage de texture vers le GPU en utilisant le framework OpenCL.\n" +"Cependant, il est actuellement connu pour provoquer des défauts de textures dans divers jeux. De plus, il est généralement plus lent qu'un classique décodage par le CPU.\n" "\n" "Dans le doute, décochez cette case." @@ -6111,9 +5938,7 @@ msgstr "iCacheJIT : Lecture de l'Opcode depuis %x. Merci de nous le signaler." #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:108 #, c-format msgid "not a wii save or read failure for file header size %x" -msgstr "" -"Ceci n'est pas une sauvegarde Wii, ou erreur de lecture de la taille de " -"l'entête du fichier %x" +msgstr "Ceci n'est pas une sauvegarde Wii, ou erreur de lecture de la taille de l'entête du fichier %x" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:461 msgid "s" From 1880eb8e9f31771dc1f5465ae0ee47fe510de4e8 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Mon, 19 Dec 2011 09:10:17 -0600 Subject: [PATCH 07/14] Update Czeck translation. --- Languages/po/cs.po | 583 ++++++++++++++------------------------------- 1 file changed, 184 insertions(+), 399 deletions(-) diff --git a/Languages/po/cs.po b/Languages/po/cs.po index 00f3a3c290..728e2493b1 100644 --- a/Languages/po/cs.po +++ b/Languages/po/cs.po @@ -11,6 +11,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +<<<<<<< HEAD "PO-Revision-Date: 2011-10-15 14:50+0100\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -23,6 +24,9 @@ msgstr "" >>>>>>> The actual update of the Greek and Czech translations. The last commit "PO-Revision-Date: 2011-10-15 14:50+0100\n" >>>>>>> Update Greek and Czech translations +======= +"PO-Revision-Date: 2011-12-19 07:39+0100\n" +>>>>>>> Update Czeck translation. "Last-Translator: Zbyněk Schwarz \n" "Language-Team: \n" "Language: Czech\n" @@ -111,8 +115,7 @@ msgid "" "file is not large enough to be a valid memory card file (0x%x bytes)" msgstr "" "%s nelze načíst jako paměťovou kartu\n" -"soubor není dostatečně velký, aby byl platným souborem paměťové karty (0x%x " -"bajtů)" +"soubor není dostatečně velký, aby byl platným souborem paměťové karty (0x%x bajtů)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 #, c-format @@ -384,13 +387,11 @@ 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" @@ -400,13 +401,11 @@ msgid "" msgstr "" "POZOR:\n" "\n" -"Netplay bude v současnosti správně fungovat pouze při použití následujících " -"nastavení:\n" +"Netplay bude v současnosti správně fungovat pouze při použití následujících nastavení:\n" " - Dvojité Jádro [VYPNUTO]\n" " - Přiškrcení Zvuku [VYPNUTO]\n" " - DSP-HLE s \"Nulovým Zvukem\" nebo DSP-LLE\n" -" - Ručně nastavit přesné číslo ovladačů, které budou použity na [Standardní " -"Ovladač]\n" +" - Ručně nastavit přesné číslo ovladačů, které budou použity na [Standardní Ovladač]\n" "\n" "Všichni hráči by měli používat stejné nastavení i verzi Dolphina.\n" "Zakázat všechny paměťové karty nebo je poslat hráčům před spuštěním.\n" @@ -455,8 +454,7 @@ msgstr "Precizní emulace 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 "" @@ -487,38 +485,23 @@ msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:669 #, c-format -msgid "" -"Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" -msgstr "" -"Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Kódu Přidat " -"(%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" +msgstr "Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Kódu Přidat (%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 "" -"Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Naplnit a " -"Sesunout (%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide (%s)" +msgstr "Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Naplnit a Sesunout (%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 "" -"Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Ram Zápisu A " -"Naplnění (%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And Fill (%s)" +msgstr "Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Ram Zápisu A Naplnění (%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 "" -"Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Zápisu Do " -"Ukazatele (%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Write To Pointer (%s)" +msgstr "Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Zápisu Do Ukazatele (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:803 #, c-format @@ -527,10 +510,8 @@ msgstr "Chyba Action Replay: Neplatná hodnota (%08x) v Kopii Paměti (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:684 #, c-format -msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" -msgstr "" -"Chyba Action Replay: Hlavní Kód a Zápis do CCXXXXXX nejsou zavedeny (%s)" +msgid "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +msgstr "Chyba Action Replay: Hlavní Kód a Zápis do CCXXXXXX nejsou zavedeny (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:196 #, c-format @@ -610,16 +591,14 @@ msgstr "Adresa :" 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." msgstr "" "Přidá zadanou hodnotu do Parametru ZFar.\n" "Dva způsoby jak vyjádřit hodnoty v plovoucí desetinné čárce.\n" -"Příklad: přímé zadání \"200\" nebo \"0.0002\" má stejný účinek, získaná " -"hodnota bude \"0.0002\".\n" +"Příklad: přímé zadání \"200\" nebo \"0.0002\" má stejný účinek, získaná hodnota bude \"0.0002\".\n" "Hodnoty: (0->+/-Celé číslo) nebo (0->+/-PDČ[6 desetinných míst])\n" "\n" "Poznámka: Zkontrolujte Konzoli/Okno protokolu pro získané hodnoty" @@ -628,16 +607,14 @@ 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." msgstr "" "Přidá zadanou hodnotu do Parametru zNear.\n" "Dva způsoby jak vyjádřit hodnoty v plovoucí desetinné čárce.\n" -"Příklad: přímé zadání \"200\" nebo \"0.0002\" má stejný účinek, získaná " -"hodnota bude \"0.0002\".\n" +"Příklad: přímé zadání \"200\" nebo \"0.0002\" má stejný účinek, získaná hodnota bude \"0.0002\".\n" "Hodnoty: (0->+/-Celé číslo) nebo (0->+/-PDČ[6 desetinných míst])\n" "\n" "Poznámka: Zkontrolujte Konzoli/Okno protokolu pro získané hodnoty\"" @@ -700,13 +677,11 @@ msgstr "Všechny soubory (*.*)|*.*" #: 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 "" -"Umožní přepínání jistých možností pomocí horkých kláves 3, 4, 5, 6 a 7 " -"uvnitř okna emulace.\n" +"Umožní přepínání jistých možností pomocí horkých kláves 3, 4, 5, 6 a 7 uvnitř okna emulace.\n" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." @@ -1033,15 +1008,12 @@ msgstr "Ukládat předvyt. obj. do vyr. pam." #: 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 "" "Vypočítat hodnoty hloubky 3D grafiky podle pixelu, raději než podle bodu.\n" -"Na rozdíl od osvětlení pixelu (což je pouze vylepšen), výpočty hloubky podle " -"pixelu jsou potřebné ke správné emulaci malého počtu her.\n" +"Na rozdíl od osvětlení pixelu (což je pouze vylepšen), výpočty hloubky podle pixelu jsou potřebné ke správné emulaci malého počtu her.\n" "\n" "Pokud si nejste jisti, nechejte toto zaškrtnuté." @@ -1054,8 +1026,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Vypočítat osvětlení 3D grafiky podle pixelu, raději než podle bodu.\n" -"Sníží rychlost emulace o nějaké procento (záleží na Vašem grafikém " -"procesoru).\n" +"Sníží rychlost emulace o nějaké procento (záleží na Vašem grafikém procesoru).\n" "Toto je většinou bezpečné vylepšení, ale může někdy způsobit problémy.\n" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." @@ -1211,12 +1182,8 @@ msgid "Choose a memory card:" msgstr "Zvolte paměťovou kartu:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 -msgid "" -"Choose file to use as apploader: (applies to discs constructed from " -"directories only)" -msgstr "" -"Zvolte soubor, který má být použit jako zavaděč aplikace: (platí pouze pro " -"disky sestavené z adresářů)" +msgid "Choose file to use as apploader: (applies to discs constructed from directories only)" +msgstr "Zvolte soubor, který má být použit jako zavaděč aplikace: (platí pouze pro disky sestavené z adresářů)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 @@ -1243,11 +1210,8 @@ msgid "Clear failed." msgstr "Vyčištění selhalo" #: Source/Core/Core/Src/NetPlayServer.cpp:259 -msgid "" -"Client disconnect while game is running!! NetPlay is disabled. You must " -"manually stop the game." -msgstr "" -"Klient odpojen při běhu hry!! NetPlay je vypnut. Hru musíte ukončit ručně." +msgid "Client disconnect while game is running!! NetPlay is disabled. You must manually stop the game." +msgstr "Klient odpojen při běhu hry!! NetPlay je vypnut. Hru musíte ukončit ručně." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 @@ -1425,14 +1389,8 @@ msgstr "Nezle spustit 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." -msgstr "" -"\"%s\" nelze číst. Buď není v mechanice žádný disk, nebo toto není záloha GC/" -"Wii. Nezapomeňte, že původní disky GameCube a Wii nepřečte většina PC DVD " -"mechanik." +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\" nelze číst. Buď není v mechanice žádný disk, nebo toto není záloha GC/Wii. Nezapomeňte, že původní disky GameCube a Wii nepřečte většina PC DVD mechanik." #: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format @@ -1457,13 +1415,11 @@ msgstr "" 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 "" "Nelze zapsat soubor paměťové karty %s.\n" "\n" -"Spouštíte Dolphina z CD/DVD, nebo je snad soubor s uložením chráněný proti " -"zápisu?" +"Spouštíte Dolphina z CD/DVD, nebo je snad soubor s uložením chráněný proti zápisu?" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 msgid "Couldn't find open command for extension 'ini'!" @@ -1501,10 +1457,8 @@ msgid "Created by KDE-Look.org" msgstr "Vytvořil KDE-look.org" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 -msgid "" -"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -msgstr "" -"Vytvořil Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +msgid "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +msgstr "Vytvořil Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Created by VistaIcons.com" @@ -1694,12 +1648,8 @@ msgstr "Zjistit" #: 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 "" -"Zjištěn pokus o přečtení více dat z DVD, než se vejde do výstupní paměti. " -"Zásek." +msgid "Detected attempt to read more data from the DVD than fit inside the out buffer. Clamp." +msgstr "Zjištěn pokus o přečtení více dat z DVD, než se vejde do výstupní paměti. Zásek." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 @@ -1755,30 +1705,24 @@ msgstr "Zakázat Textury" #: 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 "" "Zakázat jakoukoli emulaci XFB.\n" -"Velmi zrychluje emulaci, ale způsobuje hodně chyb v mnoha hrách, které na " -"nich závisejí (zvláště po domácku vyrobené aplikace).\n" +"Velmi zrychluje emulaci, ale způsobuje hodně chyb v mnoha hrách, které na nich závisejí (zvláště po domácku vyrobené aplikace).\n" "\n" "Pokud si nejste jisti, nechejte toto zaškrtnuté." #: 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 "" "Zakázat emulaci EFB kopií.\n" -"Tyto jsou často používány pro efekty následného zpracování nebo vykreslení " -"do textur, takže když toto zaškrtnete, dostanete velké zrychlení, ale toto " -"také skoro vždy způsobuje problémy.\n" +"Tyto jsou často používány pro efekty následného zpracování nebo vykreslení do textur, takže když toto zaškrtnete, dostanete velké zrychlení, ale toto také skoro vždy způsobuje problémy.\n" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." @@ -1903,20 +1847,12 @@ msgid "Dolphin at &Google Code" msgstr "Dolphin na &Google Code" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 -msgid "" -"Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " -"files..." -msgstr "" -"Dolphin nemohl nalézt žádná GX/Wii ISO. Klikněte zde dvakrát k prohledání " -"souborů..." +msgid "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for files..." +msgstr "Dolphin nemohl nalézt žádná GX/Wii ISO. Klikněte zde dvakrát k prohledání souborů..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 -msgid "" -"Dolphin is currently set to hide all games. Doubleclick here to show all " -"games..." -msgstr "" -"Dolphin je v současnosti nastaven na skrytí všech her. Klikněte zde dvakrát " -"pro zobrazení všech her..." +msgid "Dolphin is currently set to hide all games. Doubleclick here to show all games..." +msgstr "Dolphin je v současnosti nastaven na skrytí všech her. Klikněte zde dvakrát pro zobrazení všech her..." #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 @@ -2020,15 +1956,8 @@ msgstr "EFB Kopie" #: 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 "" -"CHYBA: Tato verze Dolphinu vyžaduje ovladač TAP-Win32 verze alespoň %d.%d -- " -"Pokud jste nedávno Vaši instalaci Dolphin aktualizovali, je zapotřebí v " -"tomto bodě restartovat, aby Windows uviděl nový ovladač." +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 "CHYBA: Tato verze Dolphinu vyžaduje ovladač TAP-Win32 verze alespoň %d.%d -- Pokud jste nedávno Vaši instalaci Dolphin aktualizovali, je zapotřebí v tomto bodě restartovat, aby Windows uviděl nový ovladač." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 msgid "EUROPE" @@ -2078,30 +2007,24 @@ msgstr "Vlákno Emulace již běží" #: 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 "" "Přesně Emulovat XFB.\n" -"Velmi zpomaluje emulaci a brání vykreslování ve vysokém rozlišení, ale je " -"nutná k řádné emulaci jistého počtu her.\n" +"Velmi zpomaluje emulaci a brání vykreslování ve vysokém rozlišení, ale je nutná k řádné emulaci jistého počtu her.\n" "\n" "Pokud si nejste jisti, zaškrtněte místo tohoto virtuální emulaci 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 "" "Emulovat XFB pomocí objektů textury grafického procesoru.\n" -"Spraví mnoho her, které nefungují bez emulace EFB, aniž by byla tak pomalá " -"jako opravdová emulace EFB. Nicméně stále může selhat v mnoha jiných hrách " -"(zvláště po domácku vyrobené aplikace).\n" +"Spraví mnoho her, které nefungují bez emulace EFB, aniž by byla tak pomalá jako opravdová emulace EFB. Nicméně stále může selhat v mnoha jiných hrách (zvláště po domácku vyrobené aplikace).\n" "\n" "Pokud si nejste jisti, nechejte toto zaškrtnuté." @@ -2119,15 +2042,13 @@ msgstr "Povolit" #: 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 "" -"Zapnout 3D efekty pomocí stereoskopie použitím technologie Nvidia 3D Vision, " -"pokud je podporována Vaším grafickým procesorem.\n" +"Zapnout 3D efekty pomocí stereoskopie použitím technologie Nvidia 3D Vision, pokud je podporována Vaším grafickým procesorem.\n" "Může způsobovat problémy.\n" "Pro fungování vyžaduje režim celé obrazovky.\n" "\n" @@ -2154,7 +2075,7 @@ msgstr "Zapnout Slučování Bloků" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" -msgstr "" +msgstr "Povolit výpočet ohraničujícího rámečku" ======= >>>>>>> Update translation files for recent changes in the code. @@ -2237,12 +2158,8 @@ msgstr "" "Pokud si nejste jisti, zvolte 1x." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 -msgid "" -"Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " -"Compatible)" -msgstr "" -"Zapnout rychlý přístup k disku. Některé hry to potřebují. (ZAPNUTO = rychlé, " -"VYPNUTO = Kompatibilní)" +msgid "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = Compatible)" +msgstr "Zapnout rychlý přístup k disku. Některé hry to potřebují. (ZAPNUTO = rychlé, VYPNUTO = Kompatibilní)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Enable pages" @@ -2255,41 +2172,28 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Toto povolte, pokud chcete, aby celá obrazovka byla použita pro " -"vykreslování.\n" +"Toto povolte, pokud chcete, aby celá obrazovka byla použita pro vykreslování.\n" "Pokud je toto zakázáno, bude místo toho vytvořeno vykreslovací okno.\n" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." #: 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 "" -"Toto zapněte, pokud chcete použít hlavní okno Dolphin pro vykreslování " -"raději, než oddělené vykreslovací okno.\n" +"Toto zapněte, pokud chcete použít hlavní okno Dolphin pro vykreslování raději, než oddělené vykreslovací okno.\n" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 -msgid "" -"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " -"ANY other game." -msgstr "" -"Povolte toto pro zrychlení The Legend of Zelda: Twilight Princess. Zakažte " -"pro VŠECHNY ostatní hry." +msgid "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for ANY other game." +msgstr "Povolte toto pro zrychlení The Legend of Zelda: Twilight Princess. Zakažte pro VŠECHNY ostatní hry." #: 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 "" -"Povolit Překlad Adres Bloků (BAT); funkce Jednotky Správy Paměti. Přesně " -"napodobuje hardware, ale je emulován pomalu. (ZAPNUTO = Kompatibilní, " -"VYPNUTO = Rychlé)" +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 "Povolit Překlad Adres Bloků (BAT); funkce Jednotky Správy Paměti. Přesně napodobuje hardware, ale je emulován pomalu. (ZAPNUTO = Kompatibilní, VYPNUTO = Rychlé)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "Enables Custom Projection Hack" @@ -2308,12 +2212,8 @@ msgstr "" "Pokud si nejste jisti, nechejte toto odškrtnuté." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 -msgid "" -"Enables the Memory Management Unit, needed for some games. (ON = Compatible, " -"OFF = Fast)" -msgstr "" -"Povolí Jednotku Správy Paměti, potřebnou v nějakých hrách. (ZAPNUTO = " -"Kompatibilní, VYPNUTO = Rychlé)" +msgid "Enables the Memory Management Unit, needed for some games. (ON = Compatible, OFF = Fast)" +msgstr "Povolí Jednotku Správy Paměti, potřebnou v nějakých hrách. (ZAPNUTO = Kompatibilní, VYPNUTO = Rychlé)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" @@ -2391,6 +2291,8 @@ 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í." ======= ======= @@ -2416,24 +2318,17 @@ msgstr "Chyba" #: Source/Core/DolphinWX/Src/Main.cpp:346 >>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Error loading selected language. Falling back to system default." -msgstr "" -"Chyba při nahrávání zvoleného jazyka. Vracím se na výchozí jazyk systému." +msgstr "Chyba při nahrávání zvoleného jazyka. Vracím se na výchozí jazyk systému." #: 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 "" +msgid "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). Aborting savestate load..." +msgstr "Chyba: Po \"%s\", nalezeno %d (0x%X) místo značky uložení %d (0x%X). Ukončuji načtení uloženého stavu..." #: 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 "" -"Chyba: Pokus o přístup k písmům %s, ale ty nejsou načtena. Hry nemusí " -"zobrazit písma správně, nebo se můžou zhroutit" +msgid "Error: Trying to access %s fonts but they are not loaded. Games may not show fonts correctly, or crash." +msgstr "Chyba: Pokus o přístup k písmům %s, ale ty nejsou načtena. Hry nemusí zobrazit písma správně, nebo se můžou zhroutit" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:30 msgid "Escape" @@ -2598,8 +2493,7 @@ msgstr "" "Nelze načíst ROM DSP:\t%s\n" "\n" "Tento soubor je vyžadován při použití DSP LLE.\n" -"Není distribuován s Dolphinem, protože obsahuje data chráněná autorským " -"právem.\n" +"Není distribuován s Dolphinem, protože obsahuje data chráněná autorským právem.\n" "Použijte DSPSpy k výpisu soubor z Vaší skutečné konzole.\n" "\n" "Můžete použít jádro DSP HLE, které nevyžaduje výpisy ROM.\n" @@ -2813,12 +2707,10 @@ 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 "" "Donutí použít režim NTSC-J pro použití Japonského písma ROMu.\n" -"Pokud není zaškrtnuto, Dolphin standardně přejde na NTSC-U a automaticky " -"zapne toto nastavení při hraní Japonských her." +"Pokud není zaškrtnuto, Dolphin standardně přejde na NTSC-U a automaticky zapne toto nastavení při hraní Japonských her." #: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" @@ -2916,9 +2808,8 @@ msgid "GCI File(*.gci)" msgstr "Soubor GCI(*.gci)" #: Source/Core/DolphinWX/Src/GCMicDlg.h:44 -#, fuzzy msgid "GCMic Configuration" -msgstr "Nastavení Záznamu" +msgstr "Nastavení GCMic" #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" @@ -3075,16 +2966,13 @@ msgstr "Větší než" #: 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 "" -"Velmi zvýší kvalitu vytvářených textur použitím efektů vykreslení do " -"textury.\n" +"Velmi zvýší kvalitu vytvářených textur použitím efektů vykreslení do textury.\n" "Zvýšení vnitřního rozlišení zlepší účinnek tohoto nastavení.\n" "Trošku sníží výkon a možná způsobí problémy (i když to je nepravděpodobné).\n" "\n" @@ -3217,13 +3105,11 @@ msgstr "IOCTL_ES_GETVIEWS: Pokus o získání dat z neznámého lístku: %08x/%0 #: 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: Hra se pokusila znovu načíst ios nebo název, který není " -"dostupný ve Vašem nand výpisu\n" +"IOCTL_ES_LAUNCH: Hra se pokusila znovu načíst ios nebo název, který není dostupný ve Vašem nand výpisu\n" "IDNázvu %016llx.\n" "Dolphin se teď pravděpodobně zasekne" @@ -3264,25 +3150,16 @@ msgid "Icon" msgstr "Ikona" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 -msgid "" -"If checked, the bounding box registers will be updated. Used by the Paper " -"Mario games." -msgstr "" +msgid "If checked, the bounding box registers will be updated. Used by the Paper Mario games." +msgstr "Pokud je zaškrtnuto, registry ohraničujícího rámečku budou aktualizovány. Používáno v hrách Paper Mario." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 -msgid "" -"If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" -msgstr "" -"Pokud jsou SzS nestálé, tato volba může pomoci. (ZAPNUTO = Kompatibilní, " -"VYPNUTO = Rychlé)" +msgid "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" +msgstr "Pokud jsou SzS nestálé, tato volba může pomoci. (ZAPNUTO = Kompatibilní, VYPNUTO = Rychlé)" #: 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." -msgstr "" -"Pokud nastavíte limit snímků větší než plná rychlost hry (NTSC:60, PAL:50), " -"měli byste také vypnout Přiškrcení Zvuku v DSP, aby to bylo účinné." +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." +msgstr "Pokud nastavíte limit snímků větší než plná rychlost hry (NTSC:60, PAL:50), měli byste také vypnout Přiškrcení Zvuku v DSP, aby to bylo účinné." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" @@ -3291,28 +3168,24 @@ msgstr "Ignorovat Změny Formátu" #: 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 "" "Ignorovat všechny změny formátu EFB.\n" -"Zlepší výkon v mnoha hrách, bez žádného negativního efektu. Přesto způsobuje " -"grafické chyby v malém počtu jiných her.\n" +"Zlepší výkon v mnoha hrách, bez žádného negativního efektu. Přesto způsobuje grafické chyby v malém počtu jiných her.\n" "\n" "Pokud si nejste jisti, nechejte toto zaškrtnuté." #: 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 "" "Ignorovat všechny požadavky procesoru pro čtení a zápis do EFB.\n" -"Zvýší výkon v některých hrách, ale může vypnout některé funkce související s " -"hraním a grafické efekty.\n" +"Zvýší výkon v některých hrách, ale může vypnout některé funkce související s hraním a grafické efekty.\n" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." @@ -3346,13 +3219,11 @@ 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 "" -"Zlepší výkon, ale způsobuje chyby ve většině her, které závisejí na správné " -"emulaci mlhy.\n" +"Zlepší výkon, ale způsobuje chyby ve většině her, které závisejí na správné emulaci mlhy.\n" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." @@ -3412,11 +3283,8 @@ msgid "Install to Wii Menu" msgstr "Instalovat do Wii Menu" #: Source/Core/Core/Src/MemTools.cpp:248 -msgid "" -"InstallExceptionHandler called, but this platform does not yet support it." -msgstr "" -"Byl zavolán InstallExceptionHandler, ale tato platforma toto ještě " -"nepodporuje." +msgid "InstallExceptionHandler called, but this platform does not yet support it." +msgstr "Byl zavolán InstallExceptionHandler, ale tato platforma toto ještě nepodporuje." <<<<<<< HEAD <<<<<<< HEAD @@ -3862,12 +3730,8 @@ msgid "Memory Card" msgstr "Paměťová karta" #: Source/Core/DolphinWX/Src/MemcardManager.h:36 -msgid "" -"Memory Card Manager WARNING-Make backups before using, should be fixed but " -"could mangle stuff!" -msgstr "" -"Správce Paměťových karet Varování-Před použitím zálohujte, měl by být " -"spravený, ale mohl by věci poškodit!" +msgid "Memory Card Manager WARNING-Make backups before using, should be fixed but could mangle stuff!" +msgstr "Správce Paměťových karet Varování-Před použitím zálohujte, měl by být spravený, ale mohl by věci poškodit!" #: Source/Core/Core/Src/CoreParameter.cpp:369 #, c-format @@ -3918,13 +3782,11 @@ msgstr "Modifikátor" #: 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 "" -"Změnit textury, aby zobrazovali formát, v kterém jsou zakódovány. Ve většině " -"případů vyžaduje resetovaní emulace.\n" +"Změnit textury, aby zobrazovali formát, v kterém jsou zakódovány. Ve většině případů vyžaduje resetovaní emulace.\n" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." @@ -3964,12 +3826,8 @@ msgid "Multiply" msgstr "Násobit" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -msgid "" -"Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " -"effect on emulated wiimotes." -msgstr "" -"Ztlumí reproduktor Wiimote. Spravuje náhodná odpojování u opravdových " -"Wiimote. Žádný efekt na emulovaná Wiimote." +msgid "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No effect on emulated wiimotes." +msgstr "Ztlumí reproduktor Wiimote. Spravuje náhodná odpojování u opravdových Wiimote. Žádný efekt na emulovaná Wiimote." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:126 msgid "NP Add" @@ -4308,11 +4166,8 @@ msgid "Other" msgstr "Jiné" #: Source/Core/Core/Src/NetPlayClient.cpp:206 -msgid "" -"Other client disconnected while game is running!! NetPlay is disabled. You " -"manually stop the game." -msgstr "" -"Jiný klient odpojen při běhu hry!! NetPlay je vypnut. Hru ukončete ručně." +msgid "Other client disconnected while game is running!! NetPlay is disabled. You manually stop the game." +msgstr "Jiný klient odpojen při běhu hry!! NetPlay je vypnut. Hru ukončete ručně." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 msgid "Output" @@ -4509,17 +4364,17 @@ msgstr "Efekt Následného Zpracování:" #: Source/Core/Core/Src/Movie.cpp:735 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" -msgstr "" +msgstr "Předčasný konec filmu v PlayController. %u + 8 > %u" #: Source/Core/Core/Src/Movie.cpp:829 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" -msgstr "" +msgstr "Předčasný konec filmu v PlayWiimote. %u + %d > %u" #: Source/Core/Core/Src/Movie.cpp:806 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" -msgstr "" +msgstr "Předčasný konec filmu v PlayWiimote. %u > %u" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " @@ -4904,8 +4759,10 @@ msgstr "Hledat Filtr" msgid "Search Subfolders" msgstr "Hledat Podadresáře" -#: 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 "Sekce %s nebyla v SYSCONF nalezena" @@ -5026,32 +4883,27 @@ msgstr "Vybraný typ písma" #: 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 "" "Vybere rozlišení obrazovky použité v režimu celé obrazovky.\n" -"To by mělo být vždycky větší než nebo rovno vnitřnímu rozlišení. Dopad na " -"výkon je zanedbatelný.\n" +"To by mělo být vždycky větší než nebo rovno vnitřnímu rozlišení. Dopad na výkon je zanedbatelný.\n" "\n" "Pokud si nejste jisti, použijte Vaše rozlišení obrazovky.\n" -"Pokud si stále nejste jisti, použijte takové nejvyšší rozlišení, které Vám " -"funguje." +"Pokud si stále nejste jisti, použijte takové nejvyšší rozlišení, které Vám funguje." #: 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 "" "Zvolí jaké bude vnitřně grafické API použito.\n" -"Direct3D 9 je většinou nejrychlejší. OpenGL je ale nejpřesnější. Direct3D 11 " -"je někde mezi nimi.\n" +"Direct3D 9 je většinou nejrychlejší. OpenGL je ale nejpřesnější. Direct3D 11 je někde mezi nimi.\n" "Nezapomeňte, že backendy Direct3D jsou dostupné pouze ve Windows.\n" "\n" "Pokud si nejste jisti, použijte Direct3D 9" @@ -5073,11 +4925,8 @@ msgid "Serbian" msgstr "Srbština" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 -msgid "" -"Serial Port 1 - This is the port which devices such as the net adapter use" -msgstr "" -"Sériový port 1 - Tito je port, který používají zařízení jako internetový " -"adaptér" +msgid "Serial Port 1 - This is the port which devices such as the net adapter use" +msgstr "Sériový port 1 - Tito je port, který používají zařízení jako internetový adaptér" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 msgid "Set" @@ -5216,12 +5065,10 @@ msgstr "Zobrazí rámeček s potvrzením před zastavením hry." #: 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 "" "Zobrazit rámeček se zprávou, při zjištění potenciálně závažné chyby.\n" -"Vypnutím tohoto se můžete vyhnout otravným a nezávažným zprávám, ale Dolphin " -"může také být náhle ukončen bez jakéhokoliv vysvětlení." +"Vypnutím tohoto se můžete vyhnout otravným a nezávažným zprávám, ale Dolphin může také být náhle ukončen bez jakéhokoliv vysvětlení." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Show first block" @@ -5245,13 +5092,11 @@ msgstr "Zobrazit název uložení" #: 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 "" -"Zobrazí počet snímků vykreslených za sekundu jako měřítko rychlosti " -"emulace.\n" +"Zobrazí počet snímků vykreslených za sekundu jako měřítko rychlosti emulace.\n" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." @@ -5299,13 +5144,11 @@ msgstr "Přeskočit EFB Přístup z Procesoru" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 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 "" -"Přeskočit průchod cílové průhlednosti používaný ve většině her pro různé " -"grafické efekty.\n" +"Přeskočit průchod cílové průhlednosti používaný ve většině her pro různé grafické efekty.\n" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." @@ -5313,15 +5156,13 @@ 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 "" "Lehce zrychlí kopie EFB do RAM obětováním přesnosti emulace.\n" "Někdy také zvýší kvalitu obrazu.\n" -"Pokud se setkáváte s jakýmikoliv problémy, zkuste zvýšit přesnost textury, " -"nebo tuto možnost vypnout.\n" +"Pokud se setkáváte s jakýmikoliv problémy, zkuste zvýšit přesnost textury, nebo tuto možnost vypnout.\n" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." @@ -5349,16 +5190,13 @@ msgstr "Softwarový Vykreslovač" #: 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 "" -"Softwarové vykreslování je řádově pomalejší, než při použití ostatních " -"backendů.\n" +"Softwarové vykreslování je řádově pomalejší, než při použití ostatních backendů.\n" "Je užitečné pouze pro účely ladění.\n" -"Opravdu chcete zapnout softwarové vykreslování? Pokud si nejste jisti, " -"zvolte 'Ne'." +"Opravdu chcete zapnout softwarové vykreslování? Pokud si nejste jisti, zvolte 'Ne'." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" @@ -5408,21 +5246,13 @@ msgstr "Hlasitost Reproduktoru:" #: 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 "" -"Určuje rozlišení, v kterém bude vykresleno. Vysoké rozlišení vlemi zvýší " -"kvalitu obrazu, ale je také o dost náročnější na výkon a může způsobovat v " -"některých hrách chyby.\n" -"\"Násobek 640x528\" je o trochu pomalejší než \"Velikost Okna\", ale také " -"nezpůsobuje tolik problémů. Obecně řečeno, čím nižší je vnitřní rozlišení, " -"tím lepší výkon bude.\n" +"Určuje rozlišení, v kterém bude vykresleno. Vysoké rozlišení vlemi zvýší kvalitu obrazu, ale je také o dost náročnější na výkon a může způsobovat v některých hrách chyby.\n" +"\"Násobek 640x528\" je o trochu pomalejší než \"Velikost Okna\", ale také nezpůsobuje tolik problémů. Obecně řečeno, čím nižší je vnitřní rozlišení, tím lepší výkon bude.\n" "\n" "Pokud si nejste jisti, zvolte 640x528." @@ -5508,14 +5338,12 @@ msgstr "Zastavit" #: 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 "" "Ukládat EFB kopie do objektů textury grafického procesoru.\n" -"Toto není přesné, ale pro většinu her funguje dostatečně dobře a dává větší " -"zrychlení než EFB do RAM.\n" +"Toto není přesné, ale pro většinu her funguje dostatečně dobře a dává větší zrychlení než EFB do RAM.\n" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." @@ -5593,7 +5421,7 @@ msgstr "Vytvořit Snímek Obrazovky" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "TaruKonga (Bongos)" -msgstr "" +msgstr "TaruKonga (Bonga)" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" @@ -5640,12 +5468,8 @@ 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 "" -"Soubor %s nemohl být otevřen pro zápis. Zkontrolujte, prosím, je-li už " -"otevřen jiným programem." +msgid "The file %s could not be opened for writing. Please check if it's already opened by another program." +msgstr "Soubor %s nemohl být otevřen pro zápis. Zkontrolujte, prosím, je-li už otevřen jiným programem." #: Source/Core/AudioCommon/Src/WaveFile.cpp:44 #, c-format @@ -5671,13 +5495,11 @@ msgstr "Výsledný rozšifrovaný kód AR neobsahuje žádné řádky." #: 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 "" -"Čím bezpečnější toto bude, tím bude méně pravděpodobné, že emulátoru budou " -"chybět jakékoliv aktualizace textur z RAM.\n" +"Čím bezpečnější toto bude, tím bude méně pravděpodobné, že emulátoru budou chybět jakékoliv aktualizace textur z RAM.\n" "\n" "Pokud si nejste jisti, použijte druhou nejrychlejší hodnotu zprava." @@ -5686,12 +5508,8 @@ msgid "The save you are trying to copy has an invalid file size" msgstr "Uložená hra, kterou se snažíte zkopírovat má neplatnou délku souboru" #: Source/Core/DolphinWX/Src/Main.cpp:353 -msgid "" -"The selected language is not supported by your system. Falling back to " -"system default." -msgstr "" -"Zvolený jazyk není Vašim systémem podporován. Vracím se na výchozí jazyk " -"systému." +msgid "The selected language is not supported by your system. Falling back to system default." +msgstr "Zvolený jazyk není Vašim systémem podporován. Vracím se na výchozí jazyk systému." #: Source/Core/Core/Src/NetPlayClient.cpp:43 msgid "The server and client's NetPlay versions are incompatible!" @@ -5727,12 +5545,8 @@ msgid "Theme selection went wrong" msgstr "Výběr vzhledu se zvrtl" #: 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 "" -"Musí existovat lístek pro 00000001/00000002. Vaše NAND vypsání je " -"pravděpodobně neúplné" +msgid "There must be a ticket for 00000001/00000002. Your NAND dump is probably incomplete." +msgstr "Musí existovat lístek pro 00000001/00000002. Vaše NAND vypsání je pravděpodobně neúplné" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "" @@ -5743,12 +5557,8 @@ msgstr "" "Neurčený znamená, že hra použije nastavení Dolphin." #: Source/Core/Core/Src/ActionReplay.cpp:356 -msgid "" -"This action replay simulator does not support codes that modify Action " -"Replay itself." -msgstr "" -"Tento simulátor action replay nepodporuje kód, který mění samotný Action " -"Replay." +msgid "This action replay simulator does not support codes that modify Action Replay itself." +msgstr "Tento simulátor action replay nepodporuje kód, který mění samotný Action Replay." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." @@ -5757,18 +5567,12 @@ msgstr "Toto může způsobit zpomalení ve Wii Menu a v některých hrách." #: 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 "" "Tato funkce Vám umožňuje si pohrát s herní kamerou.\n" -"Podržte pravé tlačítko myši a pohybujte s ní pro změnu pohledu kamery. " -"Podržte SHIFT a zmáčkněte jednu z kláves WASD, abyste kamerou pohnuli v " -"určité vzdálenosti kroku (SHIFT+0 pro rychlejší pohyb a SHIFT+9 pro " -"pomalejší). Stiskněte SHIFT+R k resetu kamery.\n" +"Podržte pravé tlačítko myši a pohybujte s ní pro změnu pohledu kamery. Podržte SHIFT a zmáčkněte jednu z kláves WASD, abyste kamerou pohnuli v určité vzdálenosti kroku (SHIFT+0 pro rychlejší pohyb a SHIFT+9 pro pomalejší). Stiskněte SHIFT+R k resetu kamery.\n" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." @@ -5788,19 +5592,15 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." -msgstr "" -"Toto se používá pro přehrávání hudebních stop, jako např. hudba v pozadí." +msgstr "Toto se používá pro přehrávání hudebních stop, jako např. hudba v pozadí." #: 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 "" "Toto rozdělí vlákna Obrazu a Procesoru, takže běží na oddělených jádrech.\n" -"Způsobí výrazné zvýšení rychlosti na PC s více než jedním jádrem, ale také " -"může způsobovat občasné chyby/pády." +"Způsobí výrazné zvýšení rychlosti na PC s více než jedním jádrem, ale také může způsobovat občasné chyby/pády." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 msgid "This will let you Manually Edit the INI config file" @@ -5874,7 +5674,8 @@ msgstr "Pokus o načtení souboru neznámého typu." msgid "Triggers" msgstr "Spínače" -#: 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 "Pokus o čtení z neplatného SYSCONF" @@ -5926,12 +5727,10 @@ 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 "" -"Nelze analyzovat řádek %lu zadaného kódu AR jako platný zašifrovaný nebo " -"rozšifrovaný kód. Ujistěte se, že jste ho správně zadali.\n" +"Nelze analyzovat řádek %lu zadaného kódu AR jako platný zašifrovaný nebo rozšifrovaný kód. Ujistěte se, že jste ho správně zadali.\n" "Chtěli byste tento řádek ignorovat a pokračovat v analýze?" #: Source/Core/DolphinWX/Src/FrameTools.cpp:404 @@ -6025,22 +5824,19 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Použít více vláken k dekódování textur.\n" -"Může vést ke zrychlení (zvláště u procesorů, která mají více než dvě " -"jádra).\n" +"Může vést ke zrychlení (zvláště u procesorů, která mají více než dvě jádra).\n" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." #: 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 "" "Normálně pokud kompilace shadera selže, je zobrazena chybová zpráva.\n" -"Nicméně, zaškrtnutím této možnosti tyto vyskakovací okna přeskočíte, což Vám " -"umožní nepřerušované hraní.\n" +"Nicméně, zaškrtnutím této možnosti tyto vyskakovací okna přeskočíte, což Vám umožní nepřerušované hraní.\n" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." @@ -6143,38 +5939,35 @@ msgstr "" #: 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 "" +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 "Varování: Načetli jste uloženou pozici, která je umístěna po skončení současného filmu. (bajt %u > %u) (snímek %u > %u). Před pokračováním byste měli načíst jinou pozici, nebo tento stav načíst bez zapnutého režimu pouze pro čtení." #: 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 "" +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 "Varování: Načetli jste uloženou pozici, jejíž film má neshodu v bajtu %d (0x%X). Před pokračováním byste měli načíst jinou pozici, nebo tento stav načíst bez zapnutého režimu pouze pro čtení. Jinak pravděpodobně dojde k desynchronizaci." #: 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" +"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" +"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" +"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" +"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 "" +"Varování: Načetli jste uloženou pozici, jejíž film má neshodu ve snímku %d. Před pokračováním byste měli načíst jinou pozici, nebo tento stav načíst bez zapnutého režimu pouze pro čtení. Jinak pravděpodobně dojde k desynchronizaci.\n" +"\n" +"Další informace: Současný film je dlouhý %d snímků a uložený stav filmu je dlouhý %d snímků.\n" +"\n" +"Ve snímku %d současný film stiskává:\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" +"Na snímku %d, film uloženého stavu stiskává:\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" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 @@ -6369,9 +6162,7 @@ msgstr "Musíte zadat jméno!" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 msgid "You must enter a valid decimal, hexadecimal or octal value." -msgstr "" -"Musíte zadat platnou hodnotu v desítkové, šestnáctkové nebo osmičkové " -"soustavě." +msgstr "Musíte zadat platnou hodnotu v desítkové, šestnáctkové nebo osmičkové soustavě." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 msgid "You must enter a valid profile name." @@ -6437,19 +6228,14 @@ msgstr "[Vlastní]" #: 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 "" "[EXPERIMENTÁLNÍ]\n" -"Usiluje o zrychlení emulace tím, že dekódování textury přenechá grafickému " -"procesoru použitím struktury OpenCL.\n" -"Nicméně v tuto dobu je známo, že způsobuje vady textur v různých hrách. Také " -"je ve většině případů pomalejší, než normální dekódování textur přes " -"procesor.\n" +"Usiluje o zrychlení emulace tím, že dekódování textury přenechá grafickému procesoru použitím struktury OpenCL.\n" +"Nicméně v tuto dobu je známo, že způsobuje vady textur v různých hrách. Také je ve většině případů pomalejší, než normální dekódování textur přes procesor.\n" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." @@ -6462,8 +6248,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "[EXPERIMENTÁLNÍ]\n" -"Trochu zrychlí emulaci ukládáním předvytvořených objektů do vyrovnávací " -"paměti\n" +"Trochu zrychlí emulaci ukládáním předvytvořených objektů do vyrovnávací paměti\n" "Může ale také způsobovat problémy\n" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." From 6961c2e553c863bc82ae8111884cd771fae6bc51 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Tue, 20 Dec 2011 17:26:22 -0600 Subject: [PATCH 08/14] Update Hungarian and Turkish translations. --- Languages/po/fr.po | 1524 +++++++++++++++++++++++++++++++------------- Languages/po/hu.po | 130 ++++ Languages/po/tr.po | 507 +++++++++------ 3 files changed, 1530 insertions(+), 631 deletions(-) diff --git a/Languages/po/fr.po b/Languages/po/fr.po index 891787bfb0..5af84de44e 100644 --- a/Languages/po/fr.po +++ b/Languages/po/fr.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-28 23:40+0100\n" ======= @@ -18,6 +19,10 @@ msgstr "" ======= "PO-Revision-Date: 2011-10-28 23:40+0100\n" >>>>>>> Update french translation. +======= +"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. "Last-Translator: Pascal\n" "Language-Team: \n" "Language: French\n" @@ -51,16 +56,17 @@ 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\" n'est pas un fichier GCM/ISO valide, ou n'est pas une ISO GC/Wii." +msgstr "" +"\"%s\" n'est pas un fichier GCM/ISO valide, ou n'est pas une ISO GC/Wii." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:193 #, c-format msgid "%1$sCopy%1$s" msgstr "%1$sCopie%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:363 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:614 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:615 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -106,7 +112,8 @@ msgid "" "file is not large enough to be a valid memory card file (0x%x bytes)" msgstr "" "%s n'a pas pu être chargé en tant que carte mémoire.\n" -"Le fichier n'est pas assez grand pour être un fichier de carte mémoire valide (0x%x octets)" +"Le fichier n'est pas assez grand pour être un fichier de carte mémoire " +"valide (0x%x octets)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 #, c-format @@ -187,11 +194,11 @@ msgstr "Gestionnaire de &cheats" msgid "&DSP Settings" msgstr "Paramètres &DSP (audio)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:995 msgid "&Delete ISO..." msgstr "&Supprimer l'ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1012 msgid "&Delete selected ISOs..." msgstr "&Supprimer les ISO sélectionnés" @@ -255,7 +262,7 @@ msgstr "&Pause" msgid "&Play" msgstr "&Démarrer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:977 msgid "&Properties" msgstr "&Propriétés" @@ -299,7 +306,7 @@ msgstr "&Affichage" msgid "&Wiimote Settings" msgstr "Paramètres de la &Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:978 msgid "&Wiki" msgstr "&Wiki" @@ -348,11 +355,10 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "" msgstr "" @@ -378,11 +384,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" @@ -396,16 +404,19 @@ msgstr "" " - Dual Core désactivé\n" " - Audio Throttle désactivé\n" " - DSP-HLE avec \"Null Audio\" ou le DSL-LLE\n" -" - Spécifier manuellement le nombre de contôleurs qui seront utilisés dans [Contrôleur standard]\n" +" - Spécifier manuellement le nombre de contôleurs qui seront utilisés dans " +"[Contrôleur standard]\n" "\n" -"Tous les joueurs devraient essayer d'utiliser la même version de Dolphin et les mêmes paramètres.\n" -"Désactiver toutes les cartes mémoires, ou sinon les envoyer à tous les joueurs avant de démarrer.\n" +"Tous les joueurs devraient essayer d'utiliser la même version de Dolphin et " +"les mêmes paramètres.\n" +"Désactiver toutes les cartes mémoires, ou sinon les envoyer à tous les " +"joueurs avant de démarrer.\n" "La prise en charge de la Wiimote n'est pas encore implémentée.\n" "\n" "Vous devez indiquer le port TCP à l'hôte !!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "AM-Baseboard" msgstr "AM-Baseboard" @@ -440,17 +451,18 @@ msgstr "Emulation fidèle VBeam" >>>>>>> Update french translation. 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 "" "Emule fidèlement les copies d'EFB.\n" -"Certains jeux requièrent ceci pour certains effets graphiques ou fonctionnalités dans le jeu.\n" +"Certains jeux requièrent ceci pour certains effets graphiques ou " +"fonctionnalités dans le jeu.\n" "\n" "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" @@ -471,33 +483,51 @@ msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:669 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" -msgstr "Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans le code Ajout (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" +msgstr "" +"Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans le " +"code Ajout (%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 "Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans le code Remplir et déplacer (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " +"(%s)" +msgstr "" +"Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans le " +"code Remplir et déplacer (%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 "Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans l'écriture de la RAM et Remplir (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " +"Fill (%s)" +msgstr "" +"Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans " +"l'écriture de la RAM et Remplir (%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 "Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans Ecrire vers Pointeur (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Write To " +"Pointer (%s)" +msgstr "" +"Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans Ecrire " +"vers Pointeur (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:803 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" -msgstr "Erreur Action Replay : Valeur non valide (%08x) dans la Copie de mémoire (%s)" +msgstr "" +"Erreur Action Replay : Valeur non valide (%08x) dans la Copie de mémoire (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:684 #, c-format -msgid "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" -msgstr "Erreur Action Replay : Master Code et Write To CCXXXXXX non implémentés (%s)" +msgid "" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +msgstr "" +"Erreur Action Replay : Master Code et Write To CCXXXXXX non implémentés (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:196 #, c-format @@ -533,11 +563,11 @@ msgstr "Carte :" msgid "Add" msgstr "Ajouter" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1212 msgid "Add ActionReplay Code" msgstr "Ajouter un code ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1141 msgid "Add Patch" msgstr "Ajouter un patch" @@ -545,6 +575,7 @@ msgstr "Ajouter un patch" msgid "Add new pane" msgstr "Ajouter un nouveau panneau" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -554,6 +585,11 @@ msgstr "Ajouter un nouveau panneau" #: 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:411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +>>>>>>> Update Hungarian and Turkish translations. msgid "Add..." msgstr "Ajouter..." @@ -565,14 +601,16 @@ msgstr "Adresse :" 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." msgstr "" "Ajoute la valeur spécifiée au paramètre zFar.\n" "Il y a 2 façons d'indiquer les valeurs en virgule flottante.\n" -"Exemple : entrer \"'200\" ou \"0.0002\" directement produit le même effet, la valeur retenue sera \"0.0002\".\n" +"Exemple : entrer \"'200\" ou \"0.0002\" directement produit le même effet, " +"la valeur retenue sera \"0.0002\".\n" "Valeurs : (0->+/- Integer) ou (0->+/-FP[précision à 6 chiffres])\n" "\n" "NOTE: Consultez LogWindow/Console pour les valeurs acquises." @@ -581,27 +619,30 @@ 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." msgstr "" "Ajoute la valeur spécifiée au paramètre zNear.\n" "Il y a 2 façons d'indiquer les valeurs en virgule flottante.\n" -"Exemple : entrer \"'200\" ou \"0.0002\" directement produit le même effet, la valeur retenue sera \"0.0002\".\n" +"Exemple : entrer \"'200\" ou \"0.0002\" directement produit le même effet, " +"la valeur retenue sera \"0.0002\".\n" "Valeurs : (0->+/- Integer) ou (0->+/-FP[précision à 6 chiffres])\n" "\n" "NOTE: Consultez LogWindow/Console pour les valeurs acquises." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 msgid "Adjust the analog control pressure required to activate buttons." -msgstr "Ajuste le contrôle analogique de pression requise pour activer les boutons." +msgstr "" +"Ajuste le contrôle analogique de pression requise pour activer les boutons." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Advanced" msgstr "Avancé" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:556 msgid "Advanced Settings" msgstr "Paramètres avancés" @@ -609,14 +650,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:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 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:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1294 msgid "All Gamecube GCM files (gcm)" msgstr "Tous les fichiers GameCube GCM (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -624,28 +666,34 @@ msgstr "Tous les fichiers 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:1459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +>>>>>>> Update Hungarian and Turkish translations. msgid "All Save States (sav, s##)" msgstr "Tous les états sauvegardés (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1292 msgid "All Wii ISO files (iso)" msgstr "Tous les fichiers ISO Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1312 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Tous les fichiers ISO compressés GC/Wii (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:96 msgid "All files (*.*)|*.*" msgstr "Tous les fichiers (*.*)|*.*" #: 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 "" -"Permet d'activer certaines options via les raccourcis clavier 3, 4, 5, 6 et 7 dans la fenêtre d'émulation.\n" +"Permet d'activer certaines options via les raccourcis clavier 3, 4, 5, 6 et " +"7 dans la fenêtre d'émulation.\n" "\n" "Dans le doute, décochez cette case." @@ -680,7 +728,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:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 msgid "Apploader:" msgstr "Apploader :" @@ -694,11 +742,12 @@ msgid "" "\n" "If unsure, select (off)." msgstr "" -"Appliquer un effet de post-processing après avoir fini le rendu d'une image.\n" +"Appliquer un effet de post-processing après avoir fini le rendu d'une " +"image.\n" "\n" "Dans le doute, sélectionnez (aucun)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 msgid "Arabic" msgstr "Arabe" @@ -707,7 +756,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:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1121 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -715,15 +764,21 @@ msgstr "" "Êtes-vous sûr de vouloir supprimer ces fichiers ?\n" "Ils seront définitivement supprimés !" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1112 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 !" +msgstr "" +"Êtes-vous sûr de vouloir supprimer ce fichier ? Il sera supprimé " +"définitivement !" +<<<<<<< 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:725 +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Format d'écran :" @@ -732,11 +787,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:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Audio Backend:" msgstr "Moteur audio :" @@ -744,11 +799,15 @@ msgstr "Moteur audio :" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon : impossible d'ouvrir le périphérique 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:238 +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -782,8 +841,10 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"Génère automatiquement des mipmaps plutôt que de les décoder depuis la mémoire.\n" -"Améliore un peu les performances mais peut provoquer des défauts mineurs de texture.\n" +"Génère automatiquement des mipmaps plutôt que de les décoder depuis la " +"mémoire.\n" +"Améliore un peu les performances mais peut provoquer des défauts mineurs de " +"texture.\n" "\n" "Dans le doute, cochez cette case." @@ -791,7 +852,7 @@ msgstr "" msgid "Back" msgstr "Retour" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Backend Settings" msgstr "Paramètres de l'interface audio" @@ -801,7 +862,7 @@ msgid "Backend:" msgstr "Moteur :" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:92 msgid "Background Input" msgstr "Entrée en arrière-plan" @@ -814,15 +875,15 @@ msgid "Bad File Header" msgstr "Mauvaise entête de fichier" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:291 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:255 msgid "Banner" msgstr "Bannière" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:526 msgid "Banner Details" msgstr "Détails de la bannière" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Banner:" msgstr "Bannière :" @@ -834,7 +895,7 @@ msgstr "Barre" msgid "Basic" msgstr "Paramètres de base" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Basic Settings" msgstr "Paramètres de base" @@ -844,7 +905,9 @@ msgstr "Basse" #: Source/Core/Core/Src/HW/GCMemcard.cpp:188 msgid "Block Allocation Table checksum failed" -msgstr "Echec de la vérification de la somme de contrôle de la Table d'Allocation de Blocs" +msgstr "" +"Echec de la vérification de la somme de contrôle de la Table d'Allocation de " +"Blocs" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Blocks" @@ -864,10 +927,14 @@ msgstr "Bleu Droite" #: 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:272 +>>>>>>> Update Hungarian and Turkish translations. msgid "Bottom" msgstr "Bas" @@ -876,7 +943,7 @@ msgstr "Bas" msgid "Bound Controls: %lu" msgstr "Contrôles liés : %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:342 msgid "Broken" msgstr "Corrompu" @@ -884,7 +951,7 @@ msgstr "Corrompu" msgid "Browse" msgstr "Parcourir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:242 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:206 msgid "Browse for a directory to add" msgstr "Choisir un dossier à ajouter" @@ -892,7 +959,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:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1187 msgid "Browse for output directory" msgstr "Parcourir un dossier de destination" @@ -900,11 +967,15 @@ msgstr "Parcourir un dossier de destination" 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:68 +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -914,11 +985,11 @@ msgstr "Boutons" msgid "C Stick" msgstr "Stick-C" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:74 msgid "C-Stick" msgstr "Stick-C" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "CPU Emulator Engine" msgstr "Moteur d'émulation du CPU" @@ -929,12 +1000,17 @@ msgstr "Cache des listes d'affichage" #: 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 "" -"Calcule la profondeur par pixel des valeurs des graphiques 3D plutôt que par vertex.\n" -"Contrairement à l'éclairage par pixel (qui est une bonne amélioration), les calculs de profondeur par pixel sont nécessaires pour émuler correctement un petit nombre de jeux.\n" +"Calcule la profondeur par pixel des valeurs des graphiques 3D plutôt que par " +"vertex.\n" +"Contrairement à l'éclairage par pixel (qui est une bonne amélioration), les " +"calculs de profondeur par pixel sont nécessaires pour émuler correctement un " +"petit nombre de jeux.\n" "\n" "Dans le doute, cochez cette case." @@ -947,8 +1023,10 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Calcule la lumière des graphiques 3D par pixel et non par vertex.\n" -"Diminue la vitesse d'émulation de quelques pourcents (en fonction de votre GPU).\n" -"Cette amélioration est plutôt sûre, mais peut parfois provoquer quelques pépins.\n" +"Diminue la vitesse d'émulation de quelques pourcents (en fonction de votre " +"GPU).\n" +"Cette amélioration est plutôt sûre, mais peut parfois provoquer quelques " +"pépins.\n" "\n" "Dans le doute, décochez cette case." @@ -964,11 +1042,16 @@ 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." +msgstr "" +"Impossible de désenregistrer des évènements alors qu'il y en a en attente." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1016 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -979,7 +1062,7 @@ msgstr "" "%s\n" "n'est pas un fichier de carte mémoire GameCube valide." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1039 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -990,7 +1073,8 @@ msgstr "" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1858 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" -msgstr "Impossible de trouver la Wiimote par bd : %02x:%02x:%02x:%02x:%02x:%02x" +msgstr "" +"Impossible de trouver la Wiimote par bd : %02x:%02x:%02x:%02x:%02x:%02x" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1872 #, c-format @@ -1002,13 +1086,14 @@ msgstr "Impossible de trouver la Wiimote par le gestionnaire de connexion %02x" #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" -msgstr "Impossible de lire à partir de DVD_Plugin - DVD-Interface : Erreur fatale" +msgstr "" +"Impossible de lire à partir de DVD_Plugin - DVD-Interface : Erreur fatale" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:49 msgid "Caps Lock" msgstr "Verr Maj" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 msgid "Catalan" msgstr "Catalan" @@ -1025,7 +1110,6 @@ 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" @@ -1033,7 +1117,7 @@ msgstr "Changer de disque" msgid "Change Game" msgstr "Changer de Jeu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1049,8 +1133,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:506 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "Changing this will have no effect while the emulator is running!" msgstr "Changer ceci n'aura aucun effet durant l'émulation !" @@ -1070,31 +1154,31 @@ msgstr "Rechercher un cheat" msgid "Cheats Manager" msgstr "Gestionnaire de Cheats" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "Chinese (Simplified)" msgstr "Chinois (simplifié)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Chinese (Traditional)" msgstr "Chinois (traditionnel)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "Choose a DVD root directory:" msgstr "Choisir un dossier racine pour le DVD :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "Choose a NAND root directory:" msgstr "Choisir un dossier racine pour la NAND :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 msgid "Choose a default ISO:" msgstr "Choisir un ISO par défaut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1163 msgid "Choose a directory to add" msgstr "Choisir un dossier à ajouter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1003 msgid "Choose a file to open" msgstr "Choisir un fichier à ouvrir" @@ -1102,25 +1186,32 @@ msgstr "Choisir un fichier à ouvrir" msgid "Choose a memory card:" msgstr "Choisir une carte mémoire :" +<<<<<<< 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:755 +>>>>>>> Update Hungarian and Turkish translations. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" "Choisir un fichier comme apploader : (uniquement pour les disques créés à " "partir de dossiers)" +<<<<<<< HEAD ======= msgid "Choose file to use as apploader: (applies to discs constructed from directories only)" msgstr "Choisir un fichier comme apploader : (uniquement pour les disques créés à partir de dossiers)" >>>>>>> Update french translation. +======= +>>>>>>> Update Hungarian and Turkish translations. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:764 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:803 msgid "Choose the folder to extract to" msgstr "Choisir le dossier de destination de l'extraction" @@ -1139,21 +1230,29 @@ msgstr "Classique" msgid "Clear" msgstr "Effacer" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:173 msgid "Clear failed." msgstr "Echec de l'éffacement" #: Source/Core/Core/Src/NetPlayServer.cpp:259 -msgid "Client disconnect while game is running!! NetPlay is disabled. You must manually stop the game." -msgstr "Le client s'est déconnecté alors que le jeu est en cours !! NetPlay est désactivé. Vous devez arrêter le jeu manuellement." +msgid "" +"Client disconnect while game is running!! NetPlay is disabled. You must " +"manually stop the game." +msgstr "" +"Le client s'est déconnecté alors que le jeu est en cours !! NetPlay est " +"désactivé. Vous devez arrêter le jeu manuellement." #: 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:559 +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Fermer" @@ -1178,20 +1277,20 @@ msgstr "Commande" msgid "Comment" msgstr "Commentaire" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Comment:" msgstr "Commentaire :" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1002 msgid "Compress ISO..." msgstr "Compresser l'ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1014 msgid "Compress selected ISOs..." msgstr "Compresser les ISO sélectionnés..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 msgid "Compressing ISO" msgstr "Compression de l'ISO" @@ -1218,13 +1317,13 @@ msgstr "Configurer les manettes" msgid "Configure..." msgstr "Configurer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1229 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1257 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1322 msgid "Confirm File Overwrite" msgstr "Confirmer l'écrasement du fichier" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:576 msgid "Confirm on Stop" msgstr "Confirmer l'arrêt de l'émulation" @@ -1233,7 +1332,7 @@ msgstr "Confirmer l'arrêt de l'émulation" msgid "Connect" msgstr "Connecter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Connect USB Keyboard" msgstr "Connecter le clavier USB" @@ -1243,30 +1342,30 @@ 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 #: 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:598 +>>>>>>> Update Hungarian and Turkish translations. msgid "Connecting..." msgstr "Connexion..." @@ -1291,7 +1390,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:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Core" msgstr "Core" @@ -1307,15 +1406,22 @@ msgstr "Impossible d'initialiser le moteur %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." -msgstr "Impossible de lire \"%s\". Il n'y a pas de disque dans le lecteur, ou ce n'est pas un backup GC/Wii. Veuillez noter que les disques originaux de GameCube et Wii ne peuvent pas être plus par la plupart des lecteurs DVD sur PC." +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 "" +"Impossible de lire \"%s\". Il n'y a pas de disque dans le lecteur, ou ce " +"n'est pas un backup GC/Wii. Veuillez noter que les disques originaux de " +"GameCube et Wii ne peuvent pas être plus par la plupart des lecteurs DVD sur " +"PC." #: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format msgid "Could not recognize ISO file %s" msgstr "Impossible de reconnaître le fichier ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:576 #, c-format msgid "Could not save %s" msgstr "Impossible de sauvegarder %s" @@ -1325,21 +1431,25 @@ 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 "" -"Impossible de définir les manettes. Le joueur a quitté le jeu ou le jeu est en cours d'exécution !\n" -"(le paramétrage des manettes pendant l'émulation du jeu n'est pas encore pris en charge)" +"Impossible de définir les manettes. Le joueur a quitté le jeu ou le jeu est " +"en cours d'exécution !\n" +"(le paramétrage des manettes pendant l'émulation du jeu n'est pas encore " +"pris en charge)" #: 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 "" "Impossible d'écrire le fichier de carte mémoire %s.\n" "\n" -"Exécutez-vous Dolpin à partir d'un CD/DVD, ou le fichier de sauvegarde est peut-être protégé contré l'écriture ?" +"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:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1044 msgid "Couldn't find open command for extension 'ini'!" msgstr "Impossible de trouver la commande d'ouverture pour l'extension 'ini' !" @@ -1356,7 +1466,7 @@ msgstr "" msgid "Count:" msgstr "Nombre :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 msgid "Country:" msgstr "Pays :" @@ -1370,30 +1480,37 @@ msgstr "Créer un code AR" msgid "Create new perspective" msgstr "Créer une nouvelle perspective" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "Created by KDE-Look.org" msgstr "Créé par 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:491 +>>>>>>> Update Hungarian and Turkish translations. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Créé par Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +<<<<<<< HEAD ======= msgid "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "Créé par Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" >>>>>>> Update french translation. +======= +>>>>>>> Update Hungarian and Turkish translations. -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 msgid "Created by VistaIcons.com" msgstr "Créé par VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "Créé par black_rider et publié sur ForumW.org > Web Developments" @@ -1428,7 +1545,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:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "Custom Projection Hack" msgstr "Hack de projection personnalisé" @@ -1436,15 +1553,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:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Customize some Orthographic Projection parameters." msgstr "Personnalise certains paramètres de projection orthographique." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Czech" msgstr "Tchèque" -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:89 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "D-Pad" msgstr "Pad numérique" @@ -1452,28 +1569,32 @@ msgstr "Pad numérique" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:598 msgid "DSP Emulator Engine" msgstr "Moteur d'émulation du DSP (Audio)" #: 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:248 +>>>>>>> Update Hungarian and Turkish translations. msgid "DSP HLE emulation (fast)" msgstr "Emulation du DSP en HLE (rapide)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 msgid "DSP LLE interpreter (slow)" msgstr "Interpréteur du DSP en LLE (lent)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 msgid "DSP LLE on Thread" msgstr "DSP LLE sur thread" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "DSP LLE recompiler" msgstr "Recompilateur du DSP en LLE" @@ -1481,7 +1602,7 @@ msgstr "Recompilateur du DSP en LLE" msgid "DSP settings" msgstr "Paramètres DSP (audio)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 msgid "DVD Root:" msgstr "Racine du DVD :" @@ -1489,7 +1610,7 @@ msgstr "Racine du DVD :" msgid "Data Size" msgstr "Taille des données" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Date:" msgstr "Date :" @@ -1518,16 +1639,16 @@ msgstr "Débug" msgid "Decimal" msgstr "Décimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1000 msgid "Decompress ISO..." msgstr "Décompresser l'ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1015 msgid "Decompress selected ISOs..." msgstr "Décompresser les ISO sélectionnés..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1326 msgid "Decompressing ISO" msgstr "Décompression de l'ISO" @@ -1535,7 +1656,7 @@ msgstr "Décompression de l'ISO" msgid "Default" msgstr "Par défaut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:771 msgid "Default ISO:" msgstr "ISO par défaut :" @@ -1567,16 +1688,20 @@ msgstr "Détecter" #: 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 "Détecté que le DVD a essayé de lire plus de données que ce que peut contenir le buffer de sortie." +msgid "" +"Detected attempt to read more data from the DVD than fit inside the out " +"buffer. Clamp." +msgstr "" +"Détecté que le DVD a essayé de lire plus de données que ce que peut contenir " +"le buffer de sortie." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 msgid "Device" msgstr "Appareil" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 msgid "Device Settings" msgstr "Paramètres de la console virtuelle" @@ -1624,24 +1749,30 @@ msgstr "Désactiver les textures" #: 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 "" "Désactive l'émulation des XFB.\n" -"Accélère beaucoup l'émulation mais provoque de gros pépins dans les nombreux jeux s'appuyant dessus (particulièrement les applications homebrew).\n" +"Accélère beaucoup l'émulation mais provoque de gros pépins dans les nombreux " +"jeux s'appuyant dessus (particulièrement les applications homebrew).\n" "\n" "Dans le doute, cochez cette case." #: 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 "" "Désactive l'émulation de copies d'EFB.\n" -"Elles sont souvent utilisées pour du post-processing ou des effets de rendu sur texture, donc cocher cette case va beaucoup accélérer l'émulation mais aussi provoquer des pépins.\n" +"Elles sont souvent utilisées pour du post-processing ou des effets de rendu " +"sur texture, donc cocher cette case va beaucoup accélérer l'émulation mais " +"aussi provoquer des pépins.\n" "\n" "Dans le doute, décochez cette case." @@ -1655,7 +1786,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Disc" msgstr "Disque" @@ -1682,15 +1813,19 @@ msgstr "" msgid "Divide" msgstr "Diviser" +<<<<<<< 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:1052 +>>>>>>> Update Hungarian and Turkish translations. msgid "Do you want to stop the current emulation?" msgstr "Voulez-vous arrêter l'émulation en cours ?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:919 msgid "Dolphin" msgstr "Dolphin" @@ -1715,6 +1850,7 @@ msgstr "Configuration de la Wiimote pour Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1730,6 +1866,14 @@ msgstr "Configuration de la manette GC pour 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:1204 +msgid "Dolphin GCPad Configuration" +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. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Films TAS Dolphin (*.dtm)" @@ -1741,18 +1885,23 @@ msgstr "Configuration de la Wiimote pour Dolphin" msgid "Dolphin at &Google Code" msgstr "Dolphin dans &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:303 +>>>>>>> Update Hungarian and Turkish translations. msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." msgstr "" "Dolphin n'a pas trouvé d'ISO GC/Wii. Double-cliquez ici pour chercher des " "fichiers..." +<<<<<<< HEAD ======= msgid "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for files..." msgstr "Dolphin n'a pas trouvé d'ISO GC/Wii. Double-cliquez ici pour chercher des fichiers..." @@ -1764,16 +1913,23 @@ msgstr "Dolphin n'a pas trouvé d'ISO GC/Wii. Double-cliquez ici pour chercher d #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. +======= + +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 +>>>>>>> Update Hungarian and Turkish translations. msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." msgstr "" "Dolphin est paramétré pour cacher tous les jeux. Double-cliquez ici pour " "afficher tous les jeux..." +<<<<<<< HEAD ======= msgid "Dolphin is currently set to hide all games. Doubleclick here to show all games..." msgstr "Dolphin est paramétré pour cacher tous les jeux. Double-cliquez ici pour afficher tous les jeux..." >>>>>>> Update french translation. +======= +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 @@ -1797,7 +1953,7 @@ msgstr "Percussions" msgid "Dummy" msgstr "Factice" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Dump Audio" msgstr "Enregistrer le son" @@ -1819,7 +1975,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Copier toutes les images rendues (calculées) dans un fichier AVI dans User/Dump/Frames/\n" +"Copier toutes les images rendues (calculées) dans un fichier AVI dans User/" +"Dump/Frames/\n" "\n" "Dans le doute, décochez cette case." @@ -1843,6 +2000,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1852,6 +2010,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:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +>>>>>>> Update Hungarian and Turkish translations. msgid "Dutch" msgstr "Néerlandais" @@ -1865,8 +2028,16 @@ msgstr "Copies de l'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 "ERREUR : cette version de Dolphin requiert un pilote TAP-Win32 qui ait au moins la version %d.%d -- Si vous avez récemment mis à niveau votre distribution de Dolphin, un redémarrage est probablement nécessaire pour que Windows charge le nouveau pilote." +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 "" +"ERREUR : cette version de Dolphin requiert un pilote TAP-Win32 qui ait au " +"moins la version %d.%d -- Si vous avez récemment mis à niveau votre " +"distribution de Dolphin, un redémarrage est probablement nécessaire pour que " +"Windows charge le nouveau pilote." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 msgid "EUROPE" @@ -1896,8 +2067,8 @@ msgstr "Editer le patch" msgid "Edit current perspective" msgstr "Modifier la perspective actuelle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:410 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:432 msgid "Edit..." msgstr "Editer..." @@ -1909,38 +2080,45 @@ msgstr "Effets" msgid "Embedded Frame Buffer" msgstr "Buffer d'image embarqué" -#: Source/Core/Core/Src/Core.cpp:174 +#: Source/Core/Core/Src/Core.cpp:173 msgid "Emu Thread already running" msgstr "Thread d'émulation déjà en cours d'exécution" #: 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 "" "Emule précisément les XFB.\n" -"Ralentit beaucoup l'émulation et empêche le rendu en haute résolution, mais est nécessaire pour émuler certains jeux correctement.\n" +"Ralentit beaucoup l'émulation et empêche le rendu en haute résolution, mais " +"est nécessaire pour émuler certains jeux correctement.\n" "\n" "Dans le doute, sélectionnez plutôt Virtuel." #: 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 "" "Emule les XFB en utilisant les objets de texture du GPU.\n" -"Corrige beaucoup de jeux qui ne fonctionnent pas sans émulation de XFB, sans être aussi lent qu'une réelle émulation de l'XFB. Cependant, cela peut ne pas fonctionner pour beaucoup d'autres jeux (particulièrement les applications homebrew).\n" +"Corrige beaucoup de jeux qui ne fonctionnent pas sans émulation de XFB, sans " +"être aussi lent qu'une réelle émulation de l'XFB. Cependant, cela peut ne " +"pas fonctionner pour beaucoup d'autres jeux (particulièrement les " +"applications homebrew).\n" "Dans le doute, sélectionnez cette case." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 msgid "Emulated Wiimote" msgstr "Wiimote émulée" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "Emulation State: " msgstr "Etat de l'émulation :" @@ -1950,13 +2128,15 @@ msgstr "Activer" #: 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 "" -"Active les effets 3D via la stéréoscopie en utilisant la technologie nVidia 3D Vision, si elle est prise en charge par votre GPU.\n" +"Active les effets 3D via la stéréoscopie en utilisant la technologie nVidia " +"3D Vision, si elle est prise en charge par votre GPU.\n" "Peut provoquer des pépins.\n" "Ne fonctionne qu'en plein écran.\n" "\n" @@ -1966,7 +2146,7 @@ msgstr "" msgid "Enable AR Logging" msgstr "Activer la journalisation AR" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "Enable Audio Throttle" msgstr "Activer le contrôle audio" @@ -1978,6 +2158,7 @@ msgstr "Activer BAT" msgid "Enable Block Merging" msgstr "Activer l'assemblage de blocs" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" @@ -1985,19 +2166,25 @@ msgstr "" ======= >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Activer le 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:536 +>>>>>>> Update Hungarian and Turkish translations. msgid "Enable Cheats" msgstr "Activer les Cheats" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 msgid "Enable DTK Music" msgstr "Activer la musique DTK" @@ -2005,7 +2192,7 @@ msgstr "Activer la musique DTK" msgid "Enable Dual Core" msgstr "Activer le Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Enable Dual Core (speedup)" msgstr "Activer le Dual Core (plus rapide)" @@ -2017,7 +2204,7 @@ msgstr "Activer les touches de raccourci" msgid "Enable Idle Skipping" msgstr "Activer le saut d'inactivité" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Enable Idle Skipping (speedup)" msgstr "Activer le saut d'inactivité (plus rapide)" @@ -2030,7 +2217,7 @@ msgstr "Activer le MMU" msgid "Enable Progressive Scan" msgstr "Activer le Progressive Scan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:712 msgid "Enable Screen Saver" msgstr "Activer l'économiseur d'écran" @@ -2051,14 +2238,19 @@ msgid "" "If unsure, select 1x." msgstr "" "Active le filtrage anisotropique.\n" -"Améliore la qualité visuelle des textures qui ont des angles de vue obliques.\n" +"Améliore la qualité visuelle des textures qui ont des angles de vue " +"obliques.\n" "Peut provoquer des soucis pour un petit nombre de jeux.\n" "\n" "Dans le doute, sélectionnez 1x." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 -msgid "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = Compatible)" -msgstr "Activer l'accès disque rapide. Requis pour certains jeux. (MARCHE = Rapide, ARRÊT = Compatible)" +msgid "" +"Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " +"Compatible)" +msgstr "" +"Activer l'accès disque rapide. Requis pour certains jeux. (MARCHE = Rapide, " +"ARRÊT = Compatible)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Enable pages" @@ -2071,43 +2263,59 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Sélectionnez ceci si vous souhaitez que le rendu se fasse sur l'intégralité de l'écran.\n" +"Sélectionnez ceci si vous souhaitez que le rendu se fasse sur l'intégralité " +"de l'écran.\n" "Si cette case est décochée, une fenêtre de rendu sera créée.\n" "\n" "Dans le doute, décochez cette case." #: 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 "" -"Cochez cette case si vous souhaitez que la fenêtre principale de Dolphin soit utilisée pour le rendu, plutôt qu'une fenêtre séparée.\n" +"Cochez cette case si vous souhaitez que la fenêtre principale de Dolphin " +"soit utilisée pour le rendu, plutôt qu'une fenêtre séparée.\n" "\n" "Dans le doute, décochez cette case." +<<<<<<< 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:329 +>>>>>>> Update Hungarian and Turkish translations. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "" "Activer ceci pour accélérer La légende de Zelda : Twilight Princess. " "Désactiver pour TOUS les autres jeux." +<<<<<<< HEAD ======= msgid "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for ANY other game." msgstr "Activer ceci pour accélérer La légende de Zelda : Twilight Princess. Désactiver pour TOUS les autres jeux." >>>>>>> Update french translation. +======= +>>>>>>> Update Hungarian and Turkish translations. #: 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 "Activer la traduction de bloc d'adresse (BAT), une fonctionnalité de l'unité de gesiton de mémoire. Fidèle au matériel de la console, mais lent à émuler. (ON = Compatible, OFF = Rapide)" +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 "" +"Activer la traduction de bloc d'adresse (BAT), une fonctionnalité de l'unité " +"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:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 msgid "Enables Custom Projection Hack" msgstr "Active un hack de projection personnalisé" @@ -2124,8 +2332,12 @@ msgstr "" "Dans le doute, décochez cette case." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 -msgid "Enables the Memory Management Unit, needed for some games. (ON = Compatible, OFF = Fast)" -msgstr "Activer le Memory Management Unit (unité de gestion de la mémoire), requis pour certains jeux. (ON = Compatible, OFF = Vitesse)" +msgid "" +"Enables the Memory Management Unit, needed for some games. (ON = Compatible, " +"OFF = Fast)" +msgstr "" +"Activer le Memory Management Unit (unité de gestion de la mémoire), requis " +"pour certains jeux. (ON = Compatible, OFF = Vitesse)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" @@ -2141,6 +2353,7 @@ msgstr "" msgid "End" msgstr "Fin" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2150,6 +2363,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:476 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +>>>>>>> Update Hungarian and Turkish translations. msgid "English" msgstr "Anglais" @@ -2179,6 +2397,7 @@ msgstr "Egal" #: 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 "Erreur" @@ -2207,22 +2426,40 @@ msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +msgid "Error" +msgstr "Erreur" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/DolphinWX/Src/Main.cpp:346 +msgid "Error loading selected language. Falling back to system default." +msgstr "" +"Erreur lors du chargement de la langue sélectionnée. Retour à la langue par " +"défaut du système." +>>>>>>> Update Hungarian and Turkish translations. + +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:273 #, c-format <<<<<<< HEAD +<<<<<<< HEAD msgid "" ======= >>>>>>> Update translation files for recent changes in the code. +======= +msgid "" +>>>>>>> Update Hungarian and Turkish translations. "Error: Trying to access %s fonts but they are not loaded. Games may not show " "fonts correctly, or crash." msgstr "" "Erreur : essai d'accès aux polices %s mais elles ne sont pas chargées. Les " "jeux peuvent ne pas afficher les polices correctement, ou planter." +<<<<<<< HEAD ======= msgid "Error: Trying to access %s fonts but they are not loaded. Games may not show fonts correctly, or crash." msgstr "Erreur : essai d'accès aux polices %s mais elles ne sont pas chargées. Les jeux peuvent ne pas afficher les polices correctement, ou planter." >>>>>>> Update french translation. +======= +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:30 msgid "Escape" @@ -2235,7 +2472,8 @@ msgstr "Euphorie" #: Source/Core/Core/Src/MemTools.cpp:214 #, c-format msgid "Exception handler - access below memory space. %08llx%08llx" -msgstr "Erreur d'exception : accès à un espace en-dessous de la mémoire. %08llx%08llx" +msgstr "" +"Erreur d'exception : accès à un espace en-dessous de la mémoire. %08llx%08llx" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Execute" @@ -2249,12 +2487,11 @@ msgstr "Quitter Dolphin avec l'émulateur" msgid "Export Failed" msgstr "Echec de l'exportation" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:639 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..." @@ -2266,7 +2503,7 @@ msgstr "Exporter l'enregistrement..." msgid "Export Save" msgstr "Exporter une sauvegarde" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:984 msgid "Export Wii save (Experimental)" msgstr "Exporter une sauvegarde Wii (expérimental)" @@ -2298,44 +2535,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:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract All Files..." msgstr "Extraire tous les fichiers..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract Apploader..." msgstr "Extraire l'Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:624 msgid "Extract DOL..." msgstr "Extraire le DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Directory..." msgstr "Extraire un dossier..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract File..." msgstr "Extraire un fichier..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:615 msgid "Extract Partition..." msgstr "Extraire une partition..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:724 #, c-format msgid "Extracting %s" msgstr "Extraction de %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 msgid "Extracting All Files" msgstr "Extraction de tous les fichiers" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:708 msgid "Extracting Directory" msgstr "Extraction du dossier" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:710 msgid "Extracting..." msgstr "Extraction..." @@ -2351,7 +2588,7 @@ msgstr "Lecteur FIFO" msgid "FRANCE" msgstr "France" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "FST Size:" msgstr "Taille FST :" @@ -2367,7 +2604,7 @@ msgstr "Ecoute impossible !" msgid "Failed to download codes." msgstr "Impossible de télécharger les codes." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:824 #, c-format msgid "Failed to extract to %s!" msgstr "Impossible d'extraire vers %s !" @@ -2390,7 +2627,8 @@ msgstr "" "Il n'est pas fourni avec Dolphin pour des raisons de copyright.\n" "Utilisez DSPSpy pour extraire le fichier de votre console.\n" "\n" -"Vous pouvez utiliser le moteur DSP HLE à la place, celui-ci ne requiert pas d'extration de ROM.\n" +"Vous pouvez utiliser le moteur DSP HLE à la place, celui-ci ne requiert pas " +"d'extration de ROM.\n" "(Sélectionnez-le depuis l'onglet \"Audio\" dans la fenêtre de configuration.)" #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:99 @@ -2412,7 +2650,8 @@ msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" msgstr "" -"Impossible de lire correctement la sauvegarde de la table d'allocation des blocs\n" +"Impossible de lire correctement la sauvegarde de la table d'allocation des " +"blocs\n" "(0x8000-0x9FFF)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:144 @@ -2542,11 +2781,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:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Filesystem" msgstr "Système de fichiers" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1037 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Type de fichier 'ini' est inconnu ! Ne sera pas ouvert !" @@ -2566,7 +2805,7 @@ msgstr "Forcer 16/9è" msgid "Force 4:3" msgstr "Forcer 4/3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 msgid "Force Console as NTSC-J" msgstr "Forcer la console comme NTSC-J" @@ -2582,7 +2821,8 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Force le filtrage de texture, même si le jeu l'a explicitement désactivé.\n" -"Améliore légèrement la qualité des textures, mais peut provoquer des pépins dans certains jeux.\n" +"Améliore légèrement la qualité des textures, mais peut provoquer des pépins " +"dans certains jeux.\n" "\n" "Dans le doute, décochez cette case." @@ -2593,18 +2833,21 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Force le jeu à sortir des graphiques pour les écrans larges (16/9è, 16/10è).\n" +"Force le jeu à sortir des graphiques pour les écrans larges (16/9è, " +"16/10è).\n" "Provoque des pépins graphiques dans certains jeux.\n" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 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 "" "Force le mode NTSC-J pour utiliser la police de la ROM japonaise.\n" -"Si cette case est décochée, Dolphin sera par défaut en NTSC-U et activera automatiquement cette option lorsque des jeux japonais seront lancés." +"Si cette case est décochée, Dolphin sera par défaut en NTSC-U et activera " +"automatiquement cette option lorsque des jeux japonais seront lancés." #: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" @@ -2628,7 +2871,6 @@ 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" @@ -2644,7 +2886,7 @@ msgstr "Plage d'images :" msgid "Frame S&kipping" msgstr "Saut d'&image :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Framelimit:" msgstr "Image/s max :" @@ -2656,6 +2898,7 @@ msgstr "Images à enregistrer :" msgid "Free Look" msgstr "Vue libre" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2665,6 +2908,11 @@ msgstr "Vue 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:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +>>>>>>> Update Hungarian and Turkish translations. msgid "French" msgstr "Français" @@ -2689,16 +2937,19 @@ msgstr "Résolution en Plein écran :" msgid "GCI File(*.gci)" msgstr "Fichier GCI (*.gci)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.h:44 #, fuzzy msgid "GCMic Configuration" msgstr "Configuration de la journalisation" +======= +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" msgstr "Manette GC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 msgid "Game ID:" msgstr "ID du jeu :" @@ -2714,7 +2965,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:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:392 msgid "Game-Specific Settings" msgstr "Paramètres spécifiques au jeu" @@ -2722,7 +2973,7 @@ msgstr "Paramètres spécifiques au jeu" msgid "GameConfig" msgstr "Config du Jeu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 msgid "Gamecube" msgstr "GameCube" @@ -2732,10 +2983,14 @@ msgstr "Paramètres de la &manette 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:1007 +>>>>>>> Update Hungarian and Turkish translations. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Carte mémoires de GameCube (*.raw,*.gcp)" @@ -2759,11 +3014,15 @@ 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/ConfigMain.cpp:525 +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Général" @@ -2772,6 +3031,7 @@ msgstr "Général" msgid "General Settings" msgstr "Paramètres généraux" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2781,13 +3041,19 @@ msgstr "Paramètres généraux" #: 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:477 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update Hungarian and Turkish translations. msgid "German" msgstr "Allemand" #: Source/Core/Core/Src/ActionReplay.cpp:451 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" -msgstr "GetARCode : l'index est plus grand que la taille de la liste de codes %lu" +msgstr "" +"GetARCode : l'index est plus grand que la taille de la liste de codes %lu" #: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Graphics" @@ -2810,18 +3076,24 @@ msgstr "Plus grand que" ======= >>>>>>> Update french translation. 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 "" <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update Hungarian and Turkish translations. "Améliore significativement la qualité des textures générées en utilisant les " "effets de rendu vers texture.\n" "Le fait d'augmenter la résolution interne améliore l'impact de cette " "option.\n" <<<<<<< HEAD +<<<<<<< HEAD "Baisse légèrement les performances et peut provoquer quelques pépins (mais " "peu probable).\n" ======= @@ -2831,10 +3103,14 @@ msgstr "" "Le fait d'augmenter la résolution interne améliore l'impact de cette option.\n" "Baisse légèrement les performances et peut provoquer quelques pépins (mais peu probable).\n" >>>>>>> Update french translation. +======= +"Baisse légèrement les performances et peut provoquer quelques pépins (mais " +"peu probable).\n" +>>>>>>> Update Hungarian and Turkish translations. "\n" "Dans le doute, cochez cette case." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Greek" msgstr "Grèque" @@ -2866,7 +3142,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:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Hebrew" msgstr "Hébreu" @@ -2889,8 +3165,10 @@ msgid "" msgstr "" "Bonjour,\n" "\n" -"Dolphin requiert que votre processeur prenne en charge les instructions SSE2.\n" -"Malheureusement, votre processeur ne les a pas, et donc Dolphin ne s'exécutera pas.\n" +"Dolphin requiert que votre processeur prenne en charge les instructions " +"SSE2.\n" +"Malheureusement, votre processeur ne les a pas, et donc Dolphin ne " +"s'exécutera pas.\n" "\n" "Sayonara !\n" @@ -2908,7 +3186,8 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"Masquer le curseur de la souris s'il est au-dessus de la fenêtre d'émulation.\n" +"Masquer le curseur de la souris s'il est au-dessus de la fenêtre " +"d'émulation.\n" "\n" "Dans le doute, cochez cette case." @@ -2927,15 +3206,19 @@ msgstr "Configuration des raccourcis clavier" #: 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/ConfigMain.cpp:570 +>>>>>>> Update Hungarian and Turkish translations. msgid "Hotkeys" msgstr "Raccourcis clavier" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "Hungarian" msgstr "Hongrois" @@ -2946,16 +3229,20 @@ msgstr "Wiimote hybride" #: 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 : Impossible d'obtenir des données à partir d'un ticket inconnu : %08x/%08x" +msgstr "" +"IOCTL_ES_GETVIEWS : Impossible d'obtenir des données à partir d'un ticket " +"inconnu : %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 : Le jeu a essayé de recharger ios ou un titre qui n'est pas disponible dans votre copie de la NAND\n" +"IOCTL_ES_LAUNCH : Le jeu a essayé de recharger ios ou un titre qui n'est pas " +"disponible dans votre copie de la NAND\n" "ID du titre : %016llx.\n" " Dolphin va probablement figer maintenant" @@ -2963,7 +3250,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - mauvaise destination" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 msgid "IPL Settings" msgstr "Paramètres IPL" @@ -2979,11 +3266,11 @@ msgstr "Pointeur IR" msgid "IR Sensitivity:" msgstr "Sensibilité de l'IR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:509 msgid "ISO Details" msgstr "Détails de l'ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "ISO Directories" msgstr "Dossiers des ISO" @@ -2995,22 +3282,32 @@ msgstr "Italie" msgid "Icon" msgstr "Icône" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" +======= +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 -msgid "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" -msgstr "Si les FPS ne sont pas corrects, cette option peut résoudre le souci. (ON = Compatible, OFF = Vitesse)" +msgid "" +"If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" +msgstr "" +"Si les FPS ne sont pas corrects, cette option peut résoudre le souci. (ON = " +"Compatible, OFF = Vitesse)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 +>>>>>>> Update Hungarian and Turkish translations. 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." @@ -3018,10 +3315,13 @@ msgstr "" "Si vous définissez le limitateur de vitesse (Image /s max) à une valeur plus " "élevée que la vitesse du jeu (NTSC:60, PAL:50), vous devez aussi désactiver " "le contrôle audio dans le DSP pour que cela fonctionne." +<<<<<<< HEAD ======= 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." msgstr "Si vous définissez le limitateur de vitesse (Image /s max) à une valeur plus élevée que la vitesse du jeu (NTSC:60, PAL:50), vous devez aussi désactiver le contrôle audio dans le DSP pour que cela fonctionne." >>>>>>> Update french translation. +======= +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" @@ -3030,24 +3330,28 @@ msgstr "Ignorer les changements de formats" #: 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 "" "Ignore tous les changements du format d'EFB.\n" -"Améliore les performances dans la plupart des jeux sans effet négatif. Provoque des défauts graphiques dans un petit nombre de jeux.\n" +"Améliore les performances dans la plupart des jeux sans effet négatif. " +"Provoque des défauts graphiques dans un petit nombre de jeux.\n" "\n" "Dans le doute, cochez cette case." #: 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 "" "Ignore les requêtes de lecture ou d'écriture vers l'EFB du CPU.\n" -"Améliore les performances dans certains jeux, mais peut désactiver certaines fonctionnalités de gameplay ou effets graphiques.\n" +"Améliore les performances dans certains jeux, mais peut désactiver certaines " +"fonctionnalités de gameplay ou effets graphiques.\n" "\n" "Dans le doute, décochez cette case." @@ -3081,11 +3385,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 "" -"Améliore les performances mais peut causer de petits pépins dans les jeux s'appuyant sur une émulation de brouillard/fumée correcte.\n" +"Améliore les performances mais peut causer de petits pépins dans les jeux " +"s'appuyant sur une émulation de brouillard/fumée correcte.\n" "\n" "Dans le doute, décochez cette case." @@ -3095,11 +3401,12 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Améliore les performances, mais peut faire disparaître l'éclairage dans la plupart des jeux.\n" +"Améliore les performances, mais peut faire disparaître l'éclairage dans la " +"plupart des jeux.\n" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "In Game" msgstr "Dans le jeu" @@ -3128,7 +3435,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:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Insert SD Card" msgstr "Insérer une carte SD" @@ -3140,35 +3447,42 @@ msgstr "Indiquer un nom ici..." msgid "Install WAD" msgstr "Installer un WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1004 msgid "Install to Wii Menu" msgstr "Installer dans le menu Wii" #: Source/Core/Core/Src/MemTools.cpp:248 -msgid "InstallExceptionHandler called, but this platform does not yet support it." -msgstr "InstallExceptionHandler a été appelé, mais cette plateforme ne le prend pas encore en charge." +msgid "" +"InstallExceptionHandler called, but this platform does not yet support it." +msgstr "" +"InstallExceptionHandler a été appelé, mais cette plateforme ne le prend pas " +"encore en charge." +<<<<<<< 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:1363 +>>>>>>> Update Hungarian and Turkish translations. msgid "Installing WAD..." msgstr "Installation du WAD..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:526 msgid "Interface" msgstr "Interface" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "Interface Settings" msgstr "Paramètres de l'interface" -#: Source/Core/Core/Src/State.cpp:242 +#: Source/Core/Core/Src/State.cpp:192 msgid "Internal LZO Error - compression failed" msgstr "Erreur interne LZO - échec de la compression" -#: Source/Core/Core/Src/State.cpp:338 +#: Source/Core/Core/Src/State.cpp:292 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3177,7 +3491,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:461 +#: Source/Core/Core/Src/State.cpp:390 msgid "Internal LZO Error - lzo_init() failed" msgstr "Erreur interne LZO - échec de lzo_init()" @@ -3185,11 +3499,11 @@ msgstr "Erreur interne LZO - échec de lzo_init()" msgid "Internal Resolution:" msgstr "Résolution interne :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:243 msgid "Interpreter (VERY slow)" msgstr "Interpréteur (TRES lent)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Intro" msgstr "Intro" @@ -3206,7 +3520,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:536 +#: Source/Core/Core/Src/CoreTiming.cpp:534 #, c-format msgid "Invalid event type %i" msgstr "Type d'évènement non valide : %i" @@ -3226,14 +3540,15 @@ msgstr "" "%s\n" "Vous devriez copier à nouveau ce jeu." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:374 msgid "Invalid recording file" msgstr "Fichier d'enregitrement non valide" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:488 msgid "Invalid state" msgstr "Etat non valide" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3243,6 +3558,11 @@ msgstr "Etat non valide" #: 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:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update Hungarian and Turkish translations. msgid "Italian" msgstr "Italien" @@ -3250,16 +3570,16 @@ msgstr "Italien" msgid "JAPAN" msgstr "Japon" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 msgid "JIT Recompiler (recommended)" msgstr "Recompilateur JIT (recommandé) " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 msgid "JITIL experimental recompiler" msgstr "Recompilateur expérimental JIT" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:281 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Japanese" msgstr "Japonais" @@ -3268,17 +3588,16 @@ 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:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Korean" msgstr "Coréen" #. i18n: Left -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:55 msgid "L" msgstr "L" @@ -3287,11 +3606,11 @@ msgid "L Button" msgstr "Bouton L" #. i18n: Left-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 msgid "L-Analog" msgstr "L Analog." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 msgid "Language:" msgstr "Langue :" @@ -3314,7 +3633,6 @@ 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." @@ -3344,7 +3662,7 @@ msgstr "" msgid "Less Than" msgstr "Plus petit que" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Limit by FPS" msgstr "Nb de FPS comme limite" @@ -3357,42 +3675,34 @@ 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" @@ -3400,6 +3710,7 @@ msgstr "Charger l'état du Slot 8" msgid "Load State..." msgstr "Charger un état..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3413,6 +3724,13 @@ msgstr "Charger le Menu Système Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +msgid "Load Wii System Menu" +msgstr "Charger le Menu Système Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 +>>>>>>> Update Hungarian and Turkish translations. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Charger le Menu Système Wii %d%c" @@ -3429,7 +3747,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:49 msgid "Load preset values from hack patterns available." -msgstr "Charger les valeurs de pré-réglage à partir de la palette de hack disponibles." +msgstr "" +"Charger les valeurs de pré-réglage à partir de la palette de hack " +"disponibles." #: Source/Core/DolphinWX/Src/Main.cpp:134 msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" @@ -3439,7 +3759,7 @@ msgstr "Charge le fichier spécifié (DOL, ELF, GCM, ISO, WAD)" msgid "Local" msgstr "Local" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:542 msgid "Lock Threads to Cores" msgstr "Verrouiller les threads aux coeurs" @@ -3494,20 +3814,24 @@ msgstr "Hack de vitesse pour le MMU" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Fichiers 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:73 +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Stick principal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 msgid "Maker ID:" msgstr "ID concepteur :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Maker:" msgstr "Concepteur :" @@ -3530,16 +3854,24 @@ msgstr "Octet mémoire" #: 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:84 +>>>>>>> Update Hungarian and Turkish translations. msgid "Memory Card" msgstr "Carte mémoire" #: Source/Core/DolphinWX/Src/MemcardManager.h:36 -msgid "Memory Card Manager WARNING-Make backups before using, should be fixed but could mangle stuff!" -msgstr "Gestionnaire de cartes mémoires | ATTENTION : Faites des sauvegardes avant utilisation, devrait être OK mais corruption possible de données !" +msgid "" +"Memory Card Manager WARNING-Make backups before using, should be fixed but " +"could mangle stuff!" +msgstr "" +"Gestionnaire de cartes mémoires | ATTENTION : Faites des sauvegardes avant " +"utilisation, devrait être OK mais corruption possible de données !" #: Source/Core/Core/Src/CoreParameter.cpp:369 #, c-format @@ -3560,13 +3892,15 @@ msgstr "" #: Source/Core/Core/Src/HW/GCMemcard.cpp:126 msgid "Memorycard filesize does not match the header size" -msgstr "La taille du fichier de la carte mémoire ne correspond pas à la taille de l'entête." +msgstr "" +"La taille du fichier de la carte mémoire ne correspond pas à la taille de " +"l'entête." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:47 msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 msgid "Mic" msgstr "Micro" @@ -3579,7 +3913,7 @@ msgstr "Min" msgid "Misc" msgstr "Divers" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:731 msgid "Misc Settings" msgstr "Paramètres divers" @@ -3590,11 +3924,14 @@ msgstr "Modif." #: 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 "" -"Modifie les textures pour afficher le format dans lequel elles sont encodées. Il faudra redémarrer l'émulation dans la plupart des cas pour que cela prenne effet.\n" +"Modifie les textures pour afficher le format dans lequel elles sont " +"encodées. Il faudra redémarrer l'émulation dans la plupart des cas pour que " +"cela prenne effet.\n" "\n" "Dans le doute, décochez cette case." @@ -3607,7 +3944,7 @@ msgid "Motion Plus" msgstr "Motion Plus" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:83 msgid "Motor" msgstr "Vibreur" @@ -3634,8 +3971,12 @@ msgid "Multiply" msgstr "Multiplier" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -msgid "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No effect on emulated wiimotes." -msgstr "Supprime le son du haut-parleur de la Wiimote. Corrige les déconnexions aléatoires sur les Wiimotes physiques. N'affecte pas les Wiimotes émulées." +msgid "" +"Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " +"effect on emulated wiimotes." +msgstr "" +"Supprime le son du haut-parleur de la Wiimote. Corrige les déconnexions " +"aléatoires sur les Wiimotes physiques. N'affecte pas les Wiimotes émulées." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:126 msgid "NP Add" @@ -3721,11 +4062,15 @@ msgstr "NP Tabulation" msgid "NP Up" msgstr "NP Haut" +<<<<<<< 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:451 +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3764,7 +4109,7 @@ msgstr "Pseudo :" msgid "No Country (SDK)" msgstr "Pas de pays (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:309 msgid "No ISOs or WADS found" msgstr "Aucun ISO ou WAD trouvé" @@ -3799,7 +4144,7 @@ msgstr "Aucun dossier de sauvegarde trouvé pour le titre %s" msgid "None" msgstr "Aucune" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Norwegian Bokmaal" msgstr "Norvégien Bokmål" @@ -3807,20 +4152,24 @@ msgstr "Norvégien Bokmål" msgid "Not Equal" msgstr "Différent" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:914 msgid "Not Set" msgstr "Non défini" +<<<<<<< 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:597 +>>>>>>> Update Hungarian and Turkish translations. msgid "Not connected" msgstr "Non connectée" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:261 msgid "Notes" msgstr "Notes" @@ -3862,7 +4211,7 @@ msgstr "Objet" msgid "Object Range" msgstr "Plage d'objets :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:237 msgid "Off" msgstr "Arrêt" @@ -3878,17 +4227,20 @@ msgstr "%d blocs disponibles seulement" #: 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. +======= +>>>>>>> Update Hungarian and Turkish translations. msgid "Open" msgstr "Ouvrir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:986 msgid "Open &containing folder" msgstr "Ouvrir l'emplacement du fichier" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:983 msgid "Open Wii &save folder" msgstr "Ouvrir le dossier de &sauvegarde Wii" @@ -3927,7 +4279,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:94 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:91 msgid "Options" msgstr "Options" @@ -3941,7 +4293,8 @@ msgid "" "Right click and export all of the saves,\n" "and import the the saves to a new memcard\n" msgstr "" -"L'ordre des fichiers dans le Dossier de fichiers ne correspond pas à l'ordre des blocs\n" +"L'ordre des fichiers dans le Dossier de fichiers ne correspond pas à l'ordre " +"des blocs\n" "Faites un clic droit et exportez toutes les sauvegardes,\n" "et importez les sauvegardes vers une nouvelle carte mémoire\n" @@ -3951,8 +4304,12 @@ msgid "Other" msgstr "Autres" #: Source/Core/Core/Src/NetPlayClient.cpp:206 -msgid "Other client disconnected while game is running!! NetPlay is disabled. You manually stop the game." -msgstr "Autre client déconnecté pendant que le jeu est en cours d'exécution !! NetPlay est désactivé. Vous devez arrêter le jeu manuellement." +msgid "" +"Other client disconnected while game is running!! NetPlay is disabled. You " +"manually stop the game." +msgstr "" +"Autre client déconnecté pendant que le jeu est en cours d'exécution !! " +"NetPlay est désactivé. Vous devez arrêter le jeu manuellement." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 msgid "Output" @@ -4003,10 +4360,11 @@ msgstr "Partition %i" msgid "Patches" msgstr "Patchs" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 msgid "Paths" msgstr "Chemins" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -4014,6 +4372,10 @@ msgstr "Chemins" #: 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:1605 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -4022,7 +4384,7 @@ msgstr "Pause" msgid "Per-Pixel Lighting" msgstr "Eclairage par pixel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Perfect" msgstr "Parfait" @@ -4034,26 +4396,29 @@ 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:1614 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615 +>>>>>>> Update Hungarian and Turkish translations. 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:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Playable" msgstr "Jouable" @@ -4065,11 +4430,15 @@ msgstr "Options de lecture" msgid "Players" msgstr "Joueurs" +<<<<<<< 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:1053 +>>>>>>> Update Hungarian and Turkish translations. msgid "Please confirm..." msgstr "Veuillez confirmer..." @@ -4081,23 +4450,23 @@ msgstr "Merci de créer une perspective avant de sauvegarder" msgid "Plus-Minus" msgstr "Plus-Moins" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Polish" msgstr "Polonais" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:669 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 4" msgstr "Port 4" @@ -4106,11 +4475,11 @@ msgstr "Port 4" msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Portuguese" msgstr "Portugais" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Portuguese (Brazilian)" msgstr "Portugais (brésilien)" @@ -4118,6 +4487,7 @@ msgstr "Portugais (brésilien)" msgid "Post-Processing Effect:" msgstr "Effet de Post-processing :" +<<<<<<< HEAD #: Source/Core/Core/Src/Movie.cpp:735 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" @@ -4133,6 +4503,8 @@ msgstr "" msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" +======= +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " msgstr "Pré-réglages :" @@ -4175,7 +4547,7 @@ msgid "Quit" msgstr "Quitter" #. i18n: Right -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 msgid "R" msgstr "R" @@ -4184,7 +4556,7 @@ msgid "R Button" msgstr "Bouton R" #. i18n: Right-Analog -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:63 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 msgid "R-Analog" msgstr "R Analog." @@ -4201,7 +4573,6 @@ 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" @@ -4261,7 +4632,8 @@ msgid "" msgstr "" "Réduit la quantité d'aliasing causée par des graphiques 3D rasterisés.\n" "Ceci permet d'avoir une image moins carrée, avec moins d'effets d'escalier.\n" -"Impacte négativement les performances de l'émulation et peut provoquer des pépins.\n" +"Impacte négativement les performances de l'émulation et peut provoquer des " +"pépins.\n" "\n" "Dans le doute, sélectionnez Aucune." @@ -4272,7 +4644,6 @@ 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" @@ -4280,6 +4651,7 @@ msgstr "Rafraîchir la liste" msgid "Refresh game list" msgstr "Rafraîchir la liste des jeux" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4291,6 +4663,12 @@ msgstr "Rafraîchir la liste des jeux" #: 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:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +>>>>>>> Update Hungarian and Turkish translations. msgid "Remove" msgstr "Retirer" @@ -4310,9 +4688,12 @@ msgstr "Rendu dans la fenêtre 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. +======= +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Reset" @@ -4335,15 +4716,15 @@ msgid "Right Stick" msgstr "Stick Droit" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:82 msgid "Rumble" msgstr "Rumble" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 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:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Russian" msgstr "Russe" @@ -4355,11 +4736,15 @@ msgstr "Sau&vegarder l'état" msgid "Safe" msgstr "Sûr " +<<<<<<< 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:632 +>>>>>>> Update Hungarian and Turkish translations. msgid "Sample Rate:" msgstr "Echantillonnage :" @@ -4374,42 +4759,34 @@ 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" @@ -4417,12 +4794,12 @@ msgstr "Sauvegarder l'état vers le Slot 8" msgid "Save State..." msgstr "Enregistrer l'état" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:599 msgid "Save as..." msgstr "Enregistrer sous..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1308 msgid "Save compressed GCM/ISO" msgstr "Sauver le fichier compressé GCM/ISO" @@ -4430,29 +4807,31 @@ msgstr "Sauver le fichier compressé GCM/ISO" msgid "Save current perspective" msgstr "Sauvegarder la perspective actuelle" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1297 msgid "Save decompressed GCM/ISO" msgstr "Sauvegarder le fichier GCM/ISO décompressé" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:428 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." -msgstr "Le film de sauvegarde d'état %s est corrompu, arrêt de l'enregistrement du film..." +msgstr "" +"Le film de sauvegarde d'état %s est corrompu, arrêt de l'enregistrement du " +"film..." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Scaled EFB Copy" msgstr "Copie à l'échelle de l'EFB" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 #, c-format msgid "Scanning %s" msgstr "Analyse de %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:579 msgid "Scanning for ISOs" msgstr "Recherche d'ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:580 msgid "Scanning..." msgstr "Recherche..." @@ -4468,14 +4847,12 @@ msgstr "Arrêt défil." msgid "Search Filter" msgstr "Fitre de recherche" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:746 msgid "Search Subfolders" msgstr "Chercher dans sous-dossiers" -#: 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 "La section %s n'a pas été trouvée dans SYSCONF" @@ -4485,6 +4862,7 @@ msgstr "La section %s n'a pas été trouvée dans SYSCONF" msgid "Select" msgstr "Select" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4500,6 +4878,14 @@ msgstr "Sélectionner le fichier d'enregistrement" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 +msgid "Select The Recording File" +msgstr "Sélectionner le fichier d'enregistrement" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 +>>>>>>> Update Hungarian and Turkish translations. msgid "Select a Wii WAD file to install" msgstr "Sélectionner un fichier WAD de Wii à installer" @@ -4525,15 +4911,20 @@ msgstr "Sélectionner les fenêtres flottantes" msgid "Select the file to load" msgstr "Sélectionner le fichier à charger" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +>>>>>>> Update Hungarian and Turkish translations. msgid "Select the save file" msgstr "Sélectionner le fichier à enregistrer" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 msgid "Select the state to load" msgstr "Sélectionner l'état à charger" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 @@ -4546,6 +4937,9 @@ msgstr "Sélectionner l'état à charger" #: 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. msgid "Select the state to save" msgstr "Sélectionner l'état à enregistrer" @@ -4562,7 +4956,8 @@ msgstr "" "Sélectionner le format d'écran lors du rendu :\n" "Auto : Utiliser le format d'écran natif\n" "Forcer 16/9è : Dimensionner l'image pour un format d'écran 16/9è.\n" -"Forcer 4/3 : Dimensionner l'image pour un format d'écran de 4/3.\n" +"Forcer 4/3 : Dimensionner l'image pour un format d'écran de " +"4/3.\n" "Etirer à la fenêtre : Adapter l'image à la fenêtre.\n" "\n" "Dans le doute, choisissez Auto." @@ -4574,27 +4969,32 @@ msgstr "Police sélectionnée" #: 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 "" "Sélectionne la résolution d'affichage utilisée en mode Plein écran.\n" -"Elle devrait toujours être supérieure ou égale à la résolution interne. L'impact sur les performances est négligeable.\n" +"Elle devrait toujours être supérieure ou égale à la résolution interne. " +"L'impact sur les performances est négligeable.\n" "\n" "Dans le doute, utilisez la résolution de votre Bureau.\n" -"Si vous ne savez toujours pas, sélectionnez la plus haute résolution affichée." +"Si vous ne savez toujours pas, sélectionnez la plus haute résolution " +"affichée." #: 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 "" "Sélectionne l'API graphique à utiliser.\n" -"Direct3D 9 est généralement le plus rapide. OpenGL est cependant le plus précis. Direct3D 11 est quelque part entre les deux.\n" +"Direct3D 9 est généralement le plus rapide. OpenGL est cependant le plus " +"précis. Direct3D 11 est quelque part entre les deux.\n" "Les moteurs Direct3D ne sont disponibles que pour Windows.\n" "\n" "Dans le doute, sélectionnez Direct3D 9." @@ -4611,31 +5011,38 @@ msgstr "Position de la Sensor Bar :" msgid "Separator" msgstr "Séparateur" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Serbian" msgstr "Serbe" +<<<<<<< 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:506 +>>>>>>> Update Hungarian and Turkish translations. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" "Port série 1 - C'est le port que les périphériques tels que l'adaptateur " "ethernet utilisent" +<<<<<<< HEAD ======= msgid "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "Port série 1 - C'est le port que les périphériques tels que l'adaptateur ethernet utilisent" >>>>>>> Update french translation. +======= +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 msgid "Set" msgstr "Paramétrer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:987 msgid "Set as &default ISO" msgstr "Définir comme l'ISO par &défaut" @@ -4647,13 +5054,15 @@ msgstr "Définir comme carte mémoire par défaut : %c" #: Source/Core/Core/Src/ActionReplay.cpp:462 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" -msgstr "SetARCode_IsActive : L'index est plus grand que la taille de la liste des codes AR %lu" +msgstr "" +"SetARCode_IsActive : L'index est plus grand que la taille de la liste des " +"codes AR %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Settings..." msgstr "Configurer..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:221 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Impossible de trouver le fichier des paramètres" @@ -4661,7 +5070,7 @@ msgstr "SetupWiiMem: Impossible de trouver le fichier des paramètres" msgid "Shake" msgstr "Secouement" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 msgid "Short Name:" msgstr "Nom court :" @@ -4721,7 +5130,7 @@ msgstr "Afficher Japon" msgid "Show Korea" msgstr "Afficher Corée" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Show Language:" msgstr "Afficher la langue :" @@ -4761,17 +5170,20 @@ msgstr "Afficher WAD" msgid "Show Wii" msgstr "Afficher Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 msgid "Show a confirmation box before stopping a game." msgstr "Demande confirmation avant d'arrêter le jeu." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 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 "" "Affiche un message lorsqu'une erreur sérieuse potentielle est arrivée.\n" -"Le désactiver évitera les messages embêtants et les messages non-fatals, mais cela peut aussi signifier que Dolphin plante soudainement sans aucune explication." +"Le désactiver évitera les messages embêtants et les messages non-fatals, " +"mais cela peut aussi signifier que Dolphin plante soudainement sans aucune " +"explication." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Show first block" @@ -4795,11 +5207,13 @@ msgstr "Afficher le titre de sauvegarde" #: 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 "" -"Affiche le nombre d'images rendues par seconde, afin de mesurer la vitesse d'émulation.\n" +"Affiche le nombre d'images rendues par seconde, afin de mesurer la vitesse " +"d'émulation.\n" "\n" "Dans le doute, décochez cette case." @@ -4825,15 +5239,15 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Wiimote à l'horizontale" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 msgid "Simplified Chinese" msgstr "Chinois simplifié" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:299 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:263 msgid "Size" msgstr "Taille" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 msgid "Skip BIOS" msgstr "Ne pas exécuter le BIOS" @@ -4869,11 +5283,13 @@ msgid "" msgstr "" ======= 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 "" -"Saute la passe alpha de destination, utilisée dans beaucoup de jeux pour divers effets graphiques.\n" +"Saute la passe alpha de destination, utilisée dans beaucoup de jeux pour " +"divers effets graphiques.\n" "\n" "Dans le doute, décochez cette case." @@ -4881,19 +5297,26 @@ 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 "" <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. "Accélère légèrement les copies d'EFB vers la RAM en sacrifiant la précision " "de l'émulation.\n" ======= "Accélère légèrement les copies d'EFB vers la RAM en sacrifiant la précision de l'émulation.\n" >>>>>>> Update french translation. +======= +"Accélère légèrement les copies d'EFB vers la RAM en sacrifiant la précision " +"de l'émulation.\n" +>>>>>>> Update Hungarian and Turkish translations. "Améliore parfois la qualité visuelle.\n" -"Si vous rencontrez des problèmes, essayez d'augmenter la précision du cache ou désactivez cette option.\n" +"Si vous rencontrez des problèmes, essayez d'augmenter la précision du cache " +"ou désactivez cette option.\n" "\n" "Dans le doute, décochez cette case." @@ -4903,11 +5326,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:656 msgid "Slot B" msgstr "Slot B" @@ -4921,15 +5344,18 @@ msgstr "Rendu logiciel" #: 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 "" -"Le rendu logiciel est le plus lent de tous les moteurs, et n'utilise pas l'accélération de votre carte graphique.\n" +"Le rendu logiciel est le plus lent de tous les moteurs, et n'utilise pas " +"l'accélération de votre carte graphique.\n" "Il n'est utile qu'à des fins de débogage.\n" -"Êtes-vous certain d'activer le rendu logiciel ? Dans le doute, choisissez 'Non'." +"Êtes-vous certain d'activer le rendu logiciel ? Dans le doute, choisissez " +"'Non'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 msgid "Sound Settings" msgstr "Paramètres audio" @@ -4947,6 +5373,7 @@ msgstr "Echec de la création du buffer audio : %s" msgid "Space" msgstr "Espace" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4956,6 +5383,11 @@ msgstr "Espace" #: 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:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +>>>>>>> Update Hungarian and Turkish translations. msgid "Spanish" msgstr "Espagnol" @@ -4965,13 +5397,21 @@ msgstr "Volume du haut-parleur :" #: 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 "" -"Spécifie la résolution de rendu. Une haute résolution améliore beaucoup la qualité visuelle mais impacte beaucoup les performances et peut provoquer quelques pépins dans certains jeux.\n" -"\"Multiple de 640x528\" est un peu plus lent que \"Taille de la fenêtre\" mais provoque moins de problèmes. En général, plus la résolution interne est petite, meilleures seront les performances.\n" +"Spécifie la résolution de rendu. Une haute résolution améliore beaucoup la " +"qualité visuelle mais impacte beaucoup les performances et peut provoquer " +"quelques pépins dans certains jeux.\n" +"\"Multiple de 640x528\" est un peu plus lent que \"Taille de la fenêtre\" " +"mais provoque moins de problèmes. En général, plus la résolution interne est " +"petite, meilleures seront les performances.\n" "\n" "Dans le doute, sélectionnez 640x528." @@ -4991,11 +5431,15 @@ msgstr "Stick carré" msgid "Standard Controller" msgstr "Contrôleur 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:49 +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5010,16 +5454,14 @@ 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:300 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:264 msgid "State" msgstr "Etat" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 msgid "State Saves" msgstr "Etats" @@ -5031,9 +5473,12 @@ 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. +======= +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Arrêter" @@ -5041,12 +5486,14 @@ msgstr "Arrêter" #: 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 "" "Enregistre les copies d'EFB dans les objets de texture du GPU.\n" -"Ce n'est pas précis, mais fonctionne suffisamment bien pour la plupart des jeux et améliore sensiblement la vitesse comparé à l'EFB vers la RAM.\n" +"Ce n'est pas précis, mais fonctionne suffisamment bien pour la plupart des " +"jeux et améliore sensiblement la vitesse comparé à l'EFB vers la RAM.\n" "\n" "Dans le doute, sélectionnez cette case." @@ -5075,8 +5522,8 @@ msgstr "Fichiers de sauvegarde importés avec succès" msgid "Swing" msgstr "Balancement" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 msgid "System Language:" msgstr "Langue du système :" @@ -5109,6 +5556,7 @@ msgstr "Table Droite" #: 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. @@ -5119,6 +5567,11 @@ msgstr "Capture d'écran" msgid "TaruKonga (Bongos)" msgstr "" +======= +msgid "Take Screenshot" +msgstr "Capture d'écran" + +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" msgstr "Test" @@ -5147,13 +5600,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:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 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:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1255 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1321 #, c-format msgid "" "The file %s already exists.\n" @@ -5164,8 +5617,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 "Le fichier %s n'a pas pu être ouvert pour l'écriture. Vérifiez qu'il n'a pas été ouvert par un autre programme." +msgid "" +"The file %s could not be opened for writing. Please check if it's already " +"opened by another program." +msgstr "" +"Le fichier %s n'a pas pu être ouvert pour l'écriture. Vérifiez qu'il n'a pas " +"été ouvert par un autre programme." #: Source/Core/AudioCommon/Src/WaveFile.cpp:44 #, c-format @@ -5191,21 +5648,28 @@ msgstr "Le code AR décrypté ne contient aucune ligne." #: 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 "" -"Plus vous allez vers Sûr, moins l'émulateur manquera les mises à jour de texture depuis la RAM.\n" +"Plus vous allez vers Sûr, moins l'émulateur manquera les mises à jour de " +"texture depuis la RAM.\n" "\n" "Dans le doute, utilisez la deuxième position depuis la droite." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 msgid "The save you are trying to copy has an invalid file size" -msgstr "La sauvegarde que vous essayez de copier a une taille de fichier non valide" +msgstr "" +"La sauvegarde que vous essayez de copier a une taille de fichier non valide" #: Source/Core/DolphinWX/Src/Main.cpp:353 -msgid "The selected language is not supported by your system. Falling back to system default." -msgstr "La langue sélectionnée n'est pas prise en charge par votre système. Retour à la langue par défaut du système." +msgid "" +"The selected language is not supported by your system. Falling back to " +"system default." +msgstr "" +"La langue sélectionnée n'est pas prise en charge par votre système. Retour à " +"la langue par défaut du système." #: Source/Core/Core/Src/NetPlayClient.cpp:43 msgid "The server and client's NetPlay versions are incompatible!" @@ -5232,7 +5696,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:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:573 msgid "Theme" msgstr "Thème" @@ -5241,8 +5705,12 @@ msgid "Theme selection went wrong" msgstr "La sélection du thème a rencontré un problème" #: 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 "Il doit y avoir un ticket pour 00000001/00000002. Votre copie de la NAND est probablement incomplète." +msgid "" +"There must be a ticket for 00000001/00000002. Your NAND dump is probably " +"incomplete." +msgstr "" +"Il doit y avoir un ticket pour 00000001/00000002. Votre copie de la NAND est " +"probablement incomplète." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "" @@ -5253,26 +5721,37 @@ msgstr "" "Indéterminé signifie que les paramètres de Dolphin sont appliqués." #: Source/Core/Core/Src/ActionReplay.cpp:356 -msgid "This action replay simulator does not support codes that modify Action Replay itself." -msgstr "Ce simulateur d'Action Replay ne prend pas en charge les codes qui modifient l'Action Replay lui-même." +msgid "" +"This action replay simulator does not support codes that modify Action " +"Replay itself." +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:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:509 msgid "This could cause slow down in Wii Menu and some games." msgstr "Ceci peut ralentir le Menu Wii et quelques jeux." #: 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 "" "Cette fonctionnalité vous permet de vous amuser avec la caméra du jeu.\n" -"Faites un clic droit et déplacez la souris pour changer l'orientation de la caméra. Appuyez sur SHIFT et sur W, A, S ou D pour modifier pas à pas la distance de la caméra (SHIFT et 0 déplace la caméra plus vite, SHIFT et 9 la déplace plus lentement). Appuyez sur SHIFT et R pour réinitiliser la position de la caméra.\n" +"Faites un clic droit et déplacez la souris pour changer l'orientation de la " +"caméra. Appuyez sur SHIFT et sur W, A, S ou D pour modifier pas à pas la " +"distance de la caméra (SHIFT et 0 déplace la caméra plus vite, SHIFT et 9 " +"la déplace plus lentement). Appuyez sur SHIFT et R pour réinitiliser la " +"position de la caméra.\n" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "" "This is used to control game speed by sound throttle.\n" "Disabling this could cause abnormal game speed, such as too fast.\n" @@ -5281,26 +5760,34 @@ msgid "" "Keyboard Shortcut : Hold down to instantly disable Throttle." msgstr "" "Ceci est utiliser pour contrôler la vitesse du jeu par la constance du son.\n" -"Désactiver cette option peut causer une vitesse anormale du jeu, par exemple trop rapide.\n" +"Désactiver cette option peut causer une vitesse anormale du jeu, par exemple " +"trop rapide.\n" "Mais il se peut parfois qu'activer cette option produise un bruit constant.\n" "\n" -"Raccourci clavier : Appuyer pour instantanément désactiver cette option." +"Raccourci clavier : Appuyer pour instantanément désactiver cette " +"option." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 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:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:480 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 "" -"Ceci sépare les threads du processeur et de l'affichage, pour qu'ils puissent être exécutés sur des coeurs séparés.\n" -"Cela a pour conséquence d'accélérer considérablement l'émulation sur les PC qui plus d'un coeur, mais peut occasionnellement causer des petits pépins ou des plantages." +"Ceci sépare les threads du processeur et de l'affichage, pour qu'ils " +"puissent être exécutés sur des coeurs séparés.\n" +"Cela a pour conséquence d'accélérer considérablement l'émulation sur les PC " +"qui plus d'un coeur, mais peut occasionnellement causer des petits pépins ou " +"des plantages." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 msgid "This will let you Manually Edit the INI config file" -msgstr "Ceci vous permettra de modifier manuellement le fichier de configuration INI" +msgstr "" +"Ceci vous permettra de modifier manuellement le fichier de configuration INI" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:249 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:254 @@ -5312,7 +5799,7 @@ msgid "Tilt" msgstr "Tilt" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:292 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:256 msgid "Title" msgstr "Titre" @@ -5328,22 +5815,29 @@ msgstr "Activer tous les types de journaux" #: 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. +======= +>>>>>>> Update Hungarian and Turkish translations. msgid "Toggle Fullscreen" msgstr "Activer le plein écran" #: 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:273 +>>>>>>> Update Hungarian and Turkish translations. msgid "Top" msgstr "Haut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 msgid "Traditional Chinese" msgstr "Chinois traditionnel" @@ -5351,12 +5845,11 @@ 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:80 +#: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 msgid "Triggers" msgstr "Déclencheurs" -#: 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 "Essai de lecture d'un fichier SYSCONF non valide" @@ -5368,7 +5861,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:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Turkish" msgstr "Turque" @@ -5408,10 +5901,12 @@ 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 "" -"Impossible d'analyser la ligne %lu du code AR entré comme un code crypté ou décrypté valide. Veuillez vérifier que vous l'avez correctement tapé.\n" +"Impossible d'analyser la ligne %lu du code AR entré comme un code crypté ou " +"décrypté valide. Veuillez vérifier que vous l'avez correctement tapé.\n" "Voulez-vous ignorer cette ligne et continuer l'analyse ?" #: Source/Core/DolphinWX/Src/FrameTools.cpp:404 @@ -5447,21 +5942,32 @@ msgstr "Reception d'un message inconnu avec l'ID : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= msgstr "" "Message inconnu avec l'ID %d reçue du lecteur %d. Banissement du lecteur !" ======= msgstr "Message inconnu avec l'ID %d reçue du lecteur %d. Banissement du lecteur !" >>>>>>> Update french translation. +======= +msgstr "" +"Message inconnu avec l'ID %d reçue du lecteur %d. Banissement du lecteur !" +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/Core/Src/HW/Memmap.cpp:633 #, c-format msgid "" "Unknown pointer %#08x\n" "Continue?" +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. msgstr "" "Message inconnu avec l'ID %d reçue du lecteur %d. Banissement du lecteur !" +======= +msgstr "" +"Pointeur inconnu %#08x\n" +"Continuer ?" +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 @@ -5477,7 +5983,7 @@ msgstr "Mettre à jour" msgid "Upright Wiimote" msgstr "Wiimote debout" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:713 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Utiliser le mode EuRGB60 (PAL60)" @@ -5489,7 +5995,7 @@ msgstr "&Plein écran" msgid "Use Hex" msgstr "Utiliser Hexa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Use Panic Handlers" msgstr "Utiliser les gestionnaires de panique" @@ -5501,19 +6007,23 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Utilise plusieurs threads pour décoder les textures.\n" -"Peut accélérer l'émulation, particulièrement avec des processeurs qui ont plus de 2 coeurs.\n" +"Peut accélérer l'émulation, particulièrement avec des processeurs qui ont " +"plus de 2 coeurs.\n" "\n" "Dans le doute, décochez cette case." #: 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 "" -"En cas d'échec de compilation de shader, un message est habituellement affiché.\n" -"Cependant, certains préfèrent ne pas afficher ce message pour ne pas interrompre le jeu en cochant cette case.\n" +"En cas d'échec de compilation de shader, un message est habituellement " +"affiché.\n" +"Cependant, certains préfèrent ne pas afficher ce message pour ne pas " +"interrompre le jeu en cochant cette case.\n" "\n" "Dans le doute, décochez cette case." @@ -5541,7 +6051,7 @@ msgstr "Valeur" msgid "Verbosity" msgstr "Verbosité" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:385 msgid "Video" msgstr "Vidéo" @@ -5549,7 +6059,7 @@ msgstr "Vidéo" msgid "Virtual" msgstr "Virtuel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:625 msgid "Volume" msgstr "Volume" @@ -5597,7 +6107,8 @@ msgid "" "%s\n" "Do you wish to continue?" msgstr "" -"Attention ! Il est conseillé de sauvegarder tous les fichiers dans le dossier :\n" +"Attention ! Il est conseillé de sauvegarder tous les fichiers dans le " +"dossier :\n" "%s\n" "Voulez-vous continuer ?" @@ -5609,11 +6120,13 @@ msgid "" "and have the same name as a file on your memcard\n" "Continue?" msgstr "" -"Attention : ceci va écraser toutes les sauvegardes existantes dans ce dossier :\n" +"Attention : ceci va écraser toutes les sauvegardes existantes dans ce " +"dossier :\n" "%s\n" "et vont avoir le même nom que le fichier sur votre carte mémoire\n" "Continuer ?" +<<<<<<< HEAD #: Source/Core/Core/Src/Movie.cpp:629 #, c-format msgid "" @@ -5649,6 +6162,8 @@ msgid "" "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" msgstr "" +======= +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 msgid "WaveFileWriter - file not open." @@ -5666,15 +6181,15 @@ msgstr "Hack écran large (16/9è)" msgid "Width" msgstr "Largeur" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 msgid "Wii Console" msgstr "Console Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 msgid "Wii NAND Root:" msgstr "Racine de la NAND (Wii) :" @@ -5682,11 +6197,15 @@ msgstr "Racine de la NAND (Wii) :" msgid "Wii Save Import" msgstr "Importer une sauvegarde 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:1310 +>>>>>>> Update Hungarian and Turkish translations. msgid "Wii save files (*.bin)|*.bin" msgstr "Fichiers de sauvegarde Wii (*.bin)|*.bin" @@ -5717,11 +6236,15 @@ 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 #: 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:599 +>>>>>>> Update Hungarian and Turkish translations. msgid "Wiimote Connected" msgstr "Wiimote connectée" @@ -5753,6 +6276,7 @@ msgstr "Windows Droit" msgid "Word Wrap" msgstr "Casse" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5762,6 +6286,11 @@ msgstr "Casse" #: 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:1364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327 +>>>>>>> Update Hungarian and Turkish translations. msgid "Working..." msgstr "Travail..." @@ -5802,7 +6331,8 @@ msgid "" "Only Zelda ucode games will work correctly with them.\n" msgstr "" "Vous utilisez des ROM de DSP gratuits créés par l'équipe de Dolphin.\n" -"Seuls les jeux basés sur les ucodes de Zelda fonctionneront correctement avec ces ROM.\n" +"Seuls les jeux basés sur les ucodes de Zelda fonctionneront correctement " +"avec ces ROM.\n" #: Source/Core/DolphinWX/Src/FrameAui.cpp:72 msgid "You can't close panes that have pages in them." @@ -5824,7 +6354,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:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:877 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." @@ -5847,7 +6377,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:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "ZTP hack" msgstr "ZTP hack" @@ -5884,14 +6414,19 @@ msgstr "[Personnalisé]" #: 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 "" "[EXPERIMENTAL]\n" -"Tente d'accélérer l'émulation en déportant le décodage de texture vers le GPU en utilisant le framework OpenCL.\n" -"Cependant, il est actuellement connu pour provoquer des défauts de textures dans divers jeux. De plus, il est généralement plus lent qu'un classique décodage par le CPU.\n" +"Tente d'accélérer l'émulation en déportant le décodage de texture vers le " +"GPU en utilisant le framework OpenCL.\n" +"Cependant, il est actuellement connu pour provoquer des défauts de textures " +"dans divers jeux. De plus, il est généralement plus lent qu'un classique " +"décodage par le CPU.\n" "\n" "Dans le doute, décochez cette case." @@ -5913,7 +6448,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5930,7 +6465,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:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:447 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT : Lecture de l'Opcode depuis %x. Merci de nous le signaler." @@ -5938,7 +6473,9 @@ msgstr "iCacheJIT : Lecture de l'Opcode depuis %x. Merci de nous le signaler." #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:108 #, c-format msgid "not a wii save or read failure for file header size %x" -msgstr "Ceci n'est pas une sauvegarde Wii, ou erreur de lecture de la taille de l'entête du fichier %x" +msgstr "" +"Ceci n'est pas une sauvegarde Wii, ou erreur de lecture de la taille de " +"l'entête du fichier %x" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:461 msgid "s" @@ -5949,7 +6486,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "Commande inconnue 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1047 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute a retourné -1 sur l'exécution de l'application !" @@ -6061,9 +6598,6 @@ 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..." @@ -6163,6 +6697,9 @@ 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" @@ -6221,6 +6758,13 @@ 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" @@ -6233,6 +6777,13 @@ 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" @@ -6271,6 +6822,9 @@ 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..." @@ -6294,6 +6848,13 @@ 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" @@ -6382,6 +6943,15 @@ 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" @@ -6507,6 +7077,9 @@ 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 " @@ -6521,13 +7094,6 @@ 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" @@ -6558,6 +7124,60 @@ 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/hu.po b/Languages/po/hu.po index 2a61a06212..4e43ee3092 100644 --- a/Languages/po/hu.po +++ b/Languages/po/hu.po @@ -12,8 +12,12 @@ msgstr "" "PO-Revision-Date: 2011-12-18 13:41-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" +<<<<<<< HEAD "PO-Revision-Date: 2011-06-04 14:29+0100\n" >>>>>>> Update translation files for recent changes in the code. +======= +"PO-Revision-Date: 2011-12-20 17:22-0600\n" +>>>>>>> Update Hungarian and Turkish translations. "Last-Translator: Delirious \n" "Language-Team: Delirious \n" "Language: Hungarian\n" @@ -80,10 +84,14 @@ msgstr "%s tisztítása sikertelen. Valószínűleg a képfájl sérült." #: Source/Core/Core/Src/HW/GCMemcard.cpp:97 <<<<<<< HEAD +<<<<<<< HEAD #, c-format ======= #, fuzzy, c-format >>>>>>> Update translation files for recent changes in the code. +======= +#, c-format +>>>>>>> Update Hungarian and Turkish translations. msgid "" "%s failed to load as a memorycard \n" " Card file size is invalid (0x%x bytes)" @@ -93,10 +101,14 @@ msgstr "" #: Source/Core/Core/Src/HW/GCMemcard.cpp:112 <<<<<<< HEAD +<<<<<<< HEAD #, c-format ======= #, fuzzy, c-format >>>>>>> Update translation files for recent changes in the code. +======= +#, c-format +>>>>>>> Update Hungarian and Turkish translations. msgid "" "%s failed to load as a memorycard \n" " Card size is invalid (0x%x bytes)" @@ -443,9 +455,12 @@ msgstr "Pontos VBeam emuláció" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 <<<<<<< HEAD +<<<<<<< HEAD ======= #, fuzzy >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Hungarian and Turkish translations. msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -685,6 +700,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 <<<<<<< HEAD +<<<<<<< HEAD msgid "Alternate Wiimote Timing" msgstr "Változtatható Wiimote időzítés" ======= @@ -692,6 +708,10 @@ msgstr "Változtatható Wiimote időzítés" msgid "Alternate Wiimote Timing" msgstr "Emulált Wiimote" >>>>>>> Update translation files for recent changes in the code. +======= +msgid "Alternate Wiimote Timing" +msgstr "Változtatható Wiimote időzítés" +>>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -1002,11 +1022,22 @@ msgstr "Mégsem" msgid "Cannot open %s" msgstr "%s nem nyitható meg" +<<<<<<< HEAD +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:721 +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. #: 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 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1016 +>>>>>>> Update Hungarian and Turkish translations. #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -2854,9 +2885,12 @@ msgstr "Nagyobb mint" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 <<<<<<< HEAD +<<<<<<< HEAD ======= #, fuzzy >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Hungarian and Turkish translations. msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -5143,9 +5177,12 @@ msgstr "TAJVAN" #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 <<<<<<< HEAD +<<<<<<< HEAD ======= #, fuzzy >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Update Hungarian and Turkish translations. msgid "TAS Input" msgstr "TAS bemenet" @@ -6261,6 +6298,9 @@ 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" @@ -6318,6 +6358,13 @@ 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ó" @@ -6330,6 +6377,13 @@ 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" @@ -6367,6 +6421,9 @@ 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" @@ -6390,6 +6447,13 @@ 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" @@ -6479,6 +6543,15 @@ 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" @@ -6598,6 +6671,9 @@ 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" @@ -6647,6 +6723,60 @@ 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/tr.po b/Languages/po/tr.po index fe7e7a4688..fe4f784856 100644 --- a/Languages/po/tr.po +++ b/Languages/po/tr.po @@ -11,8 +11,12 @@ msgstr "" "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" +<<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. "PO-Revision-Date: 2011-08-19 08:38-0500\n" +======= +"PO-Revision-Date: 2011-12-20 19:22+0200\n" +>>>>>>> Update Hungarian and Turkish translations. "Last-Translator: nlgzrgn \n" "Language-Team: nlgzrgn \n" "Language: Turkish\n" @@ -363,7 +367,7 @@ msgstr "Bir NetPlay penceresi zaten açık!" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 msgid "A game is not currently running." -msgstr "Bir oyun şu anda çalışmıyor." +msgstr "Bir oyun şu anda düzgün çalışmıyor." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 msgid "" @@ -410,7 +414,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "AM-Baseboard" -msgstr "AM-Süpürgelik" +msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 @@ -434,7 +438,6 @@ msgid "Accurate VBeam emulation" msgstr "Doğru VBeam Emülasyonu" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 -#, fuzzy msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -442,11 +445,10 @@ msgid "" "\n" "If unsure, check EFB to Texture instead." msgstr "" -"EFB kopyalarını doğru bir şekilde emüle eder. \n" -"Bazı oyunlar işlevsellik veya belirli görsel efektler için buna ihtiyaç " -"duyar. \n" +"EFB kopya emülasyonunun gerçekçiliğini artırır. \n" +"Bazı oyunlarda belirli görsel efektler için bu ayarın açık olması gerekir. \n" "\n" -"Emin değilseniz, işaretli bırakın." +"Emin değilseniz, bunun yerine EFB'den Doku'ya seçeneğini işaretleyin." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 @@ -666,15 +668,14 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"3, 4, 5, 6 ve 7 tuşlarıyla emülasyon penceresinde belirli seçeneklere geçiş " +"3, 4, 5, 6 ve 7 tuşlarıyla emülasyon penceresinde belirli seçeneklere geçişi " "sağlar. \n" "\n" "Emin değilseniz, işaretsiz bırakın." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -#, fuzzy msgid "Alternate Wiimote Timing" -msgstr "Taklit Wiimote" +msgstr "Alternatif Wiimote Zamanlaması" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -686,7 +687,7 @@ msgstr "Keskinleştirme:" #: Source/Core/DiscIO/Src/VolumeDirectory.cpp:317 msgid "Apploader is the wrong size...is it really an apploader?" -msgstr "Apploader boyutu yanlış...bu gerçekten bir apploader mı?" +msgstr "Apploader boyutu yanlış. Bu gerçekten bir apploader mı?" #: Source/Core/DiscIO/Src/VolumeDirectory.cpp:311 msgid "Apploader unable to load from file" @@ -706,7 +707,7 @@ msgid "" "\n" "If unsure, select (off)." msgstr "" -"Bir kare bitişinde sonradan işleme etkisi uygula. \n" +"Çerçevelerden sonra geç işleme etkisi uygula. \n" "\n" "Emin değilseniz, kapalı seçin." @@ -725,12 +726,13 @@ msgid "" "They will be gone forever!" msgstr "" "Bu dosyaları gerçekten silmek istiyor musunuz?\n" -"Ama geri döndürülemeyecekler!" +"Silindikten sonra bu dosyaları geri döndüremezsiniz!" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" -"Bu dosyayı gerçekten silmek istiyor musunuz? Ama geri döndürülemeyecektir!" +"Bu dosyayı gerçekten silmek istiyor musunuz? Silindikten sonra bu dosyaları " +"geri döndüremezsiniz!" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -743,7 +745,7 @@ msgstr "En-boy Oranı:" #: Source/Core/DolphinWX/Src/FrameAui.cpp:69 msgid "At least one pane must remain open." -msgstr "En azından bir bölme açık kalmalıdır." +msgstr "En az bir bölme açık kalmalıdır." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Audio" @@ -751,7 +753,7 @@ msgstr "Ses" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Audio Backend:" -msgstr "Ses Arka Ucu:" +msgstr "Ses Çözücüsü:" #: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 msgid "AudioCommon: Error opening AO device.\n" @@ -795,8 +797,8 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"Mipmapleri hafızadan dekode etmek yerine otomatik olarak yarat. \n" -"Performansı artırır ama bazı küçük doku hatalarına neden olabilir. \n" +"MipMap'leri hafızadan çözmek yerine otomatik olarak oluştur. \n" +"Performansı artırır ancak küçük doku bozukluklarına neden olur. \n" "\n" "Emin değilseniz, işaretli bırakın." @@ -806,12 +808,12 @@ msgstr "Geri" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 msgid "Backend Settings" -msgstr "Arka Uç Ayarları" +msgstr "Çözücü Ayarları" #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:213 msgid "Backend:" -msgstr "Arka Uç:" +msgstr "Çözücü:" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 @@ -820,7 +822,7 @@ msgstr "Arkaplanda Giriş" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:279 msgid "Backward" -msgstr "Geriye doğru" +msgstr "Geri" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:264 msgid "Bad File Header" @@ -903,7 +905,7 @@ msgstr "Eklemek için bir klasöre gözat" #: Source/Core/DolphinWX/Src/FrameTools.cpp:435 msgid "Browse for an ISO directory..." -msgstr "Bir kalıp konumu için gözat" +msgstr "Bir kalıp konumu için gözat..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 msgid "Browse for output directory" @@ -948,7 +950,7 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"3 Boyutlu görüntülerin derinlik değerlerini vertex yerine piksel başına " +"3 Boyutlu görüntülerin derinlik değerlerini vertex yerine piksel olarak " "hesapla. \n" "Piksel aydınlatmanın tersine (sadece bir donanım olan), oyunların çok azında " "piksel başına derinlik hesaplaması gereklidir.\n" @@ -963,10 +965,10 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"3 Boyutlu görüntülerin aydınlatılmasını vertex yerine piksel başına " +"3 Boyutlu görüntülerin aydınlatılmasını vertex yerine piksel olarak " "hesaplar. \n" -"Emülasyon hızını (işlemciye bağlı olarak) biraz düşürür. \n" -"Bu genelde güvenli bir donanımdır, ama bazen sorunlara neden olabilir. \n" +"Emülasyon hızını (GPU'ya bağlı olarak) biraz düşürebilir. \n" +"Bu genelde güvenlidir, ama bazen sorunlara neden olabilir. \n" "\n" "Emin değilseniz, işaretsiz bırakın." @@ -980,7 +982,7 @@ msgstr "İptal" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:240 #, c-format msgid "Cannot open %s" -msgstr "%s 'yi açmayı iptal et" +msgstr "%s açılamadı." #: Source/Core/Core/Src/CoreTiming.cpp:122 msgid "Cannot unregister events with events pending" @@ -1020,7 +1022,7 @@ msgstr "Sap bağlantısı ile Wiimote bulunamadı: %02x" #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" -msgstr "DVD Eklentisinden okunamıyor - DVD-Arabirimi : Ölümcül Hata" +msgstr "DVD Eklentisinden okunamıyor - DVD-Arabirimi : Önemli Hata" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:49 msgid "Caps Lock" @@ -1061,16 +1063,17 @@ msgstr "" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:59 msgid "Changes sign to zFar Parameter (after correction)" -msgstr "zFar Parametresine işaret değiştirir (düzeltme sonrası)" +msgstr "zFar Parametresinin işaretini değiştirir (düzeltme sonrası)" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:54 msgid "Changes sign to zNear Parameter (after correction)" -msgstr "zNear Parametresine işaret değiştirir (düzeltme sonrası)" +msgstr "zNear Parametresinin işaretini değiştirir (düzeltme sonrası)" #: 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 "Emülatör çalışırken değiştirirseniz etki etmeyecektir!" +msgstr "" +"Emülatör çalışırken değiştirirseniz herhangi bir etkisini göremezsiniz!" #: Source/Core/DolphinWX/Src/NetWindow.cpp:282 msgid "Chat" @@ -1316,7 +1319,7 @@ msgstr "%s oluşturulamadı." #: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 #, c-format msgid "Could not initialize backend %s." -msgstr "Arkauç %s başlatılamadı." +msgstr "Çözücü %s başlatılamadı." #: Source/Core/Core/Src/CoreParameter.cpp:139 #, c-format @@ -1357,8 +1360,7 @@ msgid "" msgstr "" "Hafıza kartı dosyası %s yazılamadı. \n" "\n" -"Dolphin'i bir CD veya DVD'den çalıştırıyor olabilir misiniz veya kayıt " -"dosyası yazma korumalı olabilir mi?" +"Dolphin'i bir CD/DVD'den çalıştırıyorsunuz veya kayıt dosyası yazma korumalı." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 msgid "Couldn't find open command for extension 'ini'!" @@ -1446,11 +1448,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Custom Projection Hack" -msgstr "Özel Projeksiyon Hilesi" +msgstr "Özel Görüntüleme Hilesi" #: Source/Core/DolphinWX/Src/PHackSettings.h:30 msgid "Custom Projection Hack Settings" -msgstr "Özel Projeksiyon Hilesi Ayarları" +msgstr "Özel Görüntüleme Hilesi Ayarları" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "Customize some Orthographic Projection parameters." @@ -1587,8 +1589,7 @@ msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." msgstr "" -"Dışarı tampon DVD içine sığacak veriden daha fazla veri almak için girişimde " -"algılandı. Kelepçe." +"DVD'nin alabileceği veriden daha fazlasını sığdırma girişimi algılandı." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 @@ -1618,7 +1619,7 @@ msgid "" " and Directory backup checksum failed" msgstr "" "Konum doğrulama başarısız \n" -"ve Konum yedeği doğrulama da başarısız" +"ve konum yedeği doğrulama da başarısız." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 @@ -1649,9 +1650,9 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"Herhangi bir XFB emülasyonunu iptal et. \n" -"Emülasyonu bayağı hızlandırır ama onlara dayanıklı oyunlarda (özellikle " -"homebrew uygulamalarında) ağır hatalara neden olabilir.\n" +"XFB emülasyonunu iptal et. \n" +"Emülasyonu çok hızlandırır ama onlara dayanıklı oyunlarda (özellikle " +"homebrew uygulamalarında) önemli hatalara neden olabilir.\n" "\n" "Emin değilseniz, işaretli bırakın." @@ -1665,9 +1666,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "EFB kopyalarının emülasyonunu iptal et. \n" -"Bunlar genelde yorumlamadan dokuya olan efektlerin sonradan işlenmesinde " -"kullanılır, bunun için de bu ayarı açmak çoğu zaman hataya neden olan büyük " -"bir hızlanma sağlar. \n" +"Bunlar genelde render-to-texture efektlerinin geç işlenmesinde kullanılır, " +"bu ayarı açmak büyük bir hızlanma sağlar ama çoğu zaman önemli hatalara " +"neden olabilir. \n" "\n" "Emin değilseniz, işaretsiz bırakın." @@ -1772,7 +1773,7 @@ msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." msgstr "" -"Dolphin herhangi bir GC veya Wii kalıbı bulamadı. Buraya çift tıklatarak " +"Dolphin herhangi bir GC veya Wii kalıbı bulamadı. Buraya çift tıklatarak " "dosyalara göz atabilirsiniz..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 @@ -1781,7 +1782,7 @@ msgid "" "games..." msgstr "" "Dolphin şu anda oyunları gizlemeye ayarlıdır. Buraya çift tıklatarak tüm " -"oyunları görebilirsiniz..." +"oyunları görebilirsiniz." #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 @@ -1790,7 +1791,7 @@ msgstr "Aşağı" #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 msgid "Download Codes (WiiRD Database)" -msgstr "WiiRD Veritabanından Kod İndir" +msgstr "Kodları İndir (WiiRD Veritabanı)" #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 #, c-format @@ -1827,8 +1828,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Tüm yorumlanan kareleri User/Dump/Frames içerisine bir AVI dosyası olarak " -"dök \n" +"Yorumlanan çerçeveleri User/Dump/Frames içerisine bir AVI dosyası olarak " +"kaydet. \n" "\n" "Emin değilseniz, işaretsiz bırakın." @@ -1838,7 +1839,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Çözülen oyun dokularını User/Dump/Textures// konumuna dök. \n" +"Çözülen oyun dokularını User/Dump/Textures// konumuna kaydet. \n" "\n" "Emin değilseniz, işaretsiz bırakın." @@ -1848,7 +1849,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"EFB kopyalarının içeriğini User/Dump/Textures içine dök \n" +"EFB kopyalarının içeriğini User/Dump/Textures içine kaydet. \n" "\n" "Emin değilseniz, işaretsiz bırakın." @@ -1881,9 +1882,8 @@ msgid "" "driver." msgstr "" "HATA: Dolphin'in bu sürümü bir TAP-Win32 sürücüsü gerektirir ve bu sürücü en " -"azından %d. %d sürümü olmalıdır. --- Eğer Dolphin'i sürekli " -"güncelliyorsanız, Windows'un sürücüyü görmesi için yeniden başlatma " -"gerekebilir." +"azından %d.%d sürümü olmalıdır. --- Eğer Dolphin'i sürekli güncelliyorsanız, " +"Windows'un sürücüyü görmesi için yeniden başlatma gerekebilir." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 msgid "EUROPE" @@ -1924,7 +1924,7 @@ msgstr "Etki" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Embedded Frame Buffer" -msgstr "Gömülü Kare Tamponu" +msgstr "Gömülü Çerçeve Tamponu" #: Source/Core/Core/Src/Core.cpp:174 msgid "Emu Thread already running" @@ -1938,9 +1938,9 @@ msgid "" "\n" "If unsure, check virtual XFB emulation instead." msgstr "" -"XFB'lerin doğruluğunu emüle et. \n" -"Hızı bayağı düşürür ve yüksek çözünürlükte yorumlamayı engeller ama bazı " -"oyunları düzgün çalıştırabilmek için gereklidir. \n" +"XFB'leri daha gerçekçi bir şekilde emüle et. \n" +"Hızı çok düşürür, yüksek çözünürlükte yorumlamayı engeller, ama bazı " +"oyunların düzgün çalışması için gereklidir. \n" "\n" "Emin değilseniz, bunun yerine sanal XFB emülasyonunu seçin." @@ -1954,9 +1954,9 @@ msgid "" "If unsure, leave this checked." msgstr "" "XFB'leri GPU doku nesneleriyle emüle et. \n" -"XFB emülasyonu olmadan çalışmayan oyunların gerçek XFB emülasyonu kadar " -"kasmadan çalıştırır. Ancak, yine de diğer birçok oyunda (özellikle homebrew " -"uygulamalarında) başarısız olabilir. \n" +"XFB emülasyonu olmadan çalışmayan oyunları, gerçek XFB emülasyonu gibi " +"yavaşlamadan çalıştırır. Ancak, yine de diğer birçok oyunda (özellikle " +"homebrew uygulamalarında) başarısız olabilir. \n" "\n" "Emin değilseniz, işaretli bırakın." @@ -2013,7 +2013,7 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" -msgstr "Önbelleğe izin ver" +msgstr "Ön Belleğe İzin Ver" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2078,7 +2078,7 @@ msgid "" msgstr "" "Filtrelemeyi etkinleştirir. \n" "Özellikle eğik açılı dokuların görsel kalitesini artırır. \n" -"Çok az oyunda bazı hatalara neden olabilir. \n" +"Oyunların çok azında bazı hatalara neden olabilir. \n" "\n" "Emin değilseniz, 1x seçin." @@ -2134,12 +2134,13 @@ msgid "" "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " "Fast)" msgstr "" -"Blok Adresi Çevirisine izin verir. Bu bir Hafıza Yönetim Ünitesi işlevidir. " -"Doğruluğu artırır ama performansı düşürür. (Açık = Uyumlu, Kapalı = Hızlı)" +"Blok Adresi Çevirisi'ne (BAT) izin verir. Bu bir Hafıza Yönetim Ünitesi " +"işlevidir. Gerçekçiliği artırır ama performansı düşürür. (Açık = Uyumlu, " +"Kapalı = Hızlı)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "Enables Custom Projection Hack" -msgstr "Özel Projeksiyon Hilesini Etkinleştirir" +msgstr "Özel Gösterim Hilesini Etkinleştirir" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" @@ -2148,7 +2149,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Eğer emüle edilen yazılım destekliyorsa, progresif taramayı etkinleştirir.\n" +"Eğer yazılım desteği varsa, progresif taramayı etkinleştirir.\n" "Oyunların çoğu bunu umursamaz.\n" "\n" "Emin değilseniz, işaretsiz bırakın." @@ -2247,8 +2248,8 @@ msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " "fonts correctly, or crash." msgstr "" -"Hata: %s yazı tiplerine ulaşmayı denedik,ama yüklenemediler. Oyunlar yazı " -"tiplerini düzgün göstermeyecek veya çakılacaklar." +"Hata: %s yazı tipleri düzgün yüklenemedi. Oyunlardaki yazılar düzgün " +"görüntülenemeyebilir, veya oyunlar çakılabilir." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:30 msgid "Escape" @@ -2294,7 +2295,7 @@ msgstr "Kaydı Ver" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 msgid "Export Wii save (Experimental)" -msgstr "Wii Kayıtlı Oyununu Ver (Deneysel)" +msgstr "Wii Kayıtlı Oyununu Ver (Deneme Amaçlı)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 msgid "Export all saves" @@ -2314,7 +2315,7 @@ msgstr "Uzantı" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "External Frame Buffer" -msgstr "Harici Kare Tamponu" +msgstr "Harici Çerçeve Tamponu" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:60 msgid "Extra Parameter" @@ -2367,7 +2368,7 @@ msgstr "Genişletiliyor..." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:418 msgid "FIFO Byte" -msgstr "FIFO Baytı" +msgstr "FIFO Bayt'ı" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:38 msgid "FIFO Player" @@ -2490,7 +2491,7 @@ msgstr "" #: Source/Core/DiscIO/Src/VolumeGC.cpp:61 msgid "Failed to read unique ID from disc image" -msgstr "Disk kalıbından eşsiz ID okunamadı." +msgstr "Disk kalıbının Unique ID'si okunamadı." #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:83 msgid "Failed to write BT.DINF to SYSCONF" @@ -2516,7 +2517,7 @@ msgstr "Hızlı" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Fast Mipmaps" -msgstr "Hızlı Mipmap'lar" +msgstr "Hızlı MipMap'ler" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "Fast version of the MMU. Does not work for every game." @@ -2594,7 +2595,7 @@ msgstr "4:3 'e zorla" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Force Console as NTSC-J" -msgstr "Konsolu NTSC-J Olarak Zorla" +msgstr "Konsolu NTSC-J Olmaya Zorla" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 msgid "Force Texture Filtering" @@ -2608,7 +2609,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Oyun kabul etmese de doku filtresini açar. \n" -"Doku kalitesini artırır ama bazı oyunlarda hatalara neden olabilir. \n" +"Doku kalitesini artırır ama bazı oyunlarda hatalara neden olur. \n" "\n" "Emin değilseniz, işaretsiz bırakın." @@ -2620,7 +2621,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Oyunun görüntüsünü geniş ekrana uydurur. \n" -"Bazı oyunlarda görüntü hatalarına neden olabilir. \n" +"Bazı oyunlarda görüntü hatalarına neden olur. \n" "\n" "Emin değilseniz, işaretsiz bırakın." @@ -2649,36 +2650,36 @@ msgstr "İleri" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:383 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 msgid "Frame" -msgstr "Kare" +msgstr "Çerçeve" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 msgid "Frame " -msgstr "Kare" +msgstr "Çerçeve" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Frame Advance" -msgstr "Gelişmiş Kareleme" +msgstr "Gelişmiş Çerçeveleme" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 msgid "Frame Dumps use FFV1" -msgstr "Kare dökümünde FFV1 kullan" +msgstr "Çerçeve dökümünde FFV1 kullan" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:105 msgid "Frame Range" -msgstr "Kare Aralığı" +msgstr "Çerçeve Aralığı" #: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Frame S&kipping" -msgstr "&Kare Atlama" +msgstr "Çerçeve Atlama(&K)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 msgid "Framelimit:" -msgstr "Kare Sınırı:" +msgstr "Çerçeve Sınırı:" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:189 msgid "Frames To Record" -msgstr "Çekilecek Kareler" +msgstr "Çekilecek Çerçeveler" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 msgid "Free Look" @@ -2830,7 +2831,6 @@ msgid "Greater Than" msgstr "Daha Büyük" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -#, fuzzy msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2840,8 +2840,9 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"Dokuya yorumlama efektlerinde kullanılan doku kalitesini bayağı artırır. \n" +"Render-to-texture efektlerinde kullanılan doku kalitesini bayağı artırır. \n" "İç çözünürlüğü yükseltmek bu ayarın etkisini artırır. \n" +"Performansı düşürüp, hatalara neden olabilir. \n" "\n" "Emin değilseniz, işaretli bırakın." @@ -3018,15 +3019,15 @@ msgstr "" msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" -"Saniyedeki kare sayısı düzensizse, bu seçenek size yardım edebilir. (Açık = " -"Uyumlu, Kapalı = Hızlı)" +"Saniyedeki çerçeve sayısı düzensizse, bu seçenek size yardım edebilir. (Açık " +"= Uyumlu, Kapalı = Hızlı)" #: 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." msgstr "" -"Eğer kare sınırını oyun hızından yüksek seçerseniz (NTSC:60, PAL:50), ses " +"Eğer çerçeve sınırını oyun hızından yüksek seçerseniz (NTSC:60, PAL:50), ses " "ayarlarında Ses hızlandırmasını da iptal ederek bunu daha etkili " "kılabilirsiniz." @@ -3828,7 +3829,7 @@ msgstr "Hiçbiri" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Norwegian Bokmaal" -msgstr "Norveççe" +msgstr "Norveççe (Bokmaal Lehçesi)" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Not Equal" @@ -4147,7 +4148,7 @@ msgstr "Portekizce (Brezilya)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396 msgid "Post-Processing Effect:" -msgstr "Sonradan İşleme Etkisi:" +msgstr "Geç İşleme Etkisi:" #: Source/Core/Core/Src/Movie.cpp:735 #, c-format @@ -4291,8 +4292,8 @@ msgid "" "If unsure, select None." msgstr "" "3D Görüntü yüzünden oluşan bozulmayı azaltır. \n" -"Görüntünün daha az bloklu görünmesini sağlar ama performansı çok düşürür.\n" -"Emülasyon hızını çok kötü düşürür ve bazen hatalara neden olur. \n" +"Görüntünün daha kaliteli olmasını sağlar ama performansı çok düşürür.\n" +"Emülasyon hızını çok düşürür ve bazen hatalara neden olur. \n" "\n" "Emin değilseniz, hiçbiri seçin." @@ -4542,7 +4543,7 @@ msgid "" "\n" "If unsure, use the first one." msgstr "" -"Kullanmak için bir donanım adaptörü seçin. \n" +"Kullanmak için bir çevirici seçin. \n" "\n" "Emin değilseniz, ilkini kullanın." @@ -4593,7 +4594,7 @@ msgid "" "If unsure, select Auto." msgstr "" "Yorumlarken kullanılacak en-boy oranını seçin:\n" -"Otomatik: Doğal en-boy oranını kullanır (4:3)\n" +"Otomatik: Doğal en-boy oranını kullanır\n" "16:9'a Zorla: En-boy oranını 16:9 yapar. \n" "4:3'e Zorla: En-boy oranını 4:3 yapar. \n" "Pencereye göre: Görüntüyü pencereye göre yorumlar. \n" @@ -4630,8 +4631,8 @@ msgid "" "If unsure, use Direct3D 9." msgstr "" "Hangi görüntü API'sinin kullanılacağını seçer.\n" -"DirectX 9 genelde en hızlı olanlarıdır. OpenGL doğruluğa önem verir. DirectX " -"11 ikisinin arasıdır.\n" +"DirectX 9 genelde en hızlı olanlarıdır. OpenGL gerçekçiliğe önem verir. " +"DirectX 10/11 ikisinin arasıdır.\n" "Şunu unutmayın, DirectX 9 sadece Windows'da kullanılabilir.\n" "\n" "Emin değilseniz, DirectX 9 seçin." @@ -4829,7 +4830,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Emülasyon hızını ölçmek için 1 saniye içerisinde yorumlanan kare sayısını " +"Emülasyon hızını ölçmek için 1 saniye içerisinde yorumlanan çerçeve sayısını " "göster. \n" "\n" "Emin değilseniz, işaretsiz bırakın." @@ -4874,7 +4875,7 @@ msgstr "Hedef Alpha Geçişini Atla" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:448 msgid "Skip EFB Access from CPU" -msgstr "CPU'dan EFB erişimini atla" +msgstr "CPU'dan EFB'ye erişimi atla" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" @@ -4883,7 +4884,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Çoğu oyunda çeşitli görsel efektler için hedef alfa geçişini atla. \n" +"Çoğu oyunda çeşitli görsel efektler için hedef alpha geçişini atla. \n" "\n" "Emin değilseniz, işaretsiz bırakın." @@ -4896,11 +4897,10 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Doğruluktan fedakarlık edip EFB'den RAM'a kopyalamayı biraz hızlandırır. \n" -"Bazen görsel kaliteyi de artırır. \n" -"Eğer herhangi bir sorun yaşıyorsanız, doku önbelleği doğruluğunu artırmayı " -"veya bu seçeneği iptal etmeyi deneyin. \n" -"\n" +"Doğruluktan ödün vererek EFB'den RAM'e kopyalayı biraz hızlandırır. \n" +"Bazen bu görüntü kalitesini de artırır. \n" +"Herhangi bir sorun yaşarsanız, bu seçeneği iptal etmeyi veya doku ön belleği " +"doğruluğunu artırmayı deneyin.\n" "Emin değilseniz, işaretsiz bırakın." #: Source/Core/DolphinWX/Src/FrameTools.cpp:387 @@ -4932,7 +4932,7 @@ msgid "" "It's only useful for debugging purposes.\n" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -"Yazılım yorumlaması, diğer arka uçlardan daha yavaştır.\n" +"Yazılım yorumlaması, diğer çözücülerden daha yavaştır.\n" "Sadece hata ayıklamada kullanışlıdır.\n" "Yazılım yorumlamasını açmayı gerçekten istiyor musunuz? Emin değilseniz, " "'Hayır' seçin." @@ -5062,9 +5062,9 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"EFB kopyalarını GPU doku nesnelerinde sakla. \n" -"Pek doğru değildir, ama çoğu oyun için iyi çalışır ve EFB'den RAM'e " -"seçeneğinden daha fazla hız verir. \n" +"EFB kopyalarını GPU doku nesnelerinde saklayın.\n" +"Bu pek doğru değildir, ancak EFB'den RAM'e seçiliyken yeteri kadar iyi " +"çalışarak çoğu oyunu hızlandırır.\n" "\n" "Emin değilseniz, işaretli bırakın." @@ -5091,7 +5091,7 @@ msgstr "Kayıt dosyaları başarıyla alındı" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 msgid "Swing" -msgstr "Sapma" +msgstr "Hareket" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 @@ -5147,7 +5147,7 @@ msgstr "Doku" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 msgid "Texture Cache" -msgstr "Doku Önbelleği" +msgstr "Doku Ön Belleği" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 msgid "Texture Format Overlay" @@ -5218,8 +5218,8 @@ msgid "" "\n" "If unsure, use the second-fastest value from the right." msgstr "" -"Bunu ayarlamak daha güvenlidir, emülatörün RAM'den daha az doku güncellemesi " -"kaçırmasını sağlar. \n" +"Bunu güvenli bir şekilde ayarlamanız, emülatörün RAM'den doku güncellemesi " +"kaybetme oranını azaltacaktır. \n" "\n" "Emin değilseniz, sağdaki 2. en hızlı değeri kullanın." @@ -5322,8 +5322,9 @@ msgid "" "Keyboard Shortcut : Hold down to instantly disable Throttle." msgstr "" "Bu seçenek oyun hızının sesle denetlenmesini sağlar. \n" -"İptal ederseniz oyun hızında anormallik olabilir,mesela çok hızlı. \n" -"Ama bazen bunu işaretlemek sürekli gürültüye neden olabilir. \n" +"İptal ederseniz oyun hızında anormallik olabilir,mesela oyun çok hızlı " +"çalışabilir. \n" +"Ama bazen bunu işaretlemek gürültüye neden olabilir. \n" "\n" "Klavye Kısayolu : Hızlandırmayı anında iptal etmek için basılı tutun." @@ -5394,7 +5395,7 @@ msgstr "Geleneksel Çince" #: Source/Core/Core/Src/Boot/Boot.cpp:407 msgid "Tried to load an unknown file type." -msgstr "Bilinmeyen bir dosya türünü yüklemeye denedik." +msgstr "Bilinmeyen bir dosya türünü yüklemeyi denedi." #: Source/Core/Core/Src/HW/GCPadEmu.cpp:80 msgid "Triggers" @@ -5476,7 +5477,7 @@ msgstr "Bilinmeyen" #: Source/Core/Core/Src/HW/DVDInterface.cpp:894 #, c-format msgid "Unknown DVD command %08x - fatal error" -msgstr "Bilinmeyen DVD komutu %08x - ölümcül hata" +msgstr "Bilinmeyen DVD komutu %08x - önemli hata" #: Source/Core/Common/Src/SysConf.cpp:145 #, c-format @@ -5543,7 +5544,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Dokuları emüle etmek için birden fazla işlem birimi kullanın. \n" -"(Özellikle iki veya daha fazla çekirdeği olan işlemcilerde) hızı artırır. \n" +"Özellikle iki veya daha fazla çekirdeği olan işlemcilerde hızı artırır. \n" "\n" "Emin değilseniz, işaretsiz bırakın." @@ -5567,7 +5568,7 @@ msgstr "Gereçler" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:292 msgid "V-Sync" -msgstr "Dikey Sync" +msgstr "Dikey Eşitleme" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 msgid "Value" @@ -5653,7 +5654,7 @@ msgid "" "and have the same name as a file on your memcard\n" "Continue?" msgstr "" -"Uyarı: Bu,aşağıdaki klasördeki herhangi bit kayıtlı oyunun üzerine " +"Uyarı: Bu,aşağıdaki klasördeki herhangi bir kayıtlı oyunun üzerine " "yazılacak:\n" "%s\n" "ve hafıza kartınızdaki dosyayla aynı adda olacak.\n" @@ -5918,7 +5919,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "[BOZUK] \n" -"EFB'lerin kopyalandığı bölgeleri işaretle.\n" +"EFB'lerin kopyalandığı bölgeleri belirt.\n" "\n" "Emin değilseniz, işaretsiz bırakın." @@ -5936,8 +5937,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"[DENEYSEL]\n" -"OpenCL kullanarak doku yorumlamasındaki yüklenmeyi azaltarak emülasyonu " +"[DENEME AMAÇLI]\n" +"OpenCL kullanarak doku yorumlamasındaki yüklenmeyi azaltır ve emülasyonu " "hızlandırır. \n" "Ancak, çeşitli oyunlarda doku bozulmalarına neden olabilmektedir. Ayrıca " "çoğu zaman CPU doku çözmesinden daha yavaştır. \n" @@ -5952,7 +5953,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"[DENEYSEL]\n" +"[DENEME AMAÇLI]\n" "Görüntü listelerini önbelleğe alarak emülasyonu biraz hızlandırır. \n" "Bazı hatalara neden olabilir. \n" "\n" @@ -6017,11 +6018,13 @@ msgstr "| VEYA" #~ msgid "%d %%" #~ msgstr "%d %%" +#, fuzzy #~ msgid "&Frame Stepping" -#~ msgstr "&Kare Adımlama" +#~ msgstr "Çerçeve Atlama(&K)" +#, fuzzy #~ msgid "(Default)" -#~ msgstr "(Varsayılan)" +#~ msgstr "Varsayılan" #~ msgid "32,000 Hz" #~ msgstr "32,000 Hz" @@ -6041,14 +6044,17 @@ msgstr "| VEYA" #~ msgid "ALSA" #~ msgstr "ALSA" +#, fuzzy #~ msgid "AOSound" -#~ msgstr "AOSes" +#~ msgstr "&Ses" +#, fuzzy #~ msgid "Accurate Texture Cache" -#~ msgstr "Doğru Doku Önbelleği" +#~ msgstr "Doku Ön Belleği" +#, fuzzy #~ msgid "Adjust window size" -#~ msgstr "Pencere boyutunu ayarlayın" +#~ msgstr "Pencere Boyutunu Otomatik Ayarla" #~ msgid "" #~ "Allows the CPU to read or write to the EFB (render buffer).\n" @@ -6106,44 +6112,57 @@ msgstr "| VEYA" #~ msgid "Can't open %s, it has a missing function" #~ msgstr "%s açılamıyor, kayıp bir işleve sahip." +<<<<<<< HEAD #~ msgid "Cannot record movies in read-only mode." #~ msgstr "Salt-okunur modda film çekilemez." +======= +#, fuzzy +>>>>>>> Update Hungarian and Turkish translations. #~ msgid "Config..." #~ msgstr "Yapılandır..." +#, fuzzy #~ msgid "Configuration profile" -#~ msgstr "Yapılandırma Profili" +#~ msgstr "Geçmiş Yapılandırması" +#, fuzzy #~ msgid "Configuration profile:" -#~ msgstr "Yapılandırma Profili:" +#~ msgstr "Geçmiş Yapılandırması" +#, fuzzy #~ msgid "Connected" -#~ msgstr "Bağlanıldı." +#~ msgstr "Bağlan" +#, fuzzy #~ msgid "Connected to %i Wiimotes" -#~ msgstr "%i adet Wiimote'a bağlanıldı." +#~ msgstr "Wiimote 1'i Bağla" #~ msgid "Copy" #~ msgstr "Kopyala" +#, fuzzy #~ msgid "CoreAudio" -#~ msgstr "Ses Çekirdeği" +#~ msgstr "Ses" +#, fuzzy #~ msgid "Could not copy %s to %s" -#~ msgstr "%s , %s 'e kopyalanamadı." +#~ msgstr "%s oluşturulamadı." +#, fuzzy #~ msgid "Could not get info about plugin %s" -#~ msgstr "%s eklentisi hakkında bilgi alınamadı." +#~ msgstr "%s oluşturulamadı." #~ msgid "DList Cache" #~ msgstr "D Listesi Önbelleği" +#, fuzzy #~ msgid "DSound" -#~ msgstr "DSound" +#~ msgstr "&Ses" +#, fuzzy #~ msgid "Danish" -#~ msgstr "Danca" +#~ msgstr "İspanyolca" #~ msgid "Disable Wiimote Speaker" #~ msgstr "WiiMote Hoparlörünü İptal Et" @@ -6162,8 +6181,9 @@ msgstr "| VEYA" #~ "Alpha-ayar geçişini iptal eder. \n" #~ "Bazı etkiler iptal olur ama performansı artırabilir." +#, fuzzy #~ msgid "Distance Alpha Pass" -#~ msgstr "Uzaklık Alpha Geçişi" +#~ msgstr "Hedef Alpha Geçişini Atla" #~ msgid "Dolphin DSP-HLE Plugin" #~ msgstr "Dolphin DSP-HLE Eklentisi" @@ -6177,14 +6197,17 @@ msgstr "| VEYA" #~ msgid "Dolphin DSP-LLE Plugin Settings" #~ msgstr "Dolphin DSP-LLE Eklenti Ayarları" +#, fuzzy #~ msgid "Dolphin Direct3D11" -#~ msgstr "Dolphin DirectX 10/11" +#~ msgstr "DirectX 10/11" +#, fuzzy #~ msgid "Dolphin Direct3D9" -#~ msgstr "Dolphin DirectX 9" +#~ msgstr "DirectX 9" +#, fuzzy #~ msgid "Dolphin OpenGL" -#~ msgstr "Dolphin OpenGL" +#~ msgstr "Dolphin FIFO" #~ msgid "" #~ "Dolphin has not been configured with an install location,\n" @@ -6207,33 +6230,42 @@ msgstr "| VEYA" #~ msgid "Emulator Display Settings" #~ msgstr "Emülatör Görüntü Ayarları" +#~ msgid "Enable Bounding Box Calculation" +#~ msgstr "Sınırlayıcı Kutu Hesaplama'yı Etkinleştir" + +#, fuzzy #~ msgid "Enable CPU Access" -#~ msgstr "CPU Erişimine İzin Ver" +#~ msgstr "Ön Belleğe İzin Ver" #~ msgid "Enable Copy to EFB" #~ msgstr "EFB'ye Kopyalamaya İzin Ver" +#, fuzzy #~ msgid "Enable EFB To Texture" -#~ msgstr "EFB'den Dokuya İzin Ver" +#~ msgstr "Dokuları İptal Et" +#, fuzzy #~ msgid "Enable HLE Audio" -#~ msgstr "HLE Sesine İzin Ver" +#~ msgstr "Ses Hızlandırmasına İzin Ver" +#, fuzzy #~ msgid "Enable JIT Dynarec" -#~ msgstr "JIT Dynarec'e İzin Ver" +#~ msgstr "Çift Çekirdeğe İzin Ver" +#, fuzzy #~ msgid "Enable OpenCL" -#~ msgstr "OpenCL'ye İzin Ver" +#~ msgstr "Sayfalara izin ver" +#, fuzzy #~ msgid "Enable Screen Saver (burn-in reduction)" -#~ msgstr "Ekran Koruyucuya İzin Ver (Yanma redüksiyonu)" +#~ msgstr "Ekran Koruyucusuna İzin Ver" +#, fuzzy #~ msgid "" #~ "Enables dynamic recompilation of DSP code.\n" #~ "Changing this will have no effect while the emulator is running!" #~ msgstr "" -#~ "Ses kodunun dinamik yeniden derlenmesine izin verir. \n" -#~ "Emülatör çalışırken değiştirirseniz etki etmeyecektir!" +#~ "Emülatör çalışırken değiştirirseniz herhangi bir etkisini göremezsiniz!" #~ msgid "" #~ "Enables emulation of Embedded Frame Buffer copies, if the game uses " @@ -6264,6 +6296,13 @@ msgstr "| VEYA" #~ msgid "Error allocating buffer" #~ msgstr "Tampon ayırma hatası" +#~ msgid "" +#~ "Error in PlayWiimote. %u != %u, byte %d.\n" +#~ "Sorry, Wii recording is temporarily broken." +#~ msgstr "" +#~ "PlayWiimote'da hata. %u != %u, byte %d.\n" +#~ "Üzgünüz, Wii kaydında geçici hasar var." + #~ msgid "Error loading %s: can't read info" #~ msgstr "%s yüklenirken hata: Bilgi okunamıyor." @@ -6276,6 +6315,13 @@ msgstr "| VEYA" #~ msgid "Error opening file %s for recording" #~ msgstr "Kayıt için %s dosyasını açarken hata." +#~ msgid "" +#~ "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +#~ "Aborting savestate load..." +#~ msgstr "" +#~ "Hata: \"%s\" 'dan sonra, %d (0x%X) bulundu ( %d (0x%X) yerine). Durum " +#~ "kaydı yüklemesinden vazgeçiliyor..." + #~ msgid "" #~ "Failed to load DSP ROM:\n" #~ "%s\n" @@ -6285,8 +6331,9 @@ msgstr "| VEYA" #~ "%s\n" #~ "DSP LLE Kullanabilmek için bu dosya gereklidir." +#, fuzzy #~ msgid "Failed to load DSP ROM: %s" -#~ msgstr "DSP ROM'u %s yükleme başarısız." +#~ msgstr "Kod indirme başarısız." #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " @@ -6296,11 +6343,13 @@ msgstr "| VEYA" #~ "Hızlı varyantlar daha az piksele bakar ve hata potansiyeli yüksektir. \n" #~ "Yavaş varyantlar daha çok piksele bakar ve daha güvenlidir." +#, fuzzy #~ msgid "Force Bi/Trilinear Filtering" -#~ msgstr "İki/Üç Çizgili Filtreye Zorla" +#~ msgstr "Doku Filtrelemesine Zorla" +#, fuzzy #~ msgid "Fractional" -#~ msgstr "Kesirli" +#~ msgstr "Eylem" #~ msgid "" #~ "Fully emulate embedded frame buffer copies.\n" @@ -6311,14 +6360,20 @@ msgstr "| VEYA" #~ "Dokuya EFB Kopyalamaktan daha doğrudur, ve bazı oyunlar düzgün çalışmak " #~ "için buna ihtiyaç duyar, ama çok yavaş olabilir." +#~ msgid "GCMic Configuration" +#~ msgstr "GCMic Yapılandırması" + +#, fuzzy #~ msgid "GFX Config" -#~ msgstr "Grafik Yapılandırması" +#~ msgstr "Yapılandırma" +#, fuzzy #~ msgid "Graphics Plugin" -#~ msgstr "Görüntü Eklentisi" +#~ msgstr "Görüntü" +#, fuzzy #~ msgid "Hide Shader Errors" -#~ msgstr "Gölgelendirici Hatalarını Gizle" +#~ msgstr "Disk Okuma Hatası" #~ msgid "" #~ "Hide the cursor when it is over the rendering window and the rendering " @@ -6333,24 +6388,34 @@ msgstr "| VEYA" #~ "Eğer bir oyun çakılırsa, sadece Interpreter'da çalışıyorsa veya Dolphin " #~ "çökerse, bu seçenek oyunu düzeltebilir." +#~ msgid "" +#~ "If checked, the bounding box registers will be updated. Used by the Paper " +#~ "Mario games." +#~ msgstr "" +#~ "Eğer işaretlenmişse, sınırlayıcı kutu kayıtları güncellenecektir. Paper " +#~ "Mario oyunları tarafından kullanılır." + #~ msgid "Input Source" #~ msgstr "Giriş Kaynağı" #~ msgid "Install directory could not be saved" #~ msgstr "Kurulum konumu kaydedilemedi." +#, fuzzy #~ msgid "Installing WAD to Wii Menu..." -#~ msgstr "WAD dosyası Wii Menüsüne kuruluyor..." +#~ msgstr "Wii Menüsüne kur" +#, fuzzy #~ msgid "Integral [recommended]" -#~ msgstr "İntegral [önerilen]" +#~ msgstr "JIT Yeniden Derleyici (önerilen)" +#, fuzzy #~ msgid "" #~ "Internal LZO Error - decompression failed (%d) (%ld, %ld) \n" #~ "Try verifying the state again" #~ msgstr "" -#~ "İç LZO Hatası - Genişletme başarısız (%d) (%ld, %ld) \n" -#~ "Durumu doğrulamayı tekrar deneyin." +#~ "İç LZO Hatası - Genişletme başarısız (%d) (%li, %li) \n" +#~ "Durumu tekrar yüklemeyi deneyin." #~ msgid "" #~ "Keeps track of textures based on looking at the actual pixels in the " @@ -6362,8 +6427,9 @@ msgstr "| VEYA" #~ "Yavaşlamaya neden olabilir, ama bazı oyunlar düzgün çalışmak için buna " #~ "ihtiyaç duyar." +#, fuzzy #~ msgid "Load Script..." -#~ msgstr "Script Yükle..." +#~ msgstr "Durumu Yükle..." #~ msgid "" #~ "Loads native mipmaps instead of generating them.\n" @@ -6373,8 +6439,9 @@ msgstr "| VEYA" #~ "Mipmap'leri oluşturmak yerine doğal olanlarını yükler. \n" #~ "Doğruluğu artırır ama performansı düşürebilir." +#, fuzzy #~ msgid "Lua Script Console" -#~ msgstr "Lua Script Konsolu" +#~ msgstr "Konsola Yaz" #~ msgid "Metroid Other M" #~ msgstr "Metroid Other M" @@ -6389,8 +6456,9 @@ msgstr "| VEYA" #~ "Dokuların kullandığı biçimi görmek için onları değiştir. \n" #~ "Sadece hata ayıklama için kullanışlıdır." +#, fuzzy #~ msgid "New &Lua Console" -#~ msgstr "Yeni &Lua Konsolu" +#~ msgstr "Konsolu Göster (&C)" #~ msgid "No audio output" #~ msgstr "Ses çıkışı yok" @@ -6401,11 +6469,13 @@ msgstr "| VEYA" #~ msgid "OK" #~ msgstr "Tamam" +#, fuzzy #~ msgid "OpenAL" -#~ msgstr "OpenAL" +#~ msgstr "Aç" +#, fuzzy #~ msgid "OpenGL" -#~ msgstr "OpenGL" +#~ msgstr "Aç" #~ msgid "Plugins" #~ msgstr "Eklentiler" @@ -6419,8 +6489,18 @@ msgstr "| VEYA" #~ "Dolphin'i salt okunur bir konumdan veya kurulmadığı yerden mi " #~ "çalıştırıyorsunuz?" +#~ msgid "Premature movie end in PlayController. %u + 8 > %u" +#~ msgstr "PlayController'da erken kayıt bitişi. %u + 8 > %u" + +#~ msgid "Premature movie end in PlayWiimote. %u + %d > %u" +#~ msgstr "PlayWiimote'da erken kayıt bitişi. %u + %d > %u" + +#~ msgid "Premature movie end in PlayWiimote. %u > %u" +#~ msgstr "PlayWiimote'da erken kayıt bitişi. %u > %u" + +#, fuzzy #~ msgid "Projection Stats" -#~ msgstr "Projeksiyon Durumu" +#~ msgstr "Özel Görüntüleme Hilesi Ayarları" #~ msgid "Pulse" #~ msgstr "Vuruş" @@ -6428,8 +6508,9 @@ msgstr "| VEYA" #~ msgid "Relaunch Dolphin from the install directory and save from there" #~ msgstr "Dolphin'i kurulum konumundan tekrar başlat ve buradan kaydet" +#, fuzzy #~ msgid "Render to main window." -#~ msgstr "Oyunu ana pencerede çalıştırır." +#~ msgstr "Ana pencerede yorumla" #~ msgid "Rendering" #~ msgstr "Yorumlama" @@ -6437,8 +6518,9 @@ msgstr "| VEYA" #~ msgid "Required for using the Japanese ROM font." #~ msgstr "Japon ROM'lardaki yazıyı kullanmak için gereklidir." +#, fuzzy #~ msgid "Run" -#~ msgstr "Çalıştır" +#~ msgstr "Enter" #~ msgid "Running script...\n" #~ msgstr "Script çalıştırılıyor... \n" @@ -6455,8 +6537,9 @@ msgstr "| VEYA" #~ "Bir diskin güncelleme bölüntüsünden genişletilen Sistem Menüsü WAD'ını " #~ "seçin." +#, fuzzy #~ msgid "Select the script to load" -#~ msgstr "Yüklemek için Script seçin" +#~ msgstr "Yüklemek için durum seçin" #~ msgid "" #~ "Selects which game should be affected by the configuration changes done " @@ -6484,8 +6567,9 @@ msgstr "| VEYA" #~ "Projeksiyon durumunu göster. \n" #~ "Sadece hata ayıklamada kullanışlıdır." +#, fuzzy #~ msgid "Show save banner" -#~ msgstr "Kayıt afişini göster" +#~ msgstr "Kayıt simgesini göster" #~ msgid "Show the number of frames rendered per second." #~ msgstr "Saniyede kaç karenin görüntülendiğini göster." @@ -6500,8 +6584,9 @@ msgstr "| VEYA" #~ msgid "Skies of Arcadia" #~ msgstr "Skies of Arcadia" +#, fuzzy #~ msgid "Slot" -#~ msgstr "Slot" +#~ msgstr "Slot A" #~ msgid "Sonic and the Black Knight" #~ msgstr "Sonic and the Black Knight + NFS Nitro" @@ -6529,8 +6614,9 @@ msgstr "| VEYA" #~ "Diğer seçenekler görüntü boyutundan bağımsız olarak seçilen düzeltilmiş " #~ "çözünürlüklerdir." +#, fuzzy #~ msgid "Specify an audio plugin" -#~ msgstr "Bir ses eklentisi belirtin" +#~ msgstr "Bir görüntü arka ucu belirtin" #~ msgid "Start Renderer in Fullscreen" #~ msgstr "Görüntüyü Tam Ekran başlat" @@ -6538,14 +6624,18 @@ msgstr "| VEYA" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Oyununuz tam ekran görüntüyle başlar." +#~ msgid "TaruKonga (Bongos)" +#~ msgstr "TaruKonga (Bongos)" + #~ msgid "The file " #~ msgstr "Dosya" #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "Ses efektlerini oynatmak için kullanılır." +#, fuzzy #~ msgid "Trying to load unsupported type %d" -#~ msgstr "Desteklenmeyen tür %d 'yi yüklemeyi deniyor" +#~ msgstr "Bilinmeyen bir dosya türünü yüklemeyi denedi." #~ msgid "Type %d config not supported in plugin %s" #~ msgstr "%d türü yapılandırma %s eklentisinde desteklenmiyor" @@ -6577,8 +6667,9 @@ msgstr "| VEYA" #~ "EFB kopyası kullanan oyunların görsel kalitesini artırır ama bazı " #~ "oyunlarda hatalara neden olur." +#, fuzzy #~ msgid "Video Backend:" -#~ msgstr "Görüntü Arka Ucu :" +#~ msgstr "Ses Çözücüsü:" #~ msgid "" #~ "Wait for vertical blanks.\n" @@ -6587,6 +6678,61 @@ msgstr "| VEYA" #~ "Dikey boşlukları bekle. \n" #~ "Yırtılmayı azaltır ama performansı da azaltır." +#~ 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 "" +#~ "Dikkat: Şu anki kaydın bitişinden sonra yer alan bir kayıt yüklediniz. " +#~ "(Bayt %u > %u) (Çerçeve %u > %u). Devam etmeden önce başka bir kayıt " +#~ "yüklemeniz, veya bu kaydı Salt Okunur mod kapalıyken yüklemeniz daha iyi " +#~ "olacaktır. Aksi taktirde, büyük bir ihtimalle, senkronizasyon sorunu " +#~ "yaşayacaksınız." + +#~ 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 "" +#~ "Dikkat: Bayt %d (0x%X) ile eşleşmeyen bir kayıt yüklediniz. Devam etmeden " +#~ "önce başka bir kayıt yüklemeniz, veya bu kaydı Salt Okunur mod kapalıyken " +#~ "yüklemeniz daha iyi olacaktır. Aksi taktirde, büyük bir ihtimalle, " +#~ "senkronizasyon sorunu yaşayacaksınız." + +#~ 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 "" +#~ "Dikkat: Çerçeve %d ile eşleşmeyen bir kayıt yüklediniz. Devam etmeden " +#~ "önce başka bir kayıt yüklemeniz, veya bu kaydı Salt Okunur mod kapalıyken " +#~ "yüklemeniz daha iyi olacaktır. Aksi taktirde, büyük bir ihtimalle, " +#~ "senkronizasyon sorunu yaşayacaksınız.\n" +#~ "\n" +#~ "Daha fazla bilgi: Şu anki kayıt %d çerçeve uzunluğunda, ama durum kaydı " +#~ "%d çerçeve uzunluğunda.\n" +#~ "\n" +#~ "Çerçeve %d 'de, şu anki kayıt bunları basıyor:\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" +#~ "Çerçeve %d 'de, durum kaydı bunları basıyor:\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" @@ -6607,17 +6753,20 @@ msgstr "| VEYA" #~ "(NOT: Güvenli doku önbelleklemesi hız artışını azaltır; doğru doku " #~ "önbelleklenmesi \"safe\" 'ye ayarlıysa daha yavaş olabilir!)" +#, fuzzy #~ msgid "Wiimote %i %s" -#~ msgstr "Wiimote %i %s" +#~ msgstr "Wiimote %i" +#, fuzzy #~ msgid "Wiimote Settings" -#~ msgstr "Wiimote Ayarları" +#~ msgstr "&Wiimote Ayarları" #~ msgid "Will enable progressive scan option if supported by software." #~ msgstr "Eğer yazılım desteği varsa progresif taramayı etkinleştirir." +#, fuzzy #~ msgid "Window Size:" -#~ msgstr "Pencere Boyutu:" +#~ msgstr "Otomatik (Pencere Boyutu)" #~ msgid "Window height for windowed mode" #~ msgstr "Pencere modu için yükseklik" From 7306257c0f4df9f00719e537e41c616d1550f278 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Tue, 27 Dec 2011 08:36:16 -0600 Subject: [PATCH 09/14] 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 "執行中..." From 685d02c0a607b241437ac1c758aeb23f0c6adcbd Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Tue, 27 Dec 2011 08:37:26 -0600 Subject: [PATCH 10/14] Clean up Turkish translation file. --- Languages/po/tr.po | 417 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 322 insertions(+), 95 deletions(-) diff --git a/Languages/po/tr.po b/Languages/po/tr.po index fe4f784856..a3e5d84924 100644 --- a/Languages/po/tr.po +++ b/Languages/po/tr.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" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -15,6 +16,9 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. "PO-Revision-Date: 2011-08-19 08:38-0500\n" ======= +======= +"POT-Creation-Date: 2011-12-18 13:39-0600\n" +>>>>>>> Clean up Turkish translation file. "PO-Revision-Date: 2011-12-20 19:22+0200\n" >>>>>>> Update Hungarian and Turkish translations. "Last-Translator: nlgzrgn \n" @@ -561,6 +565,7 @@ msgstr "Yama Ekle" msgid "Add new pane" msgstr "Bölme ekle" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 @@ -570,6 +575,11 @@ msgstr "Bölme ekle" #: 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 +>>>>>>> Clean up Turkish translation file. msgid "Add..." msgstr "Ekle..." @@ -639,6 +649,7 @@ msgstr "Tüm GC/Wii kalıpları (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Tüm GameCube GCM Dosyaları (gcm)" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 @@ -646,6 +657,10 @@ msgstr "Tüm GameCube GCM Dosyaları (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 +>>>>>>> Clean up Turkish translation file. msgid "All Save States (sav, s##)" msgstr "Tüm Kayıtlı Oyunlar (sav,s##)" @@ -734,11 +749,15 @@ msgstr "" "Bu dosyayı gerçekten silmek istiyor musunuz? Silindikten sonra bu dosyaları " "geri döndüremezsiniz!" +<<<<<<< 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 +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "En-boy Oranı:" @@ -759,11 +778,15 @@ msgstr "Ses Çözücüsü:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: AO sürücüyü açarken hata.\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 +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Otomatik" @@ -879,10 +902,14 @@ msgstr "Mavi Sağ" #: 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 +>>>>>>> Clean up Turkish translation file. msgid "Bottom" msgstr "Alt" @@ -915,11 +942,15 @@ msgstr "Çıkış klasörü için gözat" msgid "Buffer:" msgstr "Tampon:" +<<<<<<< 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 +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1166,10 +1197,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 +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 msgid "Close" msgstr "Kapat" @@ -1278,11 +1313,15 @@ msgstr "Wiimote 3'ü Bağla" msgid "Connect Wiimote 4" msgstr "Wiimote 4'ü Bağla" +<<<<<<< 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 +>>>>>>> Clean up Turkish translation file. msgid "Connecting..." msgstr "Bağlanıyor..." @@ -1476,10 +1515,14 @@ msgstr "Ses Emülatörü Motoru" #: 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 +>>>>>>> Clean up Turkish translation file. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE Emülasyonu (Hızlı)" @@ -1709,11 +1752,15 @@ msgstr "" msgid "Divide" msgstr "Böl" +<<<<<<< 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 +>>>>>>> Clean up Turkish translation file. msgid "Do you want to stop the current emulation?" msgstr "Emülasyonu durdurmak istiyor musunuz?" @@ -1742,6 +1789,7 @@ msgstr "Dolphin Taklit Wiimote Yapılandırması" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" @@ -1757,6 +1805,14 @@ msgstr "Dolphin GC Kolu Yapılandırması" #: 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 Kolu Yapılandırması" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +>>>>>>> Clean up Turkish translation file. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Filmleri (*.dtm)" @@ -1853,6 +1909,7 @@ msgstr "" "\n" "Emin değilseniz, işaretsiz bırakın." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 @@ -1862,6 +1919,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 +>>>>>>> Clean up Turkish translation file. msgid "Dutch" msgstr "Flemenkçe" @@ -2004,6 +2066,7 @@ msgstr "BAT'a İzin Ver" msgid "Enable Block Merging" msgstr "Blok Birleşimine İzin Ver" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" @@ -2011,15 +2074,25 @@ msgstr "" ======= >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +msgid "Enable Bounding Box Calculation" +msgstr "Sınırlayıcı Kutu Hesaplama'yı Etkinleştir" + +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Ön Belleğe İzin Ver" +<<<<<<< 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 +>>>>>>> Clean up Turkish translation file. msgid "Enable Cheats" msgstr "Hilelere İzin Ver" @@ -2176,6 +2249,7 @@ msgstr "" msgid "End" msgstr "Son" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 @@ -2185,6 +2259,11 @@ msgstr "Son" #: 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 +>>>>>>> Clean up Turkish translation file. msgid "English" msgstr "İngilizce" @@ -2214,6 +2293,7 @@ msgstr "Eşit" #: 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 "Hata" @@ -2231,6 +2311,21 @@ msgid "Error" msgstr "Hata" >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +msgid "Error" +msgstr "Hata" + +#: 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'da hata. %u != %u, byte %d.\n" +"Üzgünüz, Wii kaydında geçici hasar var." + +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Seçili dili yüklerken hata. Sistem varsayılanlarına geri dönülüyor." @@ -2241,6 +2336,11 @@ msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" +<<<<<<< HEAD +======= +"Hata: \"%s\" 'dan sonra, %d (0x%X) bulundu ( %d (0x%X) yerine). Durum kaydı " +"yüklemesinden vazgeçiliyor..." +>>>>>>> Clean up Turkish translation file. #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format @@ -2685,6 +2785,7 @@ msgstr "Çekilecek Çerçeveler" msgid "Free Look" msgstr "Serbest Bakış" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 @@ -2694,6 +2795,11 @@ msgstr "Serbest Bakış" #: 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 +>>>>>>> Clean up Turkish translation file. msgid "French" msgstr "Fransızca" @@ -2719,9 +2825,14 @@ msgid "GCI File(*.gci)" msgstr "GCI Dosyası (*.gci)" #: Source/Core/DolphinWX/Src/GCMicDlg.h:44 +<<<<<<< HEAD #, fuzzy msgid "GCMic Configuration" msgstr "Geçmiş Yapılandırması" +======= +msgid "GCMic Configuration" +msgstr "GCMic Yapılandırması" +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" @@ -2761,10 +2872,14 @@ msgstr "Gamecube Kolu Ayarları (&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 +>>>>>>> Clean up Turkish translation file. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "GameCube Hafıza Kartları (*.raw,*.gcp)" @@ -2788,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 +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Genel" @@ -2801,6 +2921,7 @@ msgstr "Genel" msgid "General Settings" msgstr "Genel Ayarlar" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 @@ -2810,6 +2931,11 @@ msgstr "Genel Ayarlar" #: 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 +>>>>>>> Clean up Turkish translation file. msgid "German" msgstr "Almanca" @@ -2939,11 +3065,16 @@ msgstr "Kısayol Tuşu Yapılandırması" #: 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 +>>>>>>> Clean up Turkish translation file. msgid "Hotkeys" msgstr "Tuşlar" @@ -3014,6 +3145,11 @@ msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" +<<<<<<< HEAD +======= +"Eğer işaretlenmişse, sınırlayıcı kutu kayıtları güncellenecektir. Paper " +"Mario oyunları tarafından kullanılır." +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "" @@ -3166,11 +3302,15 @@ msgstr "" "Kurulum Özel Durum İşleyici çağrıldı, ama bu platform henüz bunu " "desteklemiyor." +<<<<<<< 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 +>>>>>>> Clean up Turkish translation file. msgid "Installing WAD..." msgstr "WAD kuruluyor..." @@ -3252,6 +3392,7 @@ msgstr "Hatalı çekim dosyası" msgid "Invalid state" msgstr "Hatalı durum" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -3261,6 +3402,11 @@ msgstr "Hatalı durum" #: 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 +>>>>>>> Clean up Turkish translation file. msgid "Italian" msgstr "İtalyanca" @@ -3418,6 +3564,7 @@ msgstr "Durumu Yükle : 8" msgid "Load State..." msgstr "Durumu Yükle..." +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" @@ -3431,6 +3578,13 @@ msgstr "Wii Sistem Menüsünü Yükle" #: 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 Sistem Menüsünü Yükle" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +>>>>>>> Clean up Turkish translation file. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii Sistem Menüsünü Yükle %d%c" @@ -3512,11 +3666,15 @@ msgstr "MMU Hız Hilesi" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark dosyaları(*.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 +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Ana Çubuk" @@ -3548,10 +3706,14 @@ msgstr "Hafıza Baytı" #: 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 +>>>>>>> Clean up Turkish translation file. msgid "Memory Card" msgstr "Hafıza Kartı" @@ -3749,11 +3911,15 @@ msgstr "NP Sekme" msgid "NP Up" msgstr "NP Yukarı" +<<<<<<< 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 +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3840,11 +4006,15 @@ msgstr "Eşit Değil" msgid "Not Set" msgstr "Ayarlanmamış" +<<<<<<< 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 +>>>>>>> Clean up Turkish translation file. msgid "Not connected" msgstr "Bağlı değil" @@ -3906,9 +4076,13 @@ msgstr "Sadece %d blok kullanılabilir" #: 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 +>>>>>>> Clean up Turkish translation file. msgid "Open" msgstr "Aç" @@ -4039,6 +4213,7 @@ msgstr "Yamalar" msgid "Paths" msgstr "Yollar" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 @@ -4046,6 +4221,10 @@ msgstr "Yollar" #: 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 +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Duraklat" @@ -4066,12 +4245,17 @@ msgstr "Perspektif %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 +>>>>>>> Clean up Turkish translation file. msgid "Play" msgstr "Oynat" @@ -4097,11 +4281,15 @@ msgstr "Oynatma Seçenekleri" msgid "Players" msgstr "Oyuncular" +<<<<<<< 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 +>>>>>>> Clean up Turkish translation file. msgid "Please confirm..." msgstr "Lütfen onaylayın..." @@ -4153,17 +4341,29 @@ msgstr "Geç İşleme Etkisi:" #: Source/Core/Core/Src/Movie.cpp:735 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" +<<<<<<< HEAD msgstr "" +======= +msgstr "PlayController'da erken kayıt bitişi. %u + 8 > %u" +>>>>>>> Clean up Turkish translation file. #: Source/Core/Core/Src/Movie.cpp:829 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" +<<<<<<< HEAD msgstr "" +======= +msgstr "PlayWiimote'da erken kayıt bitişi. %u + %d > %u" +>>>>>>> Clean up Turkish translation file. #: Source/Core/Core/Src/Movie.cpp:806 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" +<<<<<<< HEAD msgstr "" +======= +msgstr "PlayWiimote'da erken kayıt bitişi. %u > %u" +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " @@ -4312,6 +4512,7 @@ msgstr "Listeyi Yenile" msgid "Refresh game list" msgstr "Oyun Listesini Yenile" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 @@ -4323,6 +4524,12 @@ msgstr "Oyun Listesini Yenile" #: 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 +>>>>>>> Clean up Turkish translation file. msgid "Remove" msgstr "Kaldır" @@ -4342,9 +4549,13 @@ msgstr "Ana pencerede yorumla" #: 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 +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Sıfırla" @@ -4387,11 +4598,15 @@ msgstr "Durumu Kaydet (&V)" msgid "Safe" msgstr "Güvenli" +<<<<<<< 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 +>>>>>>> Clean up Turkish translation file. msgid "Sample Rate:" msgstr "Örnek Oran:" @@ -4475,11 +4690,15 @@ msgstr "Kayıtlı durum filmi %s bozuk, film çekimi duruyor..." msgid "Scaled EFB Copy" msgstr "Boyutlandırılmış EFB Kopyası" +<<<<<<< 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 +>>>>>>> Clean up Turkish translation file. #, c-format msgid "Scanning %s" msgstr "Taranıyor %s" @@ -4519,6 +4738,7 @@ msgstr "SYSCONF içinde %s bölümü bulunamadı" msgid "Select" msgstr "Seç" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 @@ -4534,6 +4754,14 @@ msgstr "Çekim Dosyasını Seç" #: 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 "Çekim Dosyasını Seç" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +>>>>>>> Clean up Turkish translation file. msgid "Select a Wii WAD file to install" msgstr "Kurmak için bir Wii WAD dosyası seçin" @@ -4559,6 +4787,7 @@ msgstr "Sabit olmayan pencereyi seçin" msgid "Select the file to load" msgstr "Yüklemek için dosyayı seçin" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 msgid "Select the save file" @@ -4571,15 +4800,22 @@ msgstr "Yüklemek için durum seçin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +>>>>>>> Clean up Turkish translation file. msgid "Select the save file" msgstr "Kayıt dosyasını seçin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 msgid "Select the state to load" msgstr "Yüklemek için durum seçin" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +>>>>>>> Clean up Turkish translation file. msgid "Select the state to save" msgstr "Kaydetmek için durum seçin" @@ -4955,6 +5191,7 @@ msgstr "Ses tamponu oluşturulamadı: %s" msgid "Space" msgstr "Boşluk" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -4964,6 +5201,11 @@ msgstr "Boşluk" #: 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 +>>>>>>> Clean up Turkish translation file. msgid "Spanish" msgstr "İspanyolca" @@ -5007,11 +5249,15 @@ msgstr "Kare Çubuk" msgid "Standard Controller" msgstr "Varsayılan Denetim Aygı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 +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5047,9 +5293,13 @@ msgstr "Çubuk" #: 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 +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Durdur" @@ -5127,15 +5377,23 @@ msgstr "Tablo Sağ" #: 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 +>>>>>>> Clean up Turkish translation file. msgid "Take Screenshot" msgstr "Ekran Görüntüsü Al" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "TaruKonga (Bongos)" +<<<<<<< HEAD msgstr "" +======= +msgstr "TaruKonga (Bongos)" +>>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" @@ -5374,18 +5632,26 @@ msgstr "Tüm Geçmiş Türlerini 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 +>>>>>>> Clean up Turkish translation file. msgid "Toggle Fullscreen" msgstr "Tam Ekran Moduna Geç" #: 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 +>>>>>>> Clean up Turkish translation file. msgid "Top" msgstr "Üst" @@ -5494,6 +5760,7 @@ msgstr "Şu ID ile bilinmeyen mesaj alındı : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "ID %d ile %d oyuncusundan bilinmeyen mesaj alındı. Oyuncu atılıyor!" +<<<<<<< HEAD <<<<<<< HEAD ======= #: Source/Core/Core/Src/HW/Memmap.cpp:633 @@ -5506,6 +5773,8 @@ msgstr "" "Devam?" >>>>>>> Update translation files for recent changes in the code. +======= +>>>>>>> Clean up Turkish translation file. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -5667,6 +5936,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 +======= +"Dikkat: Şu anki kaydın bitişinden sonra yer alan bir kayıt yüklediniz. (Bayt " +"%u > %u) (Çerçeve %u > %u). Devam etmeden önce başka bir kayıt yüklemeniz, " +"veya bu kaydı Salt Okunur mod kapalıyken yüklemeniz daha iyi olacaktır. Aksi " +"taktirde, büyük bir ihtimalle, senkronizasyon sorunu yaşayacaksınız." +>>>>>>> Clean up Turkish translation file. #: Source/Core/Core/Src/Movie.cpp:646 #, c-format @@ -5675,6 +5951,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 +======= +"Dikkat: Bayt %d (0x%X) ile eşleşmeyen bir kayıt yüklediniz. Devam etmeden " +"önce başka bir kayıt yüklemeniz, veya bu kaydı Salt Okunur mod kapalıyken " +"yüklemeniz daha iyi olacaktır. Aksi taktirde, büyük bir ihtimalle, " +"senkronizasyon sorunu yaşayacaksınız." +>>>>>>> Clean up Turkish translation file. #: Source/Core/Core/Src/Movie.cpp:655 #, c-format @@ -5694,6 +5977,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 +======= +"Dikkat: Çerçeve %d ile eşleşmeyen bir kayıt yüklediniz. Devam etmeden önce " +"başka bir kayıt yüklemeniz, veya bu kaydı Salt Okunur mod kapalıyken " +"yüklemeniz daha iyi olacaktır. Aksi taktirde, büyük bir ihtimalle, " +"senkronizasyon sorunu yaşayacaksınız.\n" +"\n" +"Daha fazla bilgi: Şu anki kayıt %d çerçeve uzunluğunda, ama durum kaydı %d " +"çerçeve uzunluğunda.\n" +"\n" +"Çerçeve %d 'de, şu anki kayıt bunları basıyor:\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" +"Çerçeve %d 'de, durum kaydı bunları basıyor:\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" +>>>>>>> Clean up Turkish translation file. #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 @@ -5728,11 +6029,15 @@ msgstr "Wii NAND Kök Dizini:" msgid "Wii Save Import" msgstr "Wii Kaydı Al" +<<<<<<< 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 +>>>>>>> Clean up Turkish translation file. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii kayıt dosyaları (*.bin)|*.bin" @@ -5763,11 +6068,15 @@ msgstr "" "bir zaman aşımı olabilir veya başka bir şey olabilir. \n" "Tekrar bağlamak istiyor musunuz?" +<<<<<<< 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 +>>>>>>> Clean up Turkish translation file. msgid "Wiimote Connected" msgstr "Wiimote Bağlandı" @@ -5799,6 +6108,7 @@ msgstr "Pencereleri Sağa Döşe" msgid "Word Wrap" msgstr "Heceleme" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 @@ -5808,6 +6118,11 @@ msgstr "Heceleme" #: 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 +>>>>>>> Clean up Turkish translation file. msgid "Working..." msgstr "Çalışıyor..." @@ -6112,11 +6427,17 @@ msgstr "| VEYA" #~ msgid "Can't open %s, it has a missing function" #~ msgstr "%s açılamıyor, kayıp bir işleve sahip." +<<<<<<< HEAD <<<<<<< HEAD #~ msgid "Cannot record movies in read-only mode." #~ msgstr "Salt-okunur modda film çekilemez." ======= +======= +#~ msgid "Cannot record movies in read-only mode." +#~ msgstr "Salt-okunur modda film çekilemez." + +>>>>>>> Clean up Turkish translation file. #, fuzzy >>>>>>> Update Hungarian and Turkish translations. #~ msgid "Config..." @@ -6230,9 +6551,6 @@ msgstr "| VEYA" #~ msgid "Emulator Display Settings" #~ msgstr "Emülatör Görüntü Ayarları" -#~ msgid "Enable Bounding Box Calculation" -#~ msgstr "Sınırlayıcı Kutu Hesaplama'yı Etkinleştir" - #, fuzzy #~ msgid "Enable CPU Access" #~ msgstr "Ön Belleğe İzin Ver" @@ -6296,13 +6614,6 @@ msgstr "| VEYA" #~ msgid "Error allocating buffer" #~ msgstr "Tampon ayırma hatası" -#~ msgid "" -#~ "Error in PlayWiimote. %u != %u, byte %d.\n" -#~ "Sorry, Wii recording is temporarily broken." -#~ msgstr "" -#~ "PlayWiimote'da hata. %u != %u, byte %d.\n" -#~ "Üzgünüz, Wii kaydında geçici hasar var." - #~ msgid "Error loading %s: can't read info" #~ msgstr "%s yüklenirken hata: Bilgi okunamıyor." @@ -6315,13 +6626,6 @@ msgstr "| VEYA" #~ msgid "Error opening file %s for recording" #~ msgstr "Kayıt için %s dosyasını açarken hata." -#~ msgid "" -#~ "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " -#~ "Aborting savestate load..." -#~ msgstr "" -#~ "Hata: \"%s\" 'dan sonra, %d (0x%X) bulundu ( %d (0x%X) yerine). Durum " -#~ "kaydı yüklemesinden vazgeçiliyor..." - #~ msgid "" #~ "Failed to load DSP ROM:\n" #~ "%s\n" @@ -6360,9 +6664,6 @@ msgstr "| VEYA" #~ "Dokuya EFB Kopyalamaktan daha doğrudur, ve bazı oyunlar düzgün çalışmak " #~ "için buna ihtiyaç duyar, ama çok yavaş olabilir." -#~ msgid "GCMic Configuration" -#~ msgstr "GCMic Yapılandırması" - #, fuzzy #~ msgid "GFX Config" #~ msgstr "Yapılandırma" @@ -6388,13 +6689,6 @@ msgstr "| VEYA" #~ "Eğer bir oyun çakılırsa, sadece Interpreter'da çalışıyorsa veya Dolphin " #~ "çökerse, bu seçenek oyunu düzeltebilir." -#~ msgid "" -#~ "If checked, the bounding box registers will be updated. Used by the Paper " -#~ "Mario games." -#~ msgstr "" -#~ "Eğer işaretlenmişse, sınırlayıcı kutu kayıtları güncellenecektir. Paper " -#~ "Mario oyunları tarafından kullanılır." - #~ msgid "Input Source" #~ msgstr "Giriş Kaynağı" @@ -6489,15 +6783,6 @@ msgstr "| VEYA" #~ "Dolphin'i salt okunur bir konumdan veya kurulmadığı yerden mi " #~ "çalıştırıyorsunuz?" -#~ msgid "Premature movie end in PlayController. %u + 8 > %u" -#~ msgstr "PlayController'da erken kayıt bitişi. %u + 8 > %u" - -#~ msgid "Premature movie end in PlayWiimote. %u + %d > %u" -#~ msgstr "PlayWiimote'da erken kayıt bitişi. %u + %d > %u" - -#~ msgid "Premature movie end in PlayWiimote. %u > %u" -#~ msgstr "PlayWiimote'da erken kayıt bitişi. %u > %u" - #, fuzzy #~ msgid "Projection Stats" #~ msgstr "Özel Görüntüleme Hilesi Ayarları" @@ -6624,9 +6909,6 @@ msgstr "| VEYA" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Oyununuz tam ekran görüntüyle başlar." -#~ msgid "TaruKonga (Bongos)" -#~ msgstr "TaruKonga (Bongos)" - #~ msgid "The file " #~ msgstr "Dosya" @@ -6678,61 +6960,6 @@ msgstr "| VEYA" #~ "Dikey boşlukları bekle. \n" #~ "Yırtılmayı azaltır ama performansı da azaltır." -#~ 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 "" -#~ "Dikkat: Şu anki kaydın bitişinden sonra yer alan bir kayıt yüklediniz. " -#~ "(Bayt %u > %u) (Çerçeve %u > %u). Devam etmeden önce başka bir kayıt " -#~ "yüklemeniz, veya bu kaydı Salt Okunur mod kapalıyken yüklemeniz daha iyi " -#~ "olacaktır. Aksi taktirde, büyük bir ihtimalle, senkronizasyon sorunu " -#~ "yaşayacaksınız." - -#~ 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 "" -#~ "Dikkat: Bayt %d (0x%X) ile eşleşmeyen bir kayıt yüklediniz. Devam etmeden " -#~ "önce başka bir kayıt yüklemeniz, veya bu kaydı Salt Okunur mod kapalıyken " -#~ "yüklemeniz daha iyi olacaktır. Aksi taktirde, büyük bir ihtimalle, " -#~ "senkronizasyon sorunu yaşayacaksınız." - -#~ 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 "" -#~ "Dikkat: Çerçeve %d ile eşleşmeyen bir kayıt yüklediniz. Devam etmeden " -#~ "önce başka bir kayıt yüklemeniz, veya bu kaydı Salt Okunur mod kapalıyken " -#~ "yüklemeniz daha iyi olacaktır. Aksi taktirde, büyük bir ihtimalle, " -#~ "senkronizasyon sorunu yaşayacaksınız.\n" -#~ "\n" -#~ "Daha fazla bilgi: Şu anki kayıt %d çerçeve uzunluğunda, ama durum kaydı " -#~ "%d çerçeve uzunluğunda.\n" -#~ "\n" -#~ "Çerçeve %d 'de, şu anki kayıt bunları basıyor:\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" -#~ "Çerçeve %d 'de, durum kaydı bunları basıyor:\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" From 5c66c5b138071e454061f3a68b578f7bd2f01d95 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Wed, 28 Dec 2011 08:55:06 -0600 Subject: [PATCH 11/14] Update Hungarian translation. --- Languages/po/hu.po | 666 +++++++++++++++------------------------------ 1 file changed, 224 insertions(+), 442 deletions(-) diff --git a/Languages/po/hu.po b/Languages/po/hu.po index 27ed2a0941..7bdf045357 100644 --- a/Languages/po/hu.po +++ b/Languages/po/hu.po @@ -21,8 +21,12 @@ msgstr "" >>>>>>> Update Hungarian and Turkish translations. ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" +<<<<<<< HEAD "PO-Revision-Date: 2011-12-27 08:22-0600\n" >>>>>>> Update from master branch. +======= +"PO-Revision-Date: 2011-12-28 09:44+0100\n" +>>>>>>> Update Hungarian translation. "Last-Translator: Delirious \n" "Language-Team: Delirious \n" "Language: Hungarian\n" @@ -128,8 +132,7 @@ msgid "" "file is not large enough to be a valid memory card file (0x%x bytes)" msgstr "" "%s memóriakártyakénti betöltése sikertelen\n" -"a fájl nem elég nagy ahhoz, hogy megfelelő memóriakártya fájl lehessen (0x%x " -"bájt)" +"a fájl nem elég nagy ahhoz, hogy megfelelő memóriakártya fájl lehessen (0x%x bájt)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 #, c-format @@ -264,7 +267,7 @@ msgstr "&Memória" #: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Open..." -msgstr "&Megnyitás" +msgstr "&Megnyitás..." #: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "&Options" @@ -395,19 +398,17 @@ msgid "" "(Only the Microsoft bluetooth stack is supported.)" msgstr "" "Nem található támogatott bluetooth eszköz!\n" -"(Csak a Microsoft bluetooth eszközök támogatottak.)" +"(Csak Microsoft rangsorolású bluetooth eszköz támogatott.)" #: Source/Core/DolphinWX/Src/NetWindow.cpp:93 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" @@ -417,17 +418,14 @@ msgid "" msgstr "" "FIGYELEM:\n" "\n" -"A NetPlay jelenleg csak a következő beállítások használatával működik " -"megfelelően:\n" +"A NetPlay jelenleg csak a következő beállítások használatával működik megfelelően:\n" " - Dual Core [KI]\n" " - Hang szabályozás [KI]\n" " - DSP-HLE \"Null Audio\" használatával vagy DSP-LLE\n" -" - Kézileg legyen beállítva az irányítók pontos száma, amik használva " -"lesznek, mint [szabvány irányító]\n" +" - Kézileg legyen beállítva az irányítók pontos száma, amik használva lesznek, mint [szabvány irányító]\n" "\n" "Minden játékosnak azonos Dolphin verziót és beállításokat kell használnia.\n" -"Legyen minden memóriakártya kikapcsolva vagy mindenkinek továbbítani kell a " -"játék megkezdése előtt.\n" +"Legyen minden memóriakártya kikapcsolva vagy mindenkinek továbbítani kell a játék megkezdése előtt.\n" "Wiimote támogatás még nem működik.\n" "\n" "Továbbítani kell a TCP portot a host számára!!" @@ -468,14 +466,12 @@ msgstr "Pontos VBeam emuláció" >>>>>>> Update Hungarian and Turkish translations. 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 másolatok pontos emulációja.\n" -"Néhány játék számára elengedhetetlen bizonyos grafikai effektushoz vagy a " -"játszhatóság végett.\n" +"Néhány játék számára elengedhetetlen bizonyos grafikai effektushoz vagy a játszhatóság végett.\n" "\n" "Ha bizonytalan vagy, válaszd az EFB textúrába másolása lehetőséget." @@ -501,38 +497,23 @@ 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 hiba: érvénytelen méret (%08x : address = %08x) a kód " -"hozzáadásban (%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" +msgstr "Action Replay hiba: érvénytelen méret (%08x : address = %08x) a kód hozzáadásban (%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 hiba: érvénytelen méret (%08x : address = %08x) a kitöltésben " -"és regiszterben (%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide (%s)" +msgstr "Action Replay hiba: érvénytelen méret (%08x : address = %08x) a kitöltésben és regiszterben (%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 hiba: érvénytelen méret (%08x : address = %08x) a RAM írásban " -"és kitöltésben (%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And Fill (%s)" +msgstr "Action Replay hiba: érvénytelen méret (%08x : address = %08x) a RAM írásban és kitöltésben (%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 hiba: érvénytelen méret (%08x : address = %08x) a mutató " -"írásában (%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Write To Pointer (%s)" +msgstr "Action Replay hiba: érvénytelen méret (%08x : address = %08x) a mutató írásában (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:803 #, c-format @@ -541,8 +522,7 @@ msgstr "Action Replay hiba: érvénytelen érték (%08x) a memória másolásban #: Source/Core/Core/Src/ActionReplay.cpp:684 #, c-format -msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +msgid "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" msgstr "Action Replay hiba: Mester kód és CCXXXXXX írása nincs beépítve (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:196 @@ -617,16 +597,14 @@ msgstr "Cím:" 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." msgstr "" "Meghatározott értéket ad a zFar paraméterhez.\n" "Két módja a lebegőpontos értékek kifejezésének.\n" -"Például: a ''200'' vagy ''0.0002'' érték közvetlen megadása, azonos " -"hatásokat eredményez, a kapott érték ''0.0002'' lesz.\n" +"Például: a ''200'' vagy ''0.0002'' érték közvetlen megadása, azonos hatásokat eredményez, a kapott érték ''0.0002'' lesz.\n" "Értékek: (0->+/-egész szám) vagy (0->+/-FP[6 számjegyes pontosság])\n" "\n" "MEGJEGYZÉS: Ellenőrizd a napló ablakot/konzolt a kapott értékekhez." @@ -635,25 +613,21 @@ 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." msgstr "" "Meghatározott értéket ad a zNear paraméterhez.\n" "Két módja a lebegőpontos értékek kifejezésének.\n" -"Például: a ''200'' vagy ''0.0002'' érték közvetlen megadása, azonos " -"hatásokat eredményez, a kapott érték ''0.0002'' lesz.\n" +"Például: a ''200'' vagy ''0.0002'' érték közvetlen megadása, azonos hatásokat eredményez, a kapott érték ''0.0002'' lesz.\n" "Értékek: (0->+/-egész szám) vagy (0->+/-FP[6 számjegyes pontosság])\n" "\n" "MEGJEGYZÉS: Ellenőrizd a napló ablakot/konzolt a kapott értékekhez." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 msgid "Adjust the analog control pressure required to activate buttons." -msgstr "" -"Az analóg irányító gombok aktiválásához szükséges lenyomás érzékenységének " -"beállítása." +msgstr "Az analóg irányító gombok aktiválásához szükséges lenyomás érzékenységének beállítása." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Advanced" @@ -704,13 +678,11 @@ msgstr "Minden fájl (*.*)|*.*" #: 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 "" -"Bizonyos opciók elérhetővé válnak a 3, 4, 5, 6 és 7 gyorsbillentyűkkel az " -"emulációs ablakon belül.\n" +"Bizonyos opciók elérhetővé válnak a 3, 4, 5, 6 és 7 gyorsbillentyűkkel az emulációs ablakon belül.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -739,8 +711,7 @@ msgstr "Élsimítás:" #: Source/Core/DiscIO/Src/VolumeDirectory.cpp:317 msgid "Apploader is the wrong size...is it really an apploader?" -msgstr "" -"A betöltő program nem megfelelő méretű...ez tényleg egy betöltő program?" +msgstr "A betöltő program nem megfelelő méretű...ez tényleg egy betöltő program?" #: Source/Core/DiscIO/Src/VolumeDirectory.cpp:311 msgid "Apploader unable to load from file" @@ -752,7 +723,7 @@ msgstr "Betöltő program:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 msgid "Apply" -msgstr "Elfogadás" +msgstr "Alkalmaz" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 msgid "" @@ -760,7 +731,7 @@ msgid "" "\n" "If unsure, select (off)." msgstr "" -"Egy képkocka elkészültét követően egy utófeldolgozási effektus alkalmazása.\n" +"Képkocka létrehozását követően utófeldolgozási effektus alkalmazása.\n" "\n" "Ha bizonytalan vagy, válaszd ezt: (ki)." @@ -856,10 +827,8 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"Automatikusan létrehozza a mipmapeket, inkább mintsem kikódolná azokat a " -"memóriából.\n" -"Egy keveset növel a teljesítményen, de kisebb textúra hiányosságokat " -"okozhat.\n" +"Automatikusan létrehozza a mipmapeket, inkább mintsem kikódolná azokat a memóriából.\n" +"Egy keveset növel a teljesítményen, de kisebb textúra hiányosságokat okozhat.\n" "\n" "Ha bizonytalan vagy, hagyd kijelölve." @@ -949,7 +918,7 @@ msgstr "Kék jobbra" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. msgid "Bottom" -msgstr "Lent" +msgstr "Gomb" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 #, c-format @@ -1013,17 +982,12 @@ msgstr "Kijelző listák gyorsítótárazása" #: 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 "" -"A 3D-s grafika mélységének értékét képpont alapon számolja inkább, mintsem " -"csúcspont alapon.\n" -"Ellentétben a képpont megvilágítással (ami pusztán egy finomítás), a képpont " -"alapú mélység számítás csupán csak néhány játék pontos emulálásához " -"szükséges.\n" +"A 3D-s grafika mélységének értékét képpont alapon számolja inkább, mintsem csúcspont alapon.\n" +"Ellentétben a képpont megvilágítással (ami pusztán egy finomítás), a képpont alapú mélység számítás csupán csak néhány játék pontos emulálásához szükséges.\n" "\n" "Ha bizonytalan vagy, hagyd kijelölve." @@ -1035,8 +999,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"A 3D-s grafikai fényhatásokat képpont alapon számolja inkább, mintsem " -"csúcspont alapon.\n" +"A 3D-s grafikai fényhatásokat képpont alapon számolja inkább, mintsem csúcspont alapon.\n" "Néhány százalékkal csökkenti az emuláció sebességét (videókártyától függ).\n" "Ez többnyire biztonságos finomítás, de időnként hibákat okozhat.\n" "\n" @@ -1045,7 +1008,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" -msgstr "Mégsem" +msgstr "Mégse" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:91 #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:178 @@ -1066,7 +1029,7 @@ msgstr "A mozgások rögzítése nem lehetséges írásvédett módban." >>>>>>> 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" +msgstr "Nem lehet esemény bejegyzéseket törölni függőben lévő eseményekkel" <<<<<<< HEAD <<<<<<< HEAD @@ -1211,12 +1174,8 @@ msgid "Choose a memory card:" msgstr "Válassz memóriakártyát:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 -msgid "" -"Choose file to use as apploader: (applies to discs constructed from " -"directories only)" -msgstr "" -"Válassz betöltő programnak használandó fájlt: (csak könyvtárakból " -"létrehozott lemezekre érvényesíthető)" +msgid "Choose file to use as apploader: (applies to discs constructed from directories only)" +msgstr "Válassz betöltő programnak használandó fájlt: (csak könyvtárakból létrehozott lemezekre érvényesíthető)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 @@ -1243,12 +1202,8 @@ msgid "Clear failed." msgstr "Törlés sikertelen." #: Source/Core/Core/Src/NetPlayServer.cpp:259 -msgid "" -"Client disconnect while game is running!! NetPlay is disabled. You must " -"manually stop the game." -msgstr "" -"A kliens kapcsolata megszakadt játék közben! A NetPlay kikapcsolva. Kézileg " -"kell leállítanod a játékot." +msgid "Client disconnect while game is running!! NetPlay is disabled. You must manually stop the game." +msgstr "A kliens kapcsolata megszakadt játék közben! A NetPlay kikapcsolva. Kézileg kell leállítanod a játékot." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 @@ -1418,14 +1373,8 @@ msgstr "%s hang feldolgozó iniciálása sikertelen." #: 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." -msgstr "" -"\"%s\" nem olvasható. Nincs lemez a meghajtóban, vagy ez nem egy GC/Wii " -"biztonsági mentés. Célszerű tudni, hogy az eredeti Gamecube és Wii " -"lemezeket a legtöbb számítógépes DVD meghajtó nem képes olvasni." +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\" nem olvasható. Nincs lemez a meghajtóban, vagy ez nem egy GC/Wii biztonsági mentés. Célszerű tudni, hogy az eredeti Gamecube és Wii lemezeket a legtöbb számítógépes DVD meghajtó nem képes olvasni." #: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format @@ -1450,8 +1399,7 @@ msgstr "" 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 memóriakártya fájl nem írható.\n" "\n" @@ -1493,10 +1441,8 @@ msgid "Created by KDE-Look.org" msgstr "Készítette: KDE-Look.org" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 -msgid "" -"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -msgstr "" -"Készítette: Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +msgid "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +msgstr "Készítette: Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Created by VistaIcons.com" @@ -1504,8 +1450,7 @@ msgstr "Készítette: VistaIcons.com" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "Created by black_rider and published on ForumW.org > Web Developments" -msgstr "" -"Készítette: black_rider és közzétette ForumW.org > Web Developments oldalon" +msgstr "Készítette: black_rider és közzétette ForumW.org > Web Developments oldalon" #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 msgid "Creator: " @@ -1681,12 +1626,8 @@ msgstr "Észlelés" #: 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 "" -"A kimeneti puffernél nagyobb adamennyiség kiolvasására történő probálkozás " -"észlelve a DVD lemezről. Beszabályozás." +msgid "Detected attempt to read more data from the DVD than fit inside the out buffer. Clamp." +msgstr "A kimeneti puffernél nagyobb adamennyiség kiolvasására történő probálkozás észlelve a DVD lemezről. Beszabályozás." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 @@ -1742,32 +1683,24 @@ msgstr "Textúrák kikapcsolása" #: 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 "" "Bármilyen XFB emuláció kikapcsolása.\n" -"Nagymértékben gyorsítja az emulációt, de számos grafikai hibát okoz sok " -"olyan játékban, amelyhez szükséges az XFB (főleg egyedi fejlesztésű " -"alkalmazások).\n" +"Nagymértékben gyorsítja az emulációt, de számos grafikai hibát okoz sok olyan játékban, amelyhez szükséges az XFB (főleg egyedi fejlesztésű alkalmazások).\n" "\n" "Ha bizonytalan vagy, hagyd kijelölve." #: 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 másolatok emulációjának kikapcsolása.\n" -"A másolatok gyakran használatosak utófeldolgozáshoz vagy textúra " -"megjelenítési effektusokhoz, ezért ennek a beállításnak a kijelölésével " -"nagymértékű sebesség növekedés érhető el, azonban majdnem mindig hibákat is " -"okoz.\n" +"A másolatok gyakran használatosak utófeldolgozáshoz vagy textúra megjelenítési effektusokhoz, ezért ennek a beállításnak a kijelölésével nagymértékű sebesség növekedés érhető el, azonban majdnem mindig hibákat is okoz.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -1881,20 +1814,12 @@ msgid "Dolphin at &Google Code" msgstr "Dolphin &Google Code oldal" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 -msgid "" -"Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " -"files..." -msgstr "" -"Dolphin nem talált egyetlen GC/Wii ISO fájlt sem. Fájlok tallózásához dupla " -"kattintás ide..." +msgid "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for files..." +msgstr "Dolphin nem talált egyetlen GC/Wii ISO fájlt sem. Fájlok tallózásához dupla kattintás ide..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 -msgid "" -"Dolphin is currently set to hide all games. Doubleclick here to show all " -"games..." -msgstr "" -"A Dolphin beállításai végett jelenleg a játékok rejtve vannak. Dupla " -"kattintás ide a játékok megjelenítéséhez..." +msgid "Dolphin is currently set to hide all games. Doubleclick here to show all games..." +msgstr "A Dolphin beállításai végett jelenleg a játékok rejtve vannak. Dupla kattintás ide a játékok megjelenítéséhez..." #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 @@ -1940,8 +1865,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Az összes létrehozott képkocka mentése egy AVI fájlba ide: User/Dump/" -"Frames/\n" +"Az összes létrehozott képkocka mentése egy AVI fájlba ide: User/Dump/Frames/\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -1993,16 +1917,8 @@ msgstr "EFB másolatok" #: 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 "" -"HIBA: A Dolphin ezen változatához szükséges a TAP-Win32 driver %d.%d " -"verziója legalább -- Ha mostanában telepítetted a Dolphin emulátort, akkor " -"valószínűleg újra kell indítanod a számítógépet, hogy a Windows felismerje " -"az új illesztőprogramot." +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 "HIBA: A Dolphin ezen változatához szükséges a TAP-Win32 driver %d.%d verziója legalább -- Ha mostanában telepítetted a Dolphin emulátort, akkor valószínűleg újra kell indítanod a számítógépet, hogy a Windows felismerje az új illesztőprogramot." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 msgid "EUROPE" @@ -2052,30 +1968,24 @@ msgstr "Az emuláció már fut" #: 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 "" "Az XFB pontos emulációja.\n" -"Jelentősen lassítja az emulációt és korlátozza a nagy felbontású " -"megjelenítést, azonban szükséges számos játék pontos emulációjához.\n" +"Jelentősen lassítja az emulációt és korlátozza a nagy felbontású megjelenítést, azonban szükséges számos játék pontos emulációjához.\n" "\n" "Ha bizonytalan vagy, jelöld ki inkább az XFB emulációt." #: 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 "" "XFB emuláció grafikai processzor textúra objektumainak használatával.\n" -"Javít sok XFB emuláció nélkül nem működő játékot miközben nem olyan lassú, " -"mint a valódi XFB emuláció. Azonban, még mindig nem használható sok más " -"játék esetén (főleg egyedi fejlesztésű alkalmazások).\n" +"Javít sok XFB emuláció nélkül nem működő játékot miközben nem olyan lassú, mint a valódi XFB emuláció. Azonban, még mindig nem használható sok más játék esetén (főleg egyedi fejlesztésű alkalmazások).\n" "\n" "Ha bizonytalan vagy, hagyd kijelölve." @@ -2093,15 +2003,13 @@ msgstr "Használat" #: 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 "" -"A 3D-s effektusok megjelenítése sztereoszkópikus módon az Nvidia 3D Vision " -"technológia használatával, ha támogatja a videókártya.\n" +"A 3D-s effektusok megjelenítése sztereoszkópikus módon az Nvidia 3D Vision technológia használatával, ha támogatja a videókártya.\n" "Estleg hibákat okozhat.\n" "Működéséhez teljes képernyő szükséges.\n" "\n" @@ -2213,12 +2121,8 @@ msgstr "" "Ha bizonytalan vagy, válaszd ezt: 1x." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 -msgid "" -"Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " -"Compatible)" -msgstr "" -"Gyors lemez hozzáférés használata. Szükséges néhány játékhoz. (BE = gyors, " -"KI = kompatibilis)" +msgid "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = Compatible)" +msgstr "Gyors lemez hozzáférés használata. Szükséges néhány játékhoz. (BE = gyors, KI = kompatibilis)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Enable pages" @@ -2238,33 +2142,21 @@ msgstr "" #: 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 "" -"Kapcsold be ha azt akarod, hogy inkább a Dolphin fő ablakában jelenjen meg " -"az emuláció, mint sem egy különálló ablakban.\n" +"Kapcsold be ha azt akarod, hogy inkább a Dolphin fő ablakában jelenjen meg az emuláció, mint sem egy különálló ablakban.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 -msgid "" -"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " -"ANY other game." -msgstr "" -"Használatával The Legend of Zelda: Twilight Princess játék sebessége " -"növekedik. A TÖBBI játéknál legyen kikapcsolva." +msgid "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for ANY other game." +msgstr "Használatával The Legend of Zelda: Twilight Princess játék sebessége növekedik. A TÖBBI játéknál legyen kikapcsolva." #: 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 "" -"Bekapcsolja a Blokk cím átvitelt (BAT); a memória vezérlő egység egyik " -"funkcióját. A hardverhez viszonyítva pontos, de az emulációhoz lassú. (BE = " -"kompatibilis, KI = gyors)" +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 "Bekapcsolja a Blokk cím átvitelt (BAT); a memória vezérlő egység egyik funkcióját. A hardverhez viszonyítva pontos, de az emulációhoz lassú. (BE = kompatibilis, KI = gyors)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "Enables Custom Projection Hack" @@ -2277,19 +2169,14 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Bekapcsolja a progresszív pásztázást, ha az támogatott az emulált szoftver " -"által.\n" +"Bekapcsolja a progresszív pásztázást, ha az támogatott az emulált szoftver által.\n" "A legtöbb játék nem használja ezt.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 -msgid "" -"Enables the Memory Management Unit, needed for some games. (ON = Compatible, " -"OFF = Fast)" -msgstr "" -"Bekapcsolja a memória kezelő egységet (Memory Management Unit), szükséges " -"néhány játékhoz. (BE = kompatibilis, KI = gyors)" +msgid "Enables the Memory Management Unit, needed for some games. (ON = Compatible, OFF = Fast)" +msgstr "Bekapcsolja a memória kezelő egységet (Memory Management Unit), szükséges néhány játékhoz. (BE = kompatibilis, KI = gyors)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" @@ -2384,12 +2271,11 @@ msgstr "" >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." -msgstr "" -"Hiba a kiválasztott nyelv betöltése közben. Rendszer alapértelmezett " -"visszaállítva." +msgstr "Hiba a kiválasztott nyelv betöltése közben. Rendszer alapértelmezett visszaállítva." #: Source/Core/Common/Src/ChunkFile.h:180 #, c-format +<<<<<<< HEAD msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." @@ -2399,16 +2285,15 @@ 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..." >>>>>>> Update from master branch. +======= +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..." +>>>>>>> Update Hungarian translation. #: 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 "" -"Hiba: A(z) %s betűtípusokhoz történő hozzáférési próbálkozás során, a " -"betöltésük sikertelen. A játékokban a betűk lehet nem jelennek meg " -"megfelelően, vagy kifagynak." +msgid "Error: Trying to access %s fonts but they are not loaded. Games may not show fonts correctly, or crash." +msgstr "Hiba: A(z) %s betűtípusokhoz történő hozzáférési próbálkozás során, a betöltésük sikertelen. A játékokban a betűk lehet nem jelennek meg megfelelően, vagy kifagynak." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:30 msgid "Escape" @@ -2598,8 +2483,7 @@ msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" msgstr "" -"A blokk kiosztási tábla biztonsági mentésének pontos visszaolvasása " -"sikertelen\n" +"A blokk kiosztási tábla biztonsági mentésének pontos visszaolvasása sikertelen\n" "(0x8000-0x9FFF)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:144 @@ -2768,8 +2652,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Kényszerített textúra szűrés lesz még akkor is, ha a játék határozottan " -"letiltotta azt.\n" +"Kényszerített textúra szűrés lesz még akkor is, ha a játék határozottan letiltotta azt.\n" "Némileg javítja a textúra minőséget, de képhibákat okozhat néhány játékban.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -2781,7 +2664,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"A játék kiemeneti grafikája kényszerített szélesvásznú felbontású lesz.\n" +"A játék kimeneti grafikája kényszerített szélesvásznú felbontású lesz.\n" "Grafikai hibákat okozhat néhány játékban.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -2789,12 +2672,10 @@ 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 "" "Az NTSC-J működési módot kényszeríti japán ROM betűkészlet használatához.\n" -"Hagyd kijelöletlenül, a Dolphin alapértelmezett az NTSC-U és automatikusan " -"bekapcsolódik ez a beállítás japán játékok használatakor." +"Hagyd kijelöletlenül, a Dolphin alapértelmezett az NTSC-U és automatikusan bekapcsolódik ez a beállítás japán játékok használatakor." #: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" @@ -3026,19 +2907,15 @@ msgstr "Nagyobb mint" ======= >>>>>>> Update Hungarian and Turkish translations. 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 "" -"Nagymértékben javítja azon textúrák minőségét, amelyeket a textúra " -"effektusokhoz használatos képalkotó hozott létre.\n" +"Nagymértékben javítja azon textúrák minőségét, amelyeket a textúra effektusokhoz használatos képalkotó hozott létre.\n" "A belső felbontás növelése javítja ennek a beállításnak a hatását.\n" -"Némileg csökkenti a teljesítményt és esetlegesen hibákat okozhat (habár " -"valószínűtlen).\n" +"Némileg csökkenti a teljesítményt és esetlegesen hibákat okozhat (habár valószínűtlen).\n" "\n" "Ha bizonytalan vagy, hagyd kijelölve." @@ -3097,8 +2974,7 @@ msgid "" msgstr "" "Szia,\n" "\n" -"A Dolphin működéséhez szükséges, hogy a processzor rendelkezzen SSE2 " -"utasításkészlettel.\n" +"A Dolphin működéséhez szükséges, hogy a processzor rendelkezzen SSE2 utasításkészlettel.\n" "Sajnos a processzorod nem támogatja azt, ezért a Dolphin nem fog működni.\n" "\n" "Sayonara!\n" @@ -3160,20 +3036,16 @@ msgstr "Hibrid 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: Adatok kinyerése megkísérelve egy ismeretlen jegyből: " -"%08x/%08x" +msgstr "IOCTL_ES_GETVIEWS: Adatok kinyerése megkísérelve egy ismeretlen jegyből: %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: A játék megkísérelte az IOS újratöltését vagy egy olyan " -"címét ami nem érhető el a NAND mentésedben\n" +"IOCTL_ES_LAUNCH: A játék megkísérelte az IOS újratöltését vagy egy olyan címét ami nem érhető el a NAND mentésedben\n" "TitleID %016llx.\n" " A Dolphin valószínűleg kifagy most" @@ -3214,6 +3086,7 @@ msgid "Icon" msgstr "Ikon" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +<<<<<<< HEAD msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -3223,22 +3096,18 @@ msgstr "" "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. +======= +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." +>>>>>>> Update Hungarian translation. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 -msgid "" -"If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" -msgstr "" -"Ha az FPS értéke szabálytalan, akkor ez a beállítás segíthet. (BE = " -"kompatibilis, KI = gyors)" +msgid "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" +msgstr "Ha az FPS értéke szabálytalan, akkor ez a beállítás segíthet. (BE = kompatibilis, KI = gyors)" #: 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." -msgstr "" -"Ha a képkocka korlát értéke magasabb a játék teljes sebességénél (NTSC:60, " -"PAL:50), akkor a hatékonyság eléréséhez ki kell kapcsolni a hang " -"szabályozást is a DSP beállításoknál. " +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." +msgstr "Ha a képkocka korlát értéke magasabb a játék teljes sebességénél (NTSC:60, PAL:50), akkor a hatékonyság eléréséhez ki kell kapcsolni a hang szabályozást is a DSP beállításoknál. " #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" @@ -3247,29 +3116,24 @@ msgstr "Formátum változások kihagyása" #: 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 "" "Minden EFB formátum változás figyelmen kívül hagyása.\n" -"Sok játékban növeli a teljesítményt bármilyen negatív hatás nélkül. Noha " -"grafikai hiányosságok jelentkezhetnek kevés egyéb játékban.\n" +"Sok játékban növeli a teljesítményt bármilyen negatív hatás nélkül. Noha grafikai hiányosságok jelentkezhetnek kevés egyéb játékban.\n" "\n" "Ha bizonytalan vagy, hagyd kijelölve." #: 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 "" -"Figyelmen kívül hagyja a processzor összes EFB-re irányuló kiolvasási vagy " -"írási kérelmét.\n" -"Néhány játékban növeli a teljesítményt, de kikapcsolhat néhány játékmenetre " -"vonatkozó funkciót vagy grafikus effektust.\n" +"Figyelmen kívül hagyja a processzor összes EFB-re irányuló kiolvasási vagy írási kérelmét.\n" +"Néhány játékban növeli a teljesítményt, de kikapcsolhat néhány játékmenetre vonatkozó funkciót vagy grafikus effektust.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -3303,13 +3167,11 @@ 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öveli a teljesítményt de képhibákat okoz azokban a játékban, amelykben " -"fontos a megfelelő köd emuláció.\n" +"Növeli a teljesítményt de képhibákat okoz azokban a játékban, amelykben fontos a megfelelő köd emuláció.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -3319,8 +3181,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Növeli a teljesítményt, de használatával a fényhatások eltűnnek a legtöbb " -"játékban.\n" +"Növeli a teljesítményt, de használatával a fényhatások eltűnnek a legtöbb játékban.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -3351,7 +3212,7 @@ msgstr "Insert" #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:175 msgid "Insert Encrypted or Decrypted code here..." -msgstr "Lekódolt vagy kódolatlan kódok beszúrása ide..." +msgstr "Lekódolt vagy kódolatlan kód beszúrása ide..." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 msgid "Insert SD Card" @@ -3370,10 +3231,8 @@ msgid "Install to Wii Menu" msgstr "Telepítés a Wii menübe" #: Source/Core/Core/Src/MemTools.cpp:248 -msgid "" -"InstallExceptionHandler called, but this platform does not yet support it." -msgstr "" -"InstallExceptionHandler előidézve, de ez a platform még nem támogatja azt." +msgid "InstallExceptionHandler called, but this platform does not yet support it." +msgstr "InstallExceptionHandler előidézve, de ez a platform még nem támogatja azt." <<<<<<< HEAD <<<<<<< HEAD @@ -3791,12 +3650,8 @@ msgid "Memory Card" msgstr "Memóriakártya" #: Source/Core/DolphinWX/Src/MemcardManager.h:36 -msgid "" -"Memory Card Manager WARNING-Make backups before using, should be fixed but " -"could mangle stuff!" -msgstr "" -"Memóriakártya kezelő FIGYELMEZTETÉS - Készíts biztonsági mentést a " -"használata előtt, helyreállítható de a meglévő adatok sérülhetnek!" +msgid "Memory Card Manager WARNING-Make backups before using, should be fixed but could mangle stuff!" +msgstr "Memóriakártya kezelő FIGYELMEZTETÉS - Készíts biztonsági mentést a használata előtt, helyreállítható de a meglévő adatok sérülhetnek!" #: Source/Core/Core/Src/CoreParameter.cpp:369 #, c-format @@ -3847,13 +3702,11 @@ msgstr "Változó" #: 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 "" -"Tetxúrák módosítása a kódolásukhoz használt formátum megjelenítéséhez. A " -"legtöbb esetben az emuláció alapra állítása szükséges.\n" +"Tetxúrák módosítása a kódolásukhoz használt formátum megjelenítéséhez. A legtöbb esetben az emuláció alapra állítása szükséges.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -3893,12 +3746,8 @@ 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 "" -"Lenémítja a Wiimote hangszórót. Javítja a valódi Wiimote irányítók " -"véletlenszerű lekapcsolódási hibáját. Nincs hatással az emulált irányítókra." +msgid "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No effect on emulated wiimotes." +msgstr "Lenémítja a Wiimote hangszórót. Javítja a valódi Wiimote irányítók véletlenszerű lekapcsolódási hibáját. Nincs hatással az emulált irányítókra." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:126 msgid "NP Add" @@ -4226,12 +4075,8 @@ msgid "Other" msgstr "Egyéb" #: Source/Core/Core/Src/NetPlayClient.cpp:206 -msgid "" -"Other client disconnected while game is running!! NetPlay is disabled. You " -"manually stop the game." -msgstr "" -"A másik kliens kapcsolata megszakadt játék közben! A NetPlay kikapcsolva. " -"Kézileg kell leállítanod a játékot." +msgid "Other client disconnected while game is running!! NetPlay is disabled. You manually stop the game." +msgstr "A másik kliens kapcsolata megszakadt játék közben! A NetPlay kikapcsolva. Kézileg kell leállítanod a játékot." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 msgid "Output" @@ -4405,7 +4250,7 @@ msgstr "Portugál" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Portuguese (Brazilian)" -msgstr "Portugál (brazíliai)" +msgstr "Portugál (brazil)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:396 msgid "Post-Processing Effect:" @@ -4564,8 +4409,7 @@ msgid "" "\n" "If unsure, select None." msgstr "" -"Csökkenti az éltöredezettséget, amit a képpontokra felbontott 3D-s grafika " -"okoz.\n" +"Csökkenti az éltöredezettséget, amit a képpontokra felbontott 3D-s grafika okoz.\n" "Ezáltal a megjelenített kép kevésbé lesz recézett.\n" "Erősen csökkenti az emuláció sebességét és néha hibákat okoz.\n" "Ha bizonytalan vagy, válaszd ezt: Nincs. " @@ -4800,8 +4644,10 @@ msgstr "Keresési szűrő" msgid "Search Subfolders" msgstr "Keresés az almappákban" -#: 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 rész nem található a SYSCONF fájlban" @@ -4917,15 +4763,13 @@ msgstr "Kiválasztott betűtípus" #: 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 "" "A teljes kijelző estén használatos felbontást állítja be.\n" -"Ennek mindig nagyobbnak, vagy azonosnak kell lennie a belső felbontással. " -"Hatása a teljesítményre elhanyagolható.\n" +"Ennek mindig nagyobbnak, vagy azonosnak kell lennie a belső felbontással. Hatása a teljesítményre elhanyagolható.\n" "\n" "Ha bizonytalan vagy, használd az asztali felbontást.\n" "Ha továbbra is bizonytalan vagy, használd a legmagasabb működő felbontást." @@ -4933,17 +4777,14 @@ msgstr "" #: 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 "" "Kiválasztja melyik grafikus API legyen használva belsőleg.\n" -"A Direct3D 9 többnyire a leggyorsabb. Az OpenGL azonban pontosabb. A " -"Direct3D 11 valahol a kettő között van.\n" -"Vedd figyelembe, hogy a Direct3D feldolgozók csak Windows esetén állnak " -"rendelkezésre.\n" +"A Direct3D 9 többnyire a leggyorsabb. Az OpenGL azonban pontosabb. A Direct3D 11 valahol a kettő között van.\n" +"Vedd figyelembe, hogy a Direct3D feldolgozók csak Windows esetén állnak rendelkezésre.\n" "\n" "Ha bizonytalan vagy, használd ezt: Direct3D 9." @@ -4957,17 +4798,15 @@ msgstr "Érzékelő helyzete:" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:74 msgid "Separator" -msgstr "Separator" +msgstr "Elválasztó" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Serbian" msgstr "Szerb" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 -msgid "" -"Serial Port 1 - This is the port which devices such as the net adapter use" -msgstr "" -"1. soros port - Ezt a portot használják azok az eszközök, mint a net adapter" +msgid "Serial Port 1 - This is the port which devices such as the net adapter use" +msgstr "1. soros port - Ezt a portot használják azok az eszközök, mint a net adapter" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 msgid "Set" @@ -4985,8 +4824,7 @@ msgstr "Beállítás alapértelmezett %c. memóriakártyaként" #: Source/Core/Core/Src/ActionReplay.cpp:462 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" -msgstr "" -"SetARCode_IsActive: A jelzőszám nagyobb mint az ar kód lista mérete %lu" +msgstr "SetARCode_IsActive: A jelzőszám nagyobb mint az ar kód lista mérete %lu" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "Settings..." @@ -5107,13 +4945,10 @@ msgstr "A játék leállítása előtt megjelenik egy megerősítő ablak." #: 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 "" -"Figyelmeztető üzenet jelenik meg egy potenciálisan komoly hiba " -"bekövetkezésekor.\n" -"Kikapcsolásával megszűntethetők a kellemetlen és nem végzetes üzenetek, de " -"ezáltal a Dolphin hirtelen kifagyhat bármilyen magyarázat nélkül." +"Figyelmeztető üzenet jelenik meg egy potenciálisan komoly hiba bekövetkezésekor.\n" +"Kikapcsolásával megszűntethetők a kellemetlen és nem végzetes üzenetek, de ezáltal a Dolphin hirtelen kifagyhat bármilyen magyarázat nélkül." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Show first block" @@ -5137,13 +4972,11 @@ msgstr "Mentendő címek megjelenítése" #: 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 "" -"A másodpercenként megjelenített képkockák számát jelzi ki az emuláció " -"sebességének méréséhez.\n" +"A másodpercenként megjelenített képkockák számát jelzi ki az emuláció sebességének méréséhez.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -5191,13 +5024,11 @@ msgstr "Az EFB processzor hozzáférésének átugrása" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 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 "" -"A sok játékban különféle grafikai effektusokhoz használt destination alpha " -"pass figyelmen kívül hagyása.\n" +"A sok játékban különféle grafikai effektusokhoz használt destination alpha pass figyelmen kívül hagyása.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -5205,15 +5036,13 @@ 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 "" "Kissé gyorsítja az EFB RAM másolatokat az emuláció pontosságának rovására.\n" "Néha a vizuális minőséget is növeli.\n" -"Ha bármely hibát tapasztalsz, próbáld növelni a textúra gyorsítótár " -"pontosságát vagy kapcsold ki ezt az opciót.\n" +"Ha bármely hibát tapasztalsz, próbáld növelni a textúra gyorsítótár pontosságát vagy kapcsold ki ezt az opciót.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -5241,16 +5070,13 @@ msgstr "Szoftveres képalkotó" #: 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 "" -"A szoftveres képleképezés egy fontosságbeli sorrenden alapul és lassabb a " -"feldolgozók használatánál.\n" +"A szoftveres képalkotó egy fontosságbeli sorrenden alapul és lassabb a feldolgozók használatánál.\n" "Csak hibakeresési célra hasznos.\n" -"Biztosan be kívánod kapcsolni a szoftveres képleképezést? Ha bizonytalan " -"vagy, válaszd ezt: 'Nem'." +"Biztosan be kívánod kapcsolni a szoftveres képalkotót? Ha bizonytalan vagy, válaszd ezt: 'Nem'." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" @@ -5294,21 +5120,13 @@ msgstr "Hangszóró hangerő:" #: 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 "" -"Meghatározza a megjelenítéshez használatos felbontást. A magas felbontás " -"nagyban növeli a vizuális minőséget, de erősen befolyásolja a teljesítményt " -"és képhibákat okozhat bizonyos játékoknál.\n" -"\"640x528 többszöröse\" egy kicsivel lassabb, mint az \"Ablak méret\" " -"viszont kevesebb hibák eredményez. Általánosságban elmondható, minél kisebb " -"a belső felbontás, annál jobb a teljesítmény.\n" +"Meghatározza a megjelenítéshez használatos felbontást. A magas felbontás nagyban növeli a vizuális minőséget, de erősen befolyásolja a teljesítményt és képhibákat okozhat bizonyos játékoknál.\n" +"\"640x528 többszöröse\" egy kicsivel lassabb, mint az \"Ablak méret\" viszont kevesebb hibák eredményez. Általánosságban elmondható, minél kisebb a belső felbontás, annál jobb a teljesítmény.\n" "\n" "Ha bizonytalan vagy, válaszd ezt: 640x528." @@ -5322,7 +5140,7 @@ msgstr "A lemez adatátviteli arány gyorsítása" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:243 msgid "Square Stick" -msgstr "Negyzetes kar" +msgstr "Négyzetes kar" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 msgid "Standard Controller" @@ -5386,15 +5204,12 @@ msgstr "Leállítás" #: 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 "" "Az EFB másolatokat a grafikai processzor textúra objektumaiban tárolja.\n" -"Ez nem annyira pontos, de elég jól működik a legtöbb játék esetén és " -"jelentős sebességnövekedést okoz az EFB RAM-ban történő tárolásával " -"szemben.\n" +"Ez nem annyira pontos, de elég jól működik a legtöbb játék esetén és jelentős sebességnövekedést okoz az EFB RAM-ban történő tárolásával szemben.\n" "\n" "Ha bizonytalan vagy, hagyd kijelölve." @@ -5527,12 +5342,8 @@ 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 fájl nem nyitható meg íráshoz. Ellenőrizd, hogy nincs-e megnyitva már " -"másik program által." +msgid "The file %s could not be opened for writing. Please check if it's already opened by another program." +msgstr "%s fájl nem nyitható meg íráshoz. Ellenőrizd, hogy nincs-e megnyitva már másik program által." #: Source/Core/AudioCommon/Src/WaveFile.cpp:44 #, c-format @@ -5558,13 +5369,11 @@ msgstr "A kapott kódolatlan AR kód nem tartalmaz sorokat." #: 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 "" -"Minél biztonságosabb a beállítás, annál kevésbé valószínű, hogy az emulátor " -"textúra frissítést fog a RAM-ból hiányolni.\n" +"Minél biztonságosabb a beállítás, annál kevésbé valószínű, hogy az emulátor textúra frissítést fog a RAM-ból hiányolni.\n" "\n" "Ha bizonytalan vagy, használd a második leggyorsabb értéket jobbról." @@ -5573,12 +5382,8 @@ msgid "The save you are trying to copy has an invalid file size" msgstr "A másolni kívánt mentés érvénytelen méretű" #: Source/Core/DolphinWX/Src/Main.cpp:353 -msgid "" -"The selected language is not supported by your system. Falling back to " -"system default." -msgstr "" -"A választott nyelvet nem támogatja az oprációs rendszer. Visszaállás a " -"rendszer alapértelmezettre." +msgid "The selected language is not supported by your system. Falling back to system default." +msgstr "A választott nyelvet nem támogatja az oprációs rendszer. Visszaállás a rendszer alapértelmezettre." #: Source/Core/Core/Src/NetPlayClient.cpp:43 msgid "The server and client's NetPlay versions are incompatible!" @@ -5614,12 +5419,8 @@ msgid "Theme selection went wrong" msgstr "Kinézet választáskor hiba történt" #: 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 "" -"Kell lennie egy jegynek itt: 00000001/00000002. A NAND mentésed valószínűleg " -"befejezetlen." +msgid "There must be a ticket for 00000001/00000002. Your NAND dump is probably incomplete." +msgstr "Kell lennie egy jegynek itt: 00000001/00000002. A NAND mentésed valószínűleg befejezetlen." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "" @@ -5630,12 +5431,8 @@ msgstr "" "A módosítatlan opcióknál a játék a Dolphin beállításait használja." #: Source/Core/Core/Src/ActionReplay.cpp:356 -msgid "" -"This action replay simulator does not support codes that modify Action " -"Replay itself." -msgstr "" -"Az action replay szimulátor nem támogat olyan kódokat, amelyek módosítját " -"magát az Action Replay-t." +msgid "This action replay simulator does not support codes that modify Action Replay itself." +msgstr "Az action replay szimulátor nem támogat olyan kódokat, amelyek módosítját magát az Action Replay-t." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 msgid "This could cause slow down in Wii Menu and some games." @@ -5644,19 +5441,12 @@ msgstr "Ez lassulást okozhat a Wii menüben és néhány játékban." #: 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 "" "Ez a funkció lehetővé teszi a játék kamera szabad irányítását.\n" -"Tartsd lenyomva a jobb egér gombot és mozgasd az egeret, hogy körbepásztázz " -"a kamerával. Tartsd lenyomva a SHIFT billentyűt és a WASD billentyűk " -"valamelyikével mozgasd a kamerát távolsági léptékenként (SHIFT+0 megduplázza " -"(x2) és a SHIFT+9 megfelezi (x0.5)). Nyomd le a SHIFT+R kombinációt a " -"kamera alapértékre állításához.\n" +"Tartsd lenyomva a jobb egér gombot és mozgasd az egeret, hogy körbepásztázz a kamerával. Tartsd lenyomva a SHIFT billentyűt és a WASD billentyűk valamelyikével mozgasd a kamerát távolsági léptékenként (SHIFT+0 megduplázza (x2) és a SHIFT+9 megfelezi (x0.5)). Nyomd le a SHIFT+R kombinációt a kamera alapértékre állításához.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -5672,8 +5462,7 @@ msgstr "" "Kikapcsolása rendellenes sebességet okozhat, többnyire túl gyorsat.\n" "Viszont néha a bekapcsolása folyamatos zajt eredményezhet.\n" "\n" -"Gyorsbillentyű : Tartsd lenyomva a szabályozás azonnali " -"kikapcsolásához." +"Gyorsbillentyű : Tartsd lenyomva a szabályozás azonnali kikapcsolásához." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." @@ -5681,15 +5470,11 @@ msgstr "Ez a zenei sávok, mint BGM lejátszásra szolgál." #: 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 "" -"Ez megosztja a videó és processzor folyamatágakat, így azok külön magon " -"futhatnak.\n" -"Számottevő sebességnövekedés érhető el egynél több magos számítógépeken, " -"ugyanakkor véletlenszerű fagyásokat/hibákat is okozhat." +"Ez megosztja a videó és processzor folyamatágakat, így azok külön magon futhatnak.\n" +"Számottevő sebességnövekedés érhető el egynél több magos számítógépeken, ugyanakkor véletlenszerű fagyásokat/hibákat is okozhat." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 msgid "This will let you Manually Edit the INI config file" @@ -5756,7 +5541,8 @@ msgstr "Próbálkozás egy ismeretlen fájltípus betöltésével. " msgid "Triggers" msgstr "Kioldó gombok" -#: 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 "Olvasási próbálkozás az érvénytelen SYSCONF fájlból" @@ -5808,12 +5594,10 @@ 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 "" -"A megadott AR kód %lu sorának érvényes kódolt, vagy kódolatlan kódként " -"történő elemzése nem lehetséges. Győződj meg róla, hogy helyesen írtad be.\n" +"A megadott AR kód %lu sorának érvényes kódolt, vagy kódolatlan kódként történő elemzése nem lehetséges. Győződj meg róla, hogy helyesen írtad be.\n" "Szeretnéd átugrani ezt a sort és folytatni az elemzést?" #: Source/Core/DolphinWX/Src/FrameTools.cpp:404 @@ -5847,9 +5631,7 @@ msgstr "Ismeretlen üzenet érkezett ezzel az azonosítóval : %d" #: Source/Core/Core/Src/NetPlayServer.cpp:504 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" -msgstr "" -"Ismeretlen üzenet érkezett ezzel az azonosítóval:%d ettől a játékostól:%d " -"Játékos kirúgása!" +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 @@ -5894,7 +5676,7 @@ msgstr "Hexa használat" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 msgid "Use Panic Handlers" -msgstr "Hibaüzenetek megjelenítése" +msgstr "Hibakezelők használata" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" @@ -5904,23 +5686,19 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Több folyamatág használata a textúrák dekódolásához.\n" -"Sebesség növekedést eredményezhet (főleg a két magnál többel rendelkező " -"processzorok esetén).\n" +"Sebesség növekedést eredményezhet (főleg a két magnál többel rendelkező processzorok esetén).\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." #: 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 "" -"Általában ha az árnyaló összeállítása sikertelen, megjelenik egy " -"hibaüzenet.\n" -"Azonban, ennek az opciónak a kijelölésével elérhető a felugró ablak " -"kihagyása, azaz a megszakítás nélküli játékmenet.\n" +"Általában ha az árnyaló összeállítása sikertelen, megjelenik egy hibaüzenet.\n" +"Azonban, ennek az opciónak a kijelölésével elérhető a felugró ablak kihagyása, azaz a megszakítás nélküli játékmenet.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -5930,7 +5708,7 @@ msgstr "Kellékek" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:292 msgid "V-Sync" -msgstr "Várakozás a képfrissítésre" +msgstr "V-Sync" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 msgid "Value" @@ -5965,7 +5743,7 @@ msgstr "Hangerő" #: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 #, c-format msgid "WAD installation failed: error creating %s" -msgstr "WAD telepítési hiba: hiba naplózása %s" +msgstr "WAD telepítési hiba: hiba a(z) %s létrehozása közben" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" @@ -6023,6 +5801,7 @@ msgstr "" #: Source/Core/Core/Src/Movie.cpp:629 #, c-format +<<<<<<< HEAD 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 " @@ -6050,43 +5829,53 @@ msgstr "" "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. +======= +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." + +#: 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 "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 Hungarian translation. #: 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" +"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" +"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" +"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" +"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 +<<<<<<< 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" +======= +"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" +>>>>>>> Update Hungarian translation. "\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" +"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" +"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" +<<<<<<< HEAD "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. +======= +"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 Hungarian translation. #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 @@ -6271,8 +6060,7 @@ msgstr "Meg kell adnod egy nevet!" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 msgid "You must enter a valid decimal, hexadecimal or octal value." -msgstr "" -"Be kell írnod egy érvényes decimális, hexadecimális vagy oktális értéket." +msgstr "Be kell írnod egy érvényes decimális, hexadecimális vagy oktális értéket." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 msgid "You must enter a valid profile name." @@ -6280,8 +6068,7 @@ msgstr "Meg kell adnod egy érvényes profil nevet." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 msgid "You must restart Dolphin in order for the change to take effect." -msgstr "" -"Újra kell indítanod a Dolphin emulátort a változtatások érvényesítéséhez." +msgstr "Újra kell indítanod a Dolphin emulátort a változtatások érvényesítéséhez." #: Source/Core/Core/Src/CoreParameter.cpp:177 msgid "" @@ -6339,19 +6126,14 @@ msgstr "[Egyedi]" #: 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 "" "[KÍSÉRLETI]\n" -"Az emuláció gyorsítása a célja a textúrák kirakásával dekódolva a grafikai " -"processzor számára az OpenCL keretrendszert használva.\n" -"Azonban, jelenleg köztudottan textúra hiányosságokat okoz számos játékban. " -"Lassabb is mint az átlagos processzoros textúra dekódolás a legtöbb " -"esetben.\n" +"Az emuláció gyorsítása a célja a textúrák kirakásával dekódolva a grafikai processzor számára az OpenCL keretrendszert használva.\n" +"Azonban, jelenleg köztudottan textúra hiányosságokat okoz számos játékban. Lassabb is mint az átlagos processzoros textúra dekódolás a legtöbb esetben.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." From d73f4d8240565b5adb1d2cc1a53175c2b3584160 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Tue, 24 Jan 2012 23:27:19 -0600 Subject: [PATCH 12/14] Update Korean translations. --- Languages/po/ko.po | 202 ++++++++++++++++++++++++++------------------- 1 file changed, 119 insertions(+), 83 deletions(-) diff --git a/Languages/po/ko.po b/Languages/po/ko.po index a8cc90fdaa..f756486f36 100644 --- a/Languages/po/ko.po +++ b/Languages/po/ko.po @@ -10,6 +10,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +<<<<<<< HEAD ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" >>>>>>> Update translation files for recent changes in the code. @@ -17,6 +18,9 @@ msgstr "" "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Update from master branch. "PO-Revision-Date: 2011-07-07 10:24+0900\n" +======= +"PO-Revision-Date: 2012-01-19 11:47+0900\n" +>>>>>>> Update Korean translations. "Last-Translator: \n" "Language-Team: \n" "Language: Korean\n" @@ -66,9 +70,9 @@ msgid "%d Hz" msgstr "%d Hz" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 -#, fuzzy, c-format +#, c-format msgid "%i connected" -msgstr "연결해제된" +msgstr "%i 연결되었습니다" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:128 #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:296 @@ -82,22 +86,22 @@ msgid "%s failed to be scrubbed. Probably the image is corrupt." msgstr "%s 가 실패해서 취소되었습니다. 이미지가 손상된 것 같습니다." #: Source/Core/Core/Src/HW/GCMemcard.cpp:97 -#, fuzzy, c-format +#, c-format msgid "" "%s failed to load as a memorycard \n" " Card file size is invalid (0x%x bytes)" msgstr "" -"메모리카드가 로드에 실패했습니다\n" -" 카드 크기가 비적합함 (%04X)" +"%s 는 메모리카드로써 불러오기에 실패했습니다 \n" +" 카드 파일 크기가 유효하지 않습니다 (0x%x bytes)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:112 -#, fuzzy, c-format +#, c-format msgid "" "%s failed to load as a memorycard \n" " Card size is invalid (0x%x bytes)" msgstr "" -"메모리카드가 로드에 실패했습니다\n" -" 카드 크기가 비적합함 (%04X)" +"%s 는 메모리카드로써 로드하는데에 실패했습니다 \n" +" 카드 크기가 유효하지 않습니다 (0x%x bytes)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:92 #, c-format @@ -105,6 +109,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 @@ -433,7 +439,6 @@ msgid "Accurate VBeam emulation" msgstr "정확한 VBeam 에뮬레이션" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 -#, fuzzy msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -444,7 +449,7 @@ msgstr "" "정확하게 EFB 복사를 에뮬합니다.\n" "일부 게임들은 그래픽 효과나 게임플레이 기능을 이것에 의존합니다.\n" "\n" -"확신 없으면, 이것을 체크로 두세요" +"확신 없으면, 텍스처에 EFB를 체크로 두세요." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 @@ -679,9 +684,8 @@ msgstr "" "확신 없으면, 이것을 언체크로 두세요." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -#, fuzzy msgid "Alternate Wiimote Timing" -msgstr "에뮬된 위모트" +msgstr "위모트 타이밍 대안" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -800,7 +804,7 @@ msgid "" msgstr "" "윈도우 크기를 내부 해상도로 자동 조정합니다.\n" "\n" -"확신 없다면, 이것을 언체크로 두세요." +"모르겠으면, 이것을 언체크로 두세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" @@ -812,7 +816,7 @@ msgstr "" "메모리에서 밉맵들을 디코딩하는 대신에 자동적으로 생성합니다.\n" "성능향상을 조금 가져옵니다만 미약한 텍스처 결함이 발생할지도 모릅니다.\n" "\n" -"확신 없다면, 이것을 체크상태로 두세요." +"모르겠으면, 이것을 체크상태로 두세요." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:27 msgid "Back" @@ -974,7 +978,7 @@ msgstr "" "픽셀광원 명암(향상)에서, 픽셀단위 깊이 계산은 소수 게임들을 제대로 에뮬할 때 " "필요가 있습니다.\n" "\n" -"확신 없다면, 이것을 체크상태로 두세요." +"모르겠으면, 이것을 체크상태로 두세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" @@ -988,7 +992,7 @@ msgstr "" "일부 비율(GPU힘에 달림)로 에뮬레이션 속도를 감소시킵니다.\n" "이것은 보통 안전한 향상입니다, 하지만 때때로 이슈들을 유발할지도 모릅니다.\n" "\n" -"확신 없다면, 언체크 상태로 두세요." +"모르겠으면, 언체크 상태로 두세요." #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 @@ -1007,14 +1011,15 @@ msgid "Cannot unregister events with events pending" msgstr "이벤트들 미해결을 지닌 이벤트들을 등록하지 않을 수 없음" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 -#, fuzzy, c-format +#, c-format msgid "" "Cannot use that file as a memory card.\n" "%s\n" "is not a valid gamecube memory card file" msgstr "" -"그 파일을 메모리 카드로 사용할 수 없음.\n" -"둘다의 슬롯들에 같은 파일을 사용하려 합니까?" +"그 파일을 메모리 카드로 사용할 수 없습니다.\n" +"%s\n" +"는 유효한 게임큐브 메모리 카드 파일이 아닙니다" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 msgid "" @@ -1442,7 +1447,7 @@ msgstr "만든이:" #: Source/Core/Common/Src/MsgHandler.cpp:68 msgid "Critical" -msgstr "" +msgstr "치명적" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 msgid "Crop" @@ -1456,7 +1461,7 @@ msgid "" msgstr "" "그림을 4:3에서 5:4로 혹은 16:9에서 16:10으로 자릅니다.\n" "\n" -"확신 없다면, 이것을 언체크로 두세요." +"모르겠으면, 이것을 언체크로 두세요." #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48 msgid "Crossfade" @@ -1680,7 +1685,7 @@ msgstr "" "에뮬레이션 속도가 많이 향상되지만 그것들에 의존하는 많은 게임들(특히 자가 어" "플들)에서 심각한 결함들을 유발합니다.\n" "\n" -"확신 없다면, 이것을 체크로 두세요." +"모르겠으면, 이것을 체크로 두세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" @@ -1694,7 +1699,7 @@ msgstr "" "\"EFB 복사\" 에뮬레이션을 비활성합니다.\n" "이들은 종종 후-처리나 텍스처로 렌더 효과들에 사용됩니다, 그래서 이 세팅을 체" "크하면 대단한 속도향상을 가져오지만 그것은 거의 항상 이슈들도 유발합니다.\n" -"확신 없다면, 이것을 언체크로 두세요." +"모르겠으면, 이것을 언체크로 두세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" @@ -1704,7 +1709,7 @@ msgid "" msgstr "" "텍스처링을 비활성합니다.\n" "\n" -"확신 없다면, 이것을 언체크로 두세요." +"모르겠으면, 이것을 언체크로 두세요." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 msgid "Disc" @@ -1727,7 +1732,7 @@ msgid "" msgstr "" "에뮬레이터에서 읽혀진 입력들을 표시합니다.\n" "\n" -"확신 없다면, 이것을 언체크로 두세요." +"모르겠으면, 이것을 언체크로 두세요." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:77 msgid "Divide" @@ -1867,7 +1872,7 @@ msgid "" msgstr "" "모든 렌더된 프레임들을 User/Dump/Frames/안에 AVI 파일로 덤프합니다\n" "\n" -"확신 없다면, 이것을 언체크로 두세요." +"모르겠으면, 이것을 언체크로 두세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" @@ -1877,7 +1882,7 @@ msgid "" msgstr "" "User/Dump/Textures// 에 디코드된 게임 텍스처들을 덤프합니다\n" "\n" -"확신 없다면, 이것을 언체크로 두세요." +"모르겠으면, 이것을 언체크로 두세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" @@ -1887,7 +1892,7 @@ msgid "" msgstr "" "User/Dump/Textures/로 EFB 복사의 내용을 덤프합니다\n" "\n" -"확신 없다면, 이것을 언체크로 두세요." +"모르겠으면, 이것을 언체크로 두세요." <<<<<<< HEAD <<<<<<< HEAD @@ -1984,7 +1989,7 @@ msgstr "" "에뮬레이션이 많이 느려지고 고해상 렌더링을 막지만 다수의 게임들을 적절히 에뮬" "하기위해 필요합니다.\n" "\n" -"확신 없다면, 대신에 \"가상 XFB 에뮬레이션\"을 체크하세요." +"모르겠으면, 대신에 \"가상 XFB 에뮬레이션\"을 체크하세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" @@ -2000,7 +2005,7 @@ msgstr "" "않는 많은 게임들을 고칩니다. 하지만, 여전히 많은 다른 게임들(특히 자가 어플)" "에서는 실패합니다.\n" "\n" -"확신 없다면, 이것을 체크로 두세요." +"모르겠으면, 이것을 체크로 두세요." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 msgid "Emulated Wiimote" @@ -2028,7 +2033,7 @@ msgstr "" "아마도 이슈들을 일으킵니다.\n" "작동하려면 전체화면이 요구됩니다.\n" "\n" -"확신 없다면, 이것을 언체크로 두세요." +"모르겠으면, 이것을 언체크로 두세요." #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 msgid "Enable AR Logging" @@ -2052,7 +2057,7 @@ msgstr "블록 합치기 활성" >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 msgid "Enable Bounding Box Calculation" -msgstr "" +msgstr "바운딩 박스 계산 켜기" <<<<<<< HEAD ======= @@ -2132,7 +2137,7 @@ msgstr "" "비스듬한 보기 각도들에 있는 텍스처들의 비주얼 품질을 향상시킨다.\n" "소수 게임에서 이슈들을 일으킬지도 모른다.\n" "\n" -"확신 없다면, 1x를 선택하세요." +"모르겠으면, 1x를 선택하세요." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" @@ -2155,7 +2160,7 @@ msgstr "" "전체 화면이 렌더링에 사용되길 원하면 이것을 활성화하세요.\n" "이것이 비활성화되면, 렌더 윈도우가 대신 생성될 것입니다.\n" "\n" -"확신 없다면, 이것을 언체크로 두세요." +"모르겠으면, 이것을 언체크로 두세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" @@ -2167,7 +2172,7 @@ msgstr "" "렌더를 위해 분리된 렌더 창이 아닌 메인 돌핀 창을 사용하려면 이것을 활성화하세" "요.\n" "\n" -"확신 없다면, 이것을 언체크로 두세요." +"모르겠으면, 이것을 언체크로 두세요." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" @@ -2200,7 +2205,7 @@ msgstr "" "에뮬된 소프트에서 지원되면 프로그레시브 스캔을 활성화합니다.\n" "대부분의 게임들은 이것에 대해 상관하지 않습니다.\n" "\n" -"확신 없다면, 이것을 언체크로 두세요." +"모르겠으면, 이것을 언체크로 두세요." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "" @@ -2216,7 +2221,7 @@ msgid "" msgstr "" "FFV1 코덱을 사용하여 프레임 덤프들을 인코드합니다.\n" "\n" -"확신 없다면, 이것을 언체크로 두세요." +"모르겠으면, 이것을 언체크로 두세요." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:50 msgid "End" @@ -2295,6 +2300,8 @@ msgid "" "Error in PlayWiimote. %u != %u, byte %d.\n" "Sorry, Wii recording is temporarily broken." msgstr "" +"PlayWiimote에 에러발생. %u != %u, byte %d.\n" +"죄송합니다, Wii 녹화가 일시적으로 깨졌습니다." >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/Main.cpp:346 @@ -2307,6 +2314,8 @@ msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" +"에러: \"%s\" 뒤에, %d (0x%X)를 발견 %d (0x%X) 세이브 표시 대신에. 상태저장 로" +"드를 취소합니다..." #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 #, c-format @@ -2677,7 +2686,7 @@ msgstr "" "게임이 명백히 그것을 껐더라도 텍스처 필터링을 강제시킨다.\n" "텍스처 품질을 향상시킨다 하지만 일부 게임들에서는 결함들을 유발한다.\n" "\n" -"확신 없다면, 이것을 언체크로 두세요." +"모르겠으면, 이것을 언체크로 두세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" @@ -2689,7 +2698,7 @@ msgstr "" "와이드스크린 해상도 그래픽을 출력하게 게임을 강제시킵니다.\n" "일부 게임에서 그래픽 결함을 유발합니다.\n" "\n" -"확신 없다면, 이것을 언체크로 두세요." +"모르겠으면, 이것을 언체크로 두세요." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 msgid "" @@ -2791,9 +2800,8 @@ msgid "GCI File(*.gci)" msgstr "GCI 파일(*.gci)" #: Source/Core/DolphinWX/Src/GCMicDlg.h:44 -#, fuzzy msgid "GCMic Configuration" -msgstr "로그 환경설정" +msgstr "GCMic 환경설정" #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" @@ -2918,7 +2926,6 @@ msgid "Greater Than" msgstr "보다 큰" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -#, fuzzy msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2928,10 +2935,12 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"\"텍스처에 렌더\"를 사용하여 생성된 텍스쳐들의 질을 엄청나게 향상시킵니다.\n" -"내부 해상도를 올리면 이 세팅의 효과를 향상시킬 것입니다.\n" +"\"텍스처에 렌더\" 효과들을 사용하여 생성된 텍스쳐들의 질을 엄청나게 향상시킵" +"니다.\n" +"내부 해상도를 올리면 이 세팅의 효과를 향상시킵니다.\n" +"성능을 약간 감소시키고 이슈를 아마도 유발할 수 있습니다 (예상 밖일지라도).\n" "\n" -"확신 없다면, 이것을 체크로 두세요." +"모르겠으면, 이것을 체크로 두세요." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Greek" @@ -3010,7 +3019,7 @@ msgid "" msgstr "" "에뮬레이션 윈도우 위에 마우스 커서가 있을 때 숨깁니다.\n" "\n" -"확신 없다면, 이것을 체크로 두세요." +"모르겠으면, 이것을 체크로 두세요." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Home" @@ -3109,6 +3118,8 @@ msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" +"체크하면, 바운딩 박스 레지스터들이 업데이트될 것입니다. Paper Mario 게임들에" +"서 사용됩니다." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "" @@ -3141,7 +3152,7 @@ msgstr "" "네거티브 효과 없는 많은 게임들에서 성능을 향상시킵니다. 소수 다른 게임들에서 " "그래픽 결함을 유발하긴 합니다.\n" "\n" -"확신 없다면, 이것을 체크로 두세요." +"모르겠으면, 이것을 체크로 두세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" @@ -3155,7 +3166,7 @@ msgstr "" "일부 게임들에서 성능을 향상시킵니다, 하지만 일부 게임플레이관련 특성들이나 그" "래픽 효과들이 비활성화 될지 모릅니다.\n" "\n" -"확신 없다면, 이것을 언체크로 두세요." +"모르겠으면, 이것을 언체크로 두세요." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 msgid "Import Save" @@ -3194,7 +3205,7 @@ msgid "" msgstr "" "성능이 향상되지만 올바른 안개 에뮬레이션에 의존한 대부분의 게임에서 결함을 유" "발합니다.\n" -"확신 없다면, 이것을 언체크로 두세요." +"모르겠으면, 이것을 언체크로 두세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" @@ -3204,7 +3215,7 @@ msgid "" msgstr "" "성능이 향상되지만 대부분의 게임에서 빛이 사라짐을 유발합니다.\n" "\n" -"확신 없다면, 이것을 언체크로 두세요." +"모르겠으면, 이것을 언체크로 두세요." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "In Game" @@ -3553,7 +3564,7 @@ msgid "" msgstr "" "User/Load/Textures// 에서 커스텀 텍스처들을 로드\n" "\n" -"확신 없다면, 이것을 언체크로 두세요." +"모르겠으면, 이것을 언체크로 두세요." #: Source/Core/DolphinWX/Src/PHackSettings.cpp:49 msgid "Load preset values from hack patterns available." @@ -3700,7 +3711,7 @@ 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" @@ -3738,7 +3749,7 @@ msgstr "" "인코딩되고 있는 포멧을 보여주기위해 텍스처들을 수정합니다. 대개의 경우 에뮬레" "이션 리셋이요구됩니다.\n" "\n" -"확신 없다면 이것을 언체크로 두세요." +"모르겠으면, 이것을 언체크로 두세요." #: Source/Core/DolphinWX/Src/LogWindow.cpp:113 msgid "Monospaced font" @@ -4294,17 +4305,17 @@ msgstr "후-처리 효과:" #: Source/Core/Core/Src/Movie.cpp:735 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" -msgstr "" +msgstr "PlayController에 영상마무리가 미완성되었습니다. %u + 8 > %u" #: Source/Core/Core/Src/Movie.cpp:829 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" -msgstr "" +msgstr "PlayWiimote에 영상 마무리가 미완성되었습니다. %u + %d > %u" #: Source/Core/Core/Src/Movie.cpp:806 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" -msgstr "" +msgstr "PlayWiimote에 영상 마무리가 미완성되었습니다. %u > %u" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " @@ -4387,9 +4398,8 @@ msgid "Real Wiimote" msgstr "실제 위모트" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 -#, fuzzy msgid "Real Wiimotes" -msgstr "실제 위모트" +msgstr "리얼 위모트" #: Source/Core/DolphinWX/Src/Frame.cpp:163 msgid "Reconnect Wiimote Confirm" @@ -4437,7 +4447,7 @@ msgstr "" "이것은 렌더된 그림이 덜 블럭져 보이게 합니다.\n" "심각하게 에뮬레이션 속도를 감속시키고 때때로 이슈들을 유발합니다.\n" "\n" -"확신 없다면, 없음을 선택하세요." +"모르겠으면, 없음을 선택하세요." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 #: Source/Core/DolphinWX/Src/FrameTools.cpp:434 @@ -4483,7 +4493,7 @@ msgid "" msgstr "" "와이어프레임으로 장면을 렌더합니다.\n" "\n" -"확신 없다면, 이것을 언체크로 두세요." +"모르겠으면, 이것을 언체크로 두세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 msgid "Render to Main Window" @@ -4777,7 +4787,7 @@ msgstr "" "강제 4:3: 그림을 4:3 종횡비로 늘림\n" "윈도우로 늘림: 그림을 윈도우 크기로 늘림\n" "\n" -"확신 없다면, 자동을 선택하세요." +"모르겠으면, 자동을 선택하세요." #: Source/Core/DolphinWX/Src/LogWindow.cpp:114 msgid "Selected font" @@ -4796,8 +4806,8 @@ msgstr "" "이것은 내부 해상도보다 더 크거나 같아야합니다. 성능 영향은 무시해도 될 정도입" "니다.\n" "\n" -"자신 없으면, 데스크탑 해상도를 사용하세요.\n" -"여전히 자신 없으면, 작동하는 최고 해상도를 사용하세요." +"모르겠으면, 데스크탑 해상도를 사용하세요.\n" +"그래도 모르겠으면, 작동하는 최고 해상도를 사용하세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" @@ -4813,7 +4823,7 @@ msgstr "" "둘 사이 어딘가입니다.\n" "Direct3D 백엔드들은 윈도우즈 상에서만 사용할 수 있다는 것을 알아두세요.\n" "\n" -"자신 없으면, Direct3D 9을 사용하세요." +"모르겠으면, Direct3D 9을 사용하세요." #: Source/Core/DolphinWX/Src/NetWindow.cpp:275 msgid "Send" @@ -5009,7 +5019,7 @@ msgid "" msgstr "" "에뮬레이션 속도의 측정으로 초당 렌더되는 프레임 수치를 보여줍니다.\n" "\n" -"확신 없다면, 이것을 언체크로 두세요." +"모르겠으면, 이것을 언체크로 두세요." #: Source/Core/DolphinWX/Src/Main.cpp:119 msgid "Show this help message" @@ -5027,7 +5037,7 @@ msgid "" msgstr "" "다양한 통계들을 보여줍니다.\n" "\n" -"확신 없다면, 이것을 언체크로 두세요." +"모르겠으면, 이것을 언체크로 두세요." #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 msgid "Sideways Wiimote" @@ -5063,7 +5073,7 @@ msgstr "" "다양한 그래픽 효과들을 위해 많은 게임들에서 사용되는 \"목표 알파 패스\"를 스" "킵합니다.\n" "\n" -"확신 없다면, 이것을 언체크로 두세요." +"모르겠으면, 이것을 언체크로 두세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 msgid "" @@ -5079,7 +5089,7 @@ msgstr "" "때때로 비주얼 퀄리티도 향상시킵니다.\n" "어느 이슈를 겪는다면, 텍스처 캐쉬 정확도를 올려보거나 이 옵션을 끄세요.\n" "\n" -"확신 없다면, 이것을 언체크로 두세요." +"모르겠으면, 이것을 언체크로 두세요." #: Source/Core/DolphinWX/Src/FrameTools.cpp:387 #: Source/Core/DolphinWX/Src/FrameTools.cpp:399 @@ -5112,7 +5122,7 @@ msgid "" msgstr "" "소프트웨어 렌더링은 다른 백엔드들 보다 상당히 느립니다.\n" "디버깅 목적으로만 유용합니다.\n" -"소프트웨어 렌더링을 활성을 정말 원합니까? 자신 없으면, '아니오'를 선택하세요." +"소프트웨어 렌더링을 활성을 정말 원합니까? 모르겠으면, '아니오'를 선택하세요." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" @@ -5172,7 +5182,7 @@ msgstr "" "다. 일반적으로 말해서, 낮은 내부 해상도일 수록, 더 나은 성능이 나올 것입니" "다.\n" "\n" -"확신 없다면, 640x528를 선택하세요." +"모르겠으면, 640x528를 선택하세요." #: Source/Core/DolphinWX/Src/Main.cpp:144 msgid "Specify a video backend" @@ -5256,7 +5266,7 @@ msgstr "" "GPU 텍스처 오브젝트안의 EFB 복사들을 담습니다.\n" "이것은 그렇게 정확하지는 않습니다. 하지만 대부분의 게임에서 충분히 잘 작동하" "고 \"램에 EFB\"를 넘는 대단한 속도향상을 줍니다.\n" -"확신 없다면, 이것을 체크로 두세요." +"모르겠으면, 이것을 체크로 두세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Stretch to Window" @@ -5329,7 +5339,7 @@ msgstr "스크린샷 찍기" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "TaruKonga (Bongos)" -msgstr "" +msgstr "타루콩가 (봉고스)" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" @@ -5414,7 +5424,7 @@ msgid "" msgstr "" "이것을 안전하게 정할 수록, 에뮬레이터가 램으로 부터 텍스처 업데이트들을 덜 놓" "치는 경향이 있습니다.\n" -"확신 없다면, 오른쪽에서 두번째-가장빠름을 사용하세요." +"모르겠으면, 오른쪽에서 두번째-가장빠름을 사용하세요." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 msgid "The save you are trying to copy has an invalid file size" @@ -5505,7 +5515,7 @@ msgstr "" "에 하나를 누르세요 (쉬프트+0 은 더 빠른 이동이고 쉬프트+9은 더 느린 이동). 카" "메라를 리셋하려면 쉬프트+R을 누르세요.\n" "\n" -"확신 없다면. 이것을 언체크로 두세요." +"모르겠으면. 이것을 언체크로 두세요." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 msgid "" @@ -5647,6 +5657,8 @@ msgid "" "Unable to create patch from given values.\n" "Entry not modified." msgstr "" +"주어진 값들에서 패치를 생성할 수 없습니다.\n" +"항목이 수정되지 않았습니다." #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:123 #, c-format @@ -5748,7 +5760,7 @@ msgstr "" "텍스처를 디코드하기 위해 멀티 쓰레드를 사용합니다.\n" "속도향상될 겁니다 (특히 듀얼코어 이상의 CPU들 상에서).\n" "\n" -"확신 없다면, 이것을 언체크로 두세요." +"모르겠으면, 이것을 언체크로 두세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 msgid "" @@ -5762,7 +5774,7 @@ msgstr "" "그렇지만, 이 옵션 체크로 자유로운 게임플레이를 방해하는 팝업들을 스킵할 수 있" "습니다.\n" "\n" -"확신 없다면, 이것을 언체크로 두세요." +"모르겠으면, 이것을 언체크로 두세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Utility" @@ -5817,7 +5829,7 @@ msgstr "" "갈라짐을 줄이기위해 수직 블랭크를 기다립니다. \n" "에뮬레이션 속도가 100% 이하라면 성능을 저하시킵니다.\n" "\n" -"확신 없다면, 이것을 언체크로 두세요." +"모르겠으면, 이것을 언체크로 두세요." #: Source/Core/Common/Src/MsgHandler.cpp:67 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 @@ -5868,6 +5880,9 @@ msgid "" "%u > %u) (frame %u > %u). You should load another save before continuing, or " "load this state with read-only mode off." msgstr "" +"경고: 최근 영상의 끝 뒤에 있는 저장을 로드하였습니다. (byte %u > %u) (frame " +"%u > %u). You should load another save before continuing, or load this state " +"with read-only mode off." #: Source/Core/Core/Src/Movie.cpp:646 #, c-format @@ -5876,6 +5891,9 @@ msgid "" "should load another save before continuing, or load this state with read-" "only mode off. Otherwise you'll probably get a desync." msgstr "" +"경고: %d (0x%X) 바이트상에 영상 매칭이 안되는 세이브를 로드했습니다. 계속하기" +"전에 다른 세이브를 로드해야합니다, 혹은 읽기-전용 모드를 끄고 로드하세요. 그" +"렇지 않으면 아마도 싱크 어긋남이 생길겁니다." #: Source/Core/Core/Src/Movie.cpp:655 #, c-format @@ -5895,6 +5913,20 @@ 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 "" +"경고: %d 프레임상에 영상 매칭이 안되는 세이브를 로드했습니다. 계속하기전에 다" +"른 세이브를 로드해야합니다, 혹은 읽기-전용 모드를 끄고 로드하세요. 그렇지 않" +"으면 아마도 싱크 어긋남이 생길 겁니다.\n" +"\n" +"추가 정보: 현재 영상은 %d 프레임 길이 이고 상태저장의 영상은 %d 프레임 길이 " +"입니다.\n" +"\n" +"%d 프레임 상에, 현재 영상 프레스:\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 프레임 상에, 상태저장의 영상 프레스:\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" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 @@ -5951,9 +5983,9 @@ msgid "Wiimote" msgstr "위모트" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 -#, fuzzy, c-format +#, c-format msgid "Wiimote %i" -msgstr "위모트" +msgstr "위모트 %i" #: Source/Core/DolphinWX/Src/Frame.cpp:162 #, c-format @@ -5989,7 +6021,6 @@ msgid "Wiimote settings" msgstr "위모트 설정" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 -#, fuzzy msgid "Wiimotes" msgstr "위모트" @@ -6063,6 +6094,8 @@ msgid "" "You are using free dsp roms made by Dolphin Team.\n" "Only Zelda ucode games will work correctly with them.\n" msgstr "" +"당신은 돌핀 팀에 의해 만들어진 공짜 dsp 롬들을 사용하고 있습니다.\n" +"Zelda ucode 게임들만이 그것들로 올바르게 작동할 것입니다.\n" #: Source/Core/DolphinWX/Src/FrameAui.cpp:72 msgid "You can't close panes that have pages in them." @@ -6135,7 +6168,7 @@ msgstr "" "[고장남]\n" "EFB 영역 하이라이트가 복사되었습니다.\n" "\n" -"확신 없다면, 이것을 언체크로 두세요." +"모르겠으면, 이것을 언체크로 두세요." #: Source/Core/DolphinWX/Src/PHackSettings.cpp:90 msgid "[Custom]" @@ -6157,7 +6190,7 @@ msgstr "" "하지만, 지금 당장은 다양한 게임에서 텍스처 결함을 유발하는 것으로 알려집니" "다. 또한 대부분의 경우에서 정규 CPU 텍스처 디코딩보다 느립니다.\n" "\n" -"확신 없다면, 이것을 언체크로 두세요." +"모르겠으면, 이것을 언체크로 두세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" @@ -6171,7 +6204,7 @@ msgstr "" "화면표시 목록을 캐쉬함으로 에뮬레이션을 약간 속도향상시킵니다.\n" "이슈들을 일으킬 수 있지만.\n" "\n" -"확신 없다면, 이것을 언체크로 두세요." +"모르겠으면, 이것을 언체크로 두세요." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 msgid "^ ADD" @@ -6320,6 +6353,9 @@ msgstr "| OR" #~ msgid "Can't open %s, it has a missing function" #~ msgstr "%s를 열수 없음, 그것은 놓친 함수를 가진다" +#~ msgid "Cannot record movies in read-only mode." +#~ msgstr "읽기-전용 모드에서 영상을 기록할 수 없습니다." + #~ msgid "Config..." #~ msgstr "환경설정..." From 1b1016ece71a637a3589396fad66e7338d045c4c Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Fri, 9 Mar 2012 16:58:57 -0600 Subject: [PATCH 13/14] Update the pot file to reflect recent changes in the code. --- Languages/po/ar.po | 968 ++++++++++++-------- Languages/po/ca.po | 964 ++++++++++++-------- Languages/po/cs.po | 1556 +++++++++++++++++++++----------- Languages/po/de.po | 967 ++++++++++++-------- Languages/po/dolphin-emu.pot | 937 ++++++++++++-------- Languages/po/el.po | 996 +++++++++++++-------- Languages/po/en.po | 937 ++++++++++++-------- Languages/po/es.po | 989 +++++++++++++-------- Languages/po/fa.po | 883 ++++++++++--------- Languages/po/fr.po | 988 +++++++++++++-------- Languages/po/he.po | 937 ++++++++++++-------- Languages/po/hu.po | 1614 ++++++++++++++++++++++------------ Languages/po/it.po | 971 ++++++++++++-------- Languages/po/ja.po | 970 ++++++++++++-------- Languages/po/ko.po | 970 ++++++++++++-------- Languages/po/nb.po | 966 ++++++++++++-------- Languages/po/nl.po | 967 ++++++++++++-------- Languages/po/pl.po | 980 +++++++++++++-------- Languages/po/pt.po | 968 ++++++++++++-------- Languages/po/pt_BR.po | 981 +++++++++++++-------- Languages/po/ru.po | 962 ++++++++++++-------- Languages/po/sr.po | 937 ++++++++++++-------- Languages/po/tr.po | 973 ++++++++++++-------- Languages/po/zh_CN.po | 963 ++++++++++++-------- Languages/po/zh_TW.po | 963 ++++++++++++-------- 25 files changed, 15680 insertions(+), 9627 deletions(-) diff --git a/Languages/po/ar.po b/Languages/po/ar.po index 10b8d4bb51..08cfb17be9 100644 --- a/Languages/po/ar.po +++ b/Languages/po/ar.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-16 11:25-0500\n" "Last-Translator: mansoor\n" @@ -22,6 +23,9 @@ msgstr "" "PO-Revision-Date: 2011-10-16 11:25-0500\n" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-12-27 08:27-0600\n" >>>>>>> Update from master branch. "Last-Translator: mansoor\n" @@ -65,9 +69,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sنسخ%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d هرتز" @@ -157,7 +161,7 @@ msgstr "%sتصدير GCI%s" msgid "%sImport GCI%s" msgstr "%sاستيراد GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "" @@ -190,11 +194,11 @@ msgstr "&مدير الاسرار" msgid "&DSP Settings" msgstr "&إعدادات الصوت" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&مسح ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&حذف تحديد ايزو" @@ -258,7 +262,7 @@ msgstr "&وقفة" msgid "&Play" msgstr "&ابداء اللعبه" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&خصائص" @@ -302,7 +306,7 @@ msgstr "&القائمة" msgid "&Wiimote Settings" msgstr "&إعدادات تحكم الوي" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "&معلومات عن اللعبة" @@ -346,7 +350,7 @@ msgstr "<أدخل اسم هنا>" msgid "" msgstr "<لم يتم العثور على القرارات>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "<لا شيء>" @@ -355,7 +359,7 @@ msgstr "<لا شيء>" msgid "" msgstr "<اضغط على مفتاح>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "<النظام>" @@ -409,13 +413,13 @@ msgstr "" "\n" "يجب عليك إعادة توجيه البرنامج منفذ الهوست!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "اسرار" @@ -427,11 +431,11 @@ msgstr "ترجمة البرنامج بواسطة الررائع" msgid "Acceleration" msgstr "تسريع" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "ضبط:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Accurate VBeam emulation" @@ -542,11 +546,11 @@ msgstr "كرت الشاشه :" msgid "Add" msgstr "أضف" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "إضافة رمز ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "أضف باتش" @@ -554,6 +558,7 @@ msgstr "أضف باتش" msgid "Add new pane" msgstr "إضافة جزء جديد" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -569,6 +574,11 @@ msgstr "إضافة جزء جديد" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "أضف" @@ -602,11 +612,11 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "ضبط السيطرة على ضغط التناظرية المطلوبة لتنشيط الأزرار." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "متقدم" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "إعدادات متقدمة" @@ -614,14 +624,15 @@ msgstr "إعدادات متقدمة" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "All GC/Wii images (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "جميع ملفات الجيم كيوب (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -634,18 +645,22 @@ msgstr "جميع ملفات الجيم كيوب (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "حفظ جميع الحالات (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "جميع ملفات ايزو الوي" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "جميع مضغوط GC/Wii ISO files (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "جميع الملفات (*.*)|*.*" @@ -661,6 +676,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 <<<<<<< HEAD <<<<<<< HEAD @@ -672,6 +688,9 @@ msgid "Alternate Wiimote Timing" msgstr "محاكاة ويموت" >>>>>>> Update translation files for recent changes in the code. ======= +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Alternate Wiimote Timing" msgstr "بديل ويموت" >>>>>>> Update Arabic and Japanese translations. @@ -692,7 +711,7 @@ msgstr "محمل التطبيق هو حجم الخطأ... هل حقا محمل msgid "Apploader unable to load from file" msgstr "Apploader غير قادر على تحميل ملف من" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Apploader:" @@ -710,7 +729,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا حدد إيقاف." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Arabic" @@ -719,16 +738,17 @@ msgstr "Arabic" msgid "Are you sure you want to delete \"%s\"?" msgstr "هل أنت متأكد أنك تريد حذف \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" msgstr "هل أنت متأكد أنك تريد حذف هذه الملف؟ " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "هل أنت متأكد أنك تريد حذف هذه الملفات؟" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -738,6 +758,9 @@ msgstr "هل أنت متأكد أنك تريد حذف هذه الملفات؟" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "نسبة العرض :" @@ -746,18 +769,20 @@ msgstr "نسبة العرض :" msgid "At least one pane must remain open." msgstr "يجب أن لا يقل عن جزء واحد لا تزال مفتوحة." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "الصوت" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "صوت الخلفية :" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -767,6 +792,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "تلقائي" @@ -809,7 +837,7 @@ msgstr "" msgid "Back" msgstr "رجوع" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "إعدادات الخلفية" @@ -836,11 +864,11 @@ msgstr "سيء بداية الملف " msgid "Banner" msgstr "بنر" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "تفاصيل بنر" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "بنر:" @@ -852,7 +880,7 @@ msgstr "شريط" msgid "Basic" msgstr "الأساسية" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "إعدادات أساسية" @@ -883,6 +911,7 @@ msgstr "اليمين أزرق" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -890,6 +919,9 @@ msgstr "اليمين أزرق" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "أسفل" @@ -898,7 +930,7 @@ msgstr "أسفل" msgid "Bound Controls: %lu" msgstr "يلزم التحكم: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "معطلة" @@ -914,7 +946,7 @@ msgstr "لتصفح دليل لإضافة" msgid "Browse for an ISO directory..." msgstr "لاستعراض الدليل ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "لاستعراض الدليل الإخراج" @@ -944,11 +976,11 @@ msgstr "العصا الأيمن " msgid "C-Stick" msgstr "العصا الأيمن " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "محرك محاكي المعالج" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "شاشة القوائم المؤقته" @@ -1008,6 +1040,7 @@ msgstr "لا يمكن تسجيل الأفلام في وضع للقراءة فق msgid "Cannot unregister events with events pending" msgstr "لا يمكن إلغاء تسجيل الأحداث مع الأحداث المعلقة" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 @@ -1017,6 +1050,9 @@ msgstr "لا يمكن إلغاء تسجيل الأحداث مع الأحداث ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1027,7 +1063,7 @@ msgstr "" "%s\n" "ليست ذاكرة جيم كيوب ملف بطاقة صالحة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1045,8 +1081,6 @@ msgstr "غير قادر العثور على ويموت: %02x:%02x:%02x:%02x:%02x msgid "Cant find WiiMote by connection handle %02x" msgstr "غير قادر على العثور ويموت بواسطة معالج الاتصال %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1056,7 +1090,7 @@ msgstr "" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "Catalan" @@ -1081,7 +1115,7 @@ msgstr "تغيير القرص" msgid "Change Game" msgstr "تغيير اللعبة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1097,8 +1131,8 @@ msgstr "Changes sign to zFar Parameter (بعد التصحيح)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Changes sign to zNear Parameter (بعد التصحيح)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "تغيير هذه ليس لها أي أثر في حين أن المحاكي قيد التشغيل!" @@ -1118,31 +1152,31 @@ msgstr "بحث عن اسرار" msgid "Cheats Manager" msgstr "قائمة الاسرار" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Chinese (Simplified)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Chinese (Traditional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "DVD اختيار الدليل أصل :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "Choose a NAND root directory:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "اختيار ايزو الافتراضية :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "اختيار دليل لإضافة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "اختيار ملف لفتح" @@ -1150,15 +1184,15 @@ msgstr "اختيار ملف لفتح" msgid "Choose a memory card:" msgstr "اختيار بطاقة الذاكرة :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 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 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "اختيار مجلد لاستخراج" @@ -1170,14 +1204,14 @@ msgstr "دائرة العصا" msgid "Classic" msgstr "الكلاسيكية" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "أزال" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "فشل في الازاله." @@ -1193,6 +1227,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 @@ -1201,6 +1236,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "إغلاق" @@ -1224,20 +1263,20 @@ msgstr "الأمر" msgid "Comment" msgstr "التعليق" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "التعليق:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "ضغط ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "اختيار ضغط ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "ضغط ايزو" @@ -1264,13 +1303,13 @@ msgstr "تكوين منصات" msgid "Configure..." msgstr "إعدادات" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "تأكيد الكتابة فوق ملف" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "تأكيد على التوقف" @@ -1279,7 +1318,7 @@ msgstr "تأكيد على التوقف" msgid "Connect" msgstr "اتصال" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "ربط كيبورد يو اس بي" @@ -1336,12 +1375,12 @@ msgstr "GCIتحويل إلى " msgid "Copy failed" msgstr "فشل نسخ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "نسخ إلى بطاقة الذاكرة %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "الأساسية" @@ -1371,7 +1410,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "لا يمكن التعرف ملف ايزو %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "لا يمكن حفظ %s" @@ -1384,7 +1423,7 @@ msgstr "" "تعذر تعيين منصات. وغادر لاعب أو لعبة قيد التشغيل حاليا!\n" "(منصات الإعداد أثناء قيد التشغيل اللعبة غير معتمد حتى الآن)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1397,7 +1436,7 @@ msgstr "" "Are you running Dolphin from a CD/DVD, or is the save file maybe write " "protected?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "لا يمكن العثور فتح الأوامر للتمديد 'ini'!" @@ -1414,7 +1453,7 @@ msgstr "" msgid "Count:" msgstr "الاحصاء :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "البلد:" @@ -1428,28 +1467,28 @@ msgstr "إنشاء رموز اسرار" msgid "Create new perspective" msgstr "إنشاء منظور جديد" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr " KDE-Look.org تم بواسطة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" " Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com] تم بواسطة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr " VistaIcons.com تم بواسطة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" " black_rider and published on ForumW.org > Web DevelopmentsCreated by " "black_rider and published on ForumW.org > Web Developments black_rider and " "published on ForumW.org > Web Developments تم بواسطة" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "المنشئ :" @@ -1457,7 +1496,7 @@ msgstr "المنشئ :" msgid "Critical" msgstr "حرج" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "محصول" @@ -1480,7 +1519,7 @@ msgstr "الإبهات المتداخل" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "المسار الحالي تغيرت من %s to %s after wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "هاك مخصص العرض" @@ -1488,11 +1527,11 @@ msgstr "هاك مخصص العرض" msgid "Custom Projection Hack Settings" msgstr "إعدادات هاك مخصص العرض" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "تخصيص بعض المعلمات العرض على إملائي." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Czech" @@ -1504,10 +1543,11 @@ msgstr "الاسهم" msgid "DSP" msgstr "الصوت" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "محرك محاكي الصوت" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1518,18 +1558,22 @@ msgstr "محرك محاكي الصوت" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulation (سريع)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE interpreter (بطيء)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "DSP LLE on Thread" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP LLE recompiler" @@ -1537,15 +1581,23 @@ msgstr "DSP LLE recompiler" msgid "DSP settings" msgstr "إعدادات الصوت" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "DVD Root:" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "حجم البيانات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "التاريخ :" @@ -1566,7 +1618,7 @@ msgstr "المنطقة الميتة" msgid "Debug" msgstr "التصحيح" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "التصحيح" @@ -1574,16 +1626,16 @@ msgstr "التصحيح" msgid "Decimal" msgstr "عشري" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "ضغط ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "اختيار إلغاء ضغط ايزو " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "فك ايزو" @@ -1591,11 +1643,11 @@ msgstr "فك ايزو" msgid "Default" msgstr "الافتراضي" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "ايزو الافتراضية :" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "الخط الافتراضي" @@ -1604,7 +1656,7 @@ msgstr "الخط الافتراضي" msgid "Delete" msgstr "حذف" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "حذف الحفظ" @@ -1613,7 +1665,7 @@ msgstr "حذف الحفظ" msgid "Delete the existing file '%s'?" msgstr "حذف الملف الموجود '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "الوصف" @@ -1621,8 +1673,8 @@ msgstr "الوصف" msgid "Detect" 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 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." @@ -1633,8 +1685,8 @@ msgstr "" msgid "Device" msgstr "أداة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "إعدادات الجهاز" @@ -1659,23 +1711,23 @@ msgstr "" " و فشل دليل الاختباري الاحتياطية" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "تعطيل" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "تعطيل الضباب" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "تعطيل إضاءة" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "تعطيل العمق لكل بكسل" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "Texturesتعطيل " @@ -1719,7 +1771,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "القرص" @@ -1746,6 +1798,7 @@ msgstr "" msgid "Divide" msgstr "انقسام" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1755,10 +1808,13 @@ msgstr "انقسام" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "هل تريد اغلق اللعبة الحالية؟" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "دولفين" @@ -1783,6 +1839,7 @@ msgstr "إعدادات تحكم الوي" msgid "Dolphin FIFO" msgstr "دولفين" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1807,6 +1864,14 @@ msgstr "إعدادات تحكم الجيم كيوب" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "إعدادات تحكم الجيم كيوب" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1837,11 +1902,11 @@ msgstr "" msgid "Down" msgstr "أسفل" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "تحميل اسرار للعبة" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "%lu وأضاف %lu تم تحميل الاسرار " @@ -1850,23 +1915,23 @@ msgstr "%lu وأضاف %lu تم تحميل الاسرار " msgid "Drums" msgstr "الطبول" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "وهمي " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "Dump Audio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "Dump EFB Target" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "تفريغ الإطارات" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "Dump Textures" @@ -1900,6 +1965,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1915,6 +1981,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Dutch" @@ -1935,7 +2006,7 @@ msgid "" "driver." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "أوروبا" @@ -1951,7 +2022,7 @@ msgstr "تحرير" msgid "Edit ActionReplay Code" msgstr "تعديل رمز ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "تعديل الاعدادات" @@ -1963,8 +2034,8 @@ msgstr "تعديل الباتش" msgid "Edit current perspective" msgstr "تعديل المنظور الحالي" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "تحرير" @@ -2009,7 +2080,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "محاكاة ويموت" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "حالة المحاكاه: " @@ -2038,18 +2109,15 @@ msgstr "" msgid "Enable AR Logging" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "Enable Audio Throttle" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "BAT تمكين" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "تمكين منع الدمج" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 @@ -2060,6 +2128,9 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "تمكين تنظيم حساب الإطار" @@ -2068,6 +2139,7 @@ msgstr "تمكين تنظيم حساب الإطار" msgid "Enable Cache" msgstr "تمكين التخزين المؤقت" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2077,51 +2149,54 @@ msgstr "تمكين التخزين المؤقت" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "تمكين الاسرار " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "Enable DTK Music" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Enable Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Enable Dual Core (لزيادة السرعة)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "تمكين الاختصارات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Enable Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Enable Idle Skipping (لزيادة السرعة)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "MMU تمكين" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "تمكين المسح التقدمي" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "تمكين شاشة التوقف" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "تمكين شاشة عريضة" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "تمكين الإطار السلكي" @@ -2139,7 +2214,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا حدد X1." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2147,7 +2222,7 @@ msgstr "" "تمكين الوصول السريع القرص.اللازمة لعدد قليل من الألعاب. (ON = Fast, OFF = " "Compatible)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "تمكين صفحات" @@ -2175,20 +2250,20 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "تمكين هذا لتسريع أسطورة زيلدا : الشفق الاميرة. لتعطيل أي لعبة أخرى." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 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 "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "يمكن توقعات مخصص هاك" @@ -2204,7 +2279,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذه غير محددة." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2224,6 +2299,7 @@ msgstr "" msgid "End" msgstr "نهاية" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2239,6 +2315,11 @@ msgstr "نهاية" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "English" @@ -2269,6 +2350,7 @@ msgstr "المساواة" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "خطأ" @@ -2299,18 +2381,24 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "خطأ" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: 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 +#: Source/Core/Common/Src/ChunkFile.h:194 #, 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 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2344,7 +2432,7 @@ msgstr "للخروج مع المحاكي" msgid "Export Failed" msgstr "فشل تصدير" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "فشل تصدير" @@ -2357,15 +2445,15 @@ msgstr "تصدير تسجيل" msgid "Export Recording..." msgstr "تصدير تسجيل" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "تصدير حفظ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "تصدير حفظ الوي" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "تصدير جميع الحفظ" @@ -2381,7 +2469,7 @@ msgstr "تصدير حفظ باسم" msgid "Extension" msgstr "تمديد" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "عزل الاطار الخارجي" @@ -2393,44 +2481,44 @@ msgstr "معلمة إضافية" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "استخراج كافة الملفات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "استخراج Apploader" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "استخراج دليل" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "استخراج الملفات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "استخراج التقسيم" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "استخراج %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "استخراج كافة الملفات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "استخراج دليل" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "استخراج" @@ -2442,11 +2530,11 @@ msgstr "بايت" msgid "FIFO Player" msgstr "لاعبين" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "فرنسا" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "الحجم :" @@ -2458,11 +2546,11 @@ msgstr "خطأ الاتصال" msgid "Failed to Listen!!" msgstr "لم اسمع!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "اللعبه لاتوجد في قاعده البيانات." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "فشل في الاستخراج إلى %s!" @@ -2561,18 +2649,28 @@ msgstr "" msgid "Failed to write header for file %d" msgstr "فشل لكتابة عنوان لملف %d" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "سريع" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "Mipmaps سريع" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr " لا يعمل في كل لعبة MMU إصدار سريع من." +#: Source/Core/Core/Src/Movie.cpp:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "لاعبين" @@ -2581,7 +2679,7 @@ msgstr "لاعبين" msgid "File Info" msgstr "ملف المعلومات" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "الملف لا يتضمن اسرار." @@ -2614,16 +2712,16 @@ msgstr "لم يتم التعرف على الملف كملف بطاقة ذاكر msgid "File not compressed" msgstr "ملف غير مضغوط " -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "الملفات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "نوع الملف غير معروف! لن تفتح!" @@ -2631,7 +2729,7 @@ msgstr "نوع الملف غير معروف! لن تفتح!" msgid "First Block" msgstr "أول بلوك" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "الإصلاح اختبارية" @@ -2643,7 +2741,7 @@ msgstr "العرض 16:9" msgid "Force 4:3" msgstr "العرض 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "فرض وحدة التحكم على النظام الياباني" @@ -2675,7 +2773,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2709,7 +2807,7 @@ msgstr "الإطار" msgid "Frame Advance" msgstr "الإطار المسبق" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "Frame Dumps use FFV1" @@ -2721,7 +2819,7 @@ msgstr "مجموعة الإطار " msgid "Frame S&kipping" msgstr "تخطي الإطار " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "حد الإطار:" @@ -2729,10 +2827,11 @@ msgstr "حد الإطار:" msgid "Frames To Record" msgstr "إطارات لتسجيل" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "تحكم بكاميرا اللعبة" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2748,6 +2847,11 @@ msgstr "تحكم بكاميرا اللعبة" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "French" @@ -2785,7 +2889,7 @@ msgstr "سجل الإعدادات" msgid "GCPad" msgstr "تحكم الجيم كيوب" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "معرف اللعبة:" @@ -2801,15 +2905,15 @@ msgstr "اللعبة ليست على التوالي!" msgid "Game not found!!" msgstr "لم يتم العثور على لعبة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "إعدادات معينه للعبه" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "إعدادات اللعبة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "جيم كيوب" @@ -2820,6 +2924,7 @@ msgstr "إعدادات تحكم جيم كيوب" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2827,6 +2932,9 @@ msgstr "إعدادات تحكم جيم كيوب" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "بطاقه ذاكره الجيم كيوب (*.raw,*.gcp) " @@ -2835,15 +2943,17 @@ msgid "Gamecube Pad settings" msgstr "إعدادات تحكم جيم كيوب" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "تحميل اسرار" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" "GeckoCode فشل تشغيل (CT%i CST%i) (%s)\n" "(إما غير رمز سيئة أو نوع رمز غير مدعومة حتى الآن.)" @@ -2852,6 +2962,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 @@ -2860,6 +2971,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "عام" @@ -2868,6 +2982,7 @@ msgstr "عام" msgid "General Settings" msgstr "الإعدادات العامة" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2883,6 +2998,11 @@ msgstr "الإعدادات العامة" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "German" @@ -2926,7 +3046,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا، اترك هذا التحقق." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Greek" @@ -2958,7 +3078,7 @@ msgstr "هاك" msgid "Header checksum failed" msgstr "عنوان اختباري فشل" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Hebrew" @@ -3028,12 +3148,16 @@ msgstr "إعدادات الاختصارات" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "الاختصارات" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Hungarian" @@ -3041,12 +3165,12 @@ msgstr "Hungarian" msgid "Hybrid Wiimote" msgstr "ويموت هجين" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -3055,11 +3179,11 @@ msgid "" " Dolphin will likely hang now" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "IPL إعدادات" @@ -3075,15 +3199,15 @@ msgstr "IR المؤشر" msgid "IR Sensitivity:" msgstr "IR حساسية:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "تفاصيل ايزو" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "مجلد الايزو" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "إيطاليا" @@ -3091,7 +3215,7 @@ msgstr "إيطاليا" msgid "Icon" msgstr " أيقونة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -3102,15 +3226,17 @@ msgstr "" "ماريو" >>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy 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." +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " +"Audio to throttle using the DSP (might fix audio clicks but can also cause " +"constant noise depending on the game)." msgstr "" "لجعلها فعالة Audio Throttle يجب عليك تعطيل NTSC:60, PAL:50 إذا قمت بتعيين " "حد الإطار أعلى من السرعة لعبة الافتراضية " @@ -3147,7 +3273,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "حفظ استيراد" @@ -3193,7 +3319,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا ترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "تتعطل في اللعبة" @@ -3202,7 +3328,7 @@ msgid "In-Game" msgstr "في اللعبة" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "معلومات" @@ -3222,7 +3348,7 @@ msgstr "إدراج" msgid "Insert Encrypted or Decrypted code here..." msgstr "إدراج رمز المشفرة أو فك شفرة هنا" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "SD Card ادرج " @@ -3234,7 +3360,7 @@ msgstr "أدخل اسم هنا" msgid "Install WAD" msgstr "wad تثبيت" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "تثبيت إلى قائمة الوي" @@ -3243,6 +3369,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3252,14 +3379,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "wad تثبيت" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "الواجهة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "واجهة الإعدادات" @@ -3284,11 +3414,11 @@ msgstr "" msgid "Internal Resolution:" msgstr "الدقة الداخلية :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Interpreter (بطيئة جدا)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "تتعطل في المقدمة" @@ -3305,7 +3435,7 @@ msgstr "قيمة غير صالحة!" msgid "Invalid bat.map or dir entry" msgstr "" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "غير صالح نوع الحدث %i" @@ -3322,14 +3452,15 @@ msgid "" " You may need to redump this game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "تسجيل الملف غير صالح" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "غير صالح حالة" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3345,27 +3476,32 @@ msgstr "غير صالح حالة" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italian" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "اليابان" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT Recompiler (موصى به)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL recompiler (تجريبي )" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japanese" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "كوريا" @@ -3374,8 +3510,8 @@ msgstr "كوريا" msgid "Key" msgstr "المفتاح" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Korean" @@ -3393,7 +3529,7 @@ msgstr "L Button" msgid "L-Analog" msgstr "L-Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "اللغة :" @@ -3441,7 +3577,7 @@ msgstr "" msgid "Less Than" msgstr "أقل من" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "الحد من عدد الإطارات في الثانية " @@ -3449,7 +3585,7 @@ msgstr "الحد من عدد الإطارات في الثانية " msgid "Load" msgstr "تحميل" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "تحميل القوام المخصص" @@ -3497,6 +3633,7 @@ msgstr "8 تحميل حالة" msgid "Load State..." msgstr "تحميل حالة" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3518,6 +3655,13 @@ msgstr "تحميل قائمة نظام الوي" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "تحميل قائمة نظام الوي" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "تحميل قائمة نظام الوي %d%c" @@ -3544,7 +3688,7 @@ msgstr "تحميل الملف المحدد (DOL,ELF,GCM,ISO,WAD)" msgid "Local" msgstr "المحلية" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Lock Threads to Cores" @@ -3556,11 +3700,11 @@ msgstr "سجل" msgid "Log Configuration" msgstr "سجل الإعدادات" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "نوع السجل" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "مختلفان النواتج" @@ -3588,7 +3732,7 @@ msgid "" " %016llx%016llx != %016llx%016llx" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU سرعة هاك" @@ -3610,11 +3754,11 @@ msgstr "" msgid "Main Stick" msgstr "العصا الأيسر" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "معرف المنتج :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "المنتج :" @@ -3638,6 +3782,7 @@ msgstr "ذاكرة بايت" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3645,6 +3790,9 @@ msgstr "ذاكرة بايت" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "بطاقة الذاكرة" @@ -3679,7 +3827,7 @@ msgstr "حجم بطاقة الذاكرة لا تتطابق مع حجم المل msgid "Menu" msgstr "القائمة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "الميكروفون" @@ -3688,11 +3836,11 @@ msgstr "الميكروفون" msgid "Min" msgstr "منخفض" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "متفرقات" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "إعدادات منوعة" @@ -3713,7 +3861,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "الخط أحادي المسافة" @@ -3726,7 +3874,7 @@ msgstr "موشن بلس" msgid "Motor" msgstr "محرك" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3748,7 +3896,7 @@ msgstr "" msgid "Multiply" msgstr "تضاعف" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3840,6 +3988,7 @@ msgstr "التبويب" msgid "NP Up" msgstr "فوق" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3849,6 +3998,9 @@ msgstr "فوق" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3857,7 +4009,7 @@ msgstr "الاسم :" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "الاسم :" @@ -3871,7 +4023,7 @@ msgid "New Scan" msgstr "بحث جديد" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "الصفحة التالية" @@ -3883,7 +4035,7 @@ msgstr "البحث التالي" msgid "Nickname :" msgstr "اسمك :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "لا يوجد بلد (SDK)" @@ -3922,7 +4074,7 @@ msgstr "لا حفظ المجلد نتيجة البحث عن العنوان %s" msgid "None" msgstr "لا شيء" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Norwegian Bokmaal" @@ -3930,8 +4082,8 @@ msgstr "Norwegian Bokmaal" msgid "Not Equal" msgstr "لا يساوي" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "غير مجموعة" @@ -3951,7 +4103,7 @@ msgstr "غير متصل" msgid "Notes" msgstr "ملاحظات" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "ملاحظات :" @@ -3989,7 +4141,7 @@ msgstr "الهدف" msgid "Object Range" msgstr "نطاق الهدف" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "إيقاف" @@ -4015,11 +4167,11 @@ msgstr "فقط %d كتل متاحة" msgid "Open" msgstr "فتح" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "فتح المجلد المتضمن" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "افتح مجلد حفظ الوي" @@ -4041,11 +4193,11 @@ msgstr "OpenAL : لا يمكن العثور على أجهزة الصوت" msgid "OpenAL: can't open device %s" msgstr "OpenAL : لا يمكن فتح الجهاز %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "" @@ -4077,7 +4229,7 @@ msgstr "" "واستيراد وحفظ لبطاقة ذاكرة جديدة\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "أخرى" @@ -4129,19 +4281,20 @@ msgstr "الفقرة" msgid "Parameters" msgstr "معلمات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "قسم %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "باتش" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "مسارات" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4154,6 +4307,10 @@ msgstr "مسارات" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "وقفة" @@ -4162,7 +4319,7 @@ msgstr "وقفة" msgid "Per-Pixel Lighting" msgstr "لكل بكسل إضاءة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "مثالية" @@ -4175,6 +4332,7 @@ msgstr "مشهد %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 ======= @@ -4185,6 +4343,10 @@ msgstr "مشهد %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "بدأ اللعبه" @@ -4198,7 +4360,7 @@ msgstr "تشغيل التسجيل" msgid "Play/Pause" msgstr "بدأ/ايقاف" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "قابلة للتشغيل" @@ -4210,6 +4372,7 @@ msgstr "خيارات التشغيل" msgid "Players" msgstr "لاعبين" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4219,6 +4382,9 @@ msgstr "لاعبين" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "يرجى تأكيد" @@ -4230,23 +4396,23 @@ msgstr "الرجاء إنشاء منظور قبل الحفظ" msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Polish" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "تحكم 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "تحكم 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "تحكم 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "تحكم 4" @@ -4255,11 +4421,11 @@ msgstr "تحكم 4" msgid "Port :" msgstr "المنفذ :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portuguese" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portuguese (Brazilian)" @@ -4267,17 +4433,17 @@ msgstr "Portuguese (Brazilian)" msgid "Post-Processing Effect:" msgstr "بعد معالجة تأثير:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4290,7 +4456,7 @@ msgstr "إعدادات مسبقة :" msgid "Prev Page" msgstr "الصفحة السابقة" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "الصفحة السابقة" @@ -4341,7 +4507,7 @@ msgstr "R-Analog" msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "روسيا" @@ -4354,7 +4520,7 @@ msgstr "قوه" msgid "Read-only mode" msgstr "وضع القراءة فقط" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "حقيقي" @@ -4429,6 +4595,7 @@ msgstr "تحديث قائمة" msgid "Refresh game list" msgstr "تحديث القائمة" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4447,6 +4614,12 @@ msgstr "تحديث القائمة" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "إزالة" @@ -4499,11 +4672,11 @@ msgstr "العصا الايمن" msgid "Rumble" msgstr "هزاز" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Run DSP LLE on a dedicated thread (غير مستحسن)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Russian" @@ -4511,10 +4684,11 @@ msgstr "Russian" msgid "Sa&ve State" msgstr "حفظ الحالة" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "آمنة" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4524,6 +4698,9 @@ msgstr "آمنة" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "معدل العينة :" @@ -4581,12 +4758,12 @@ msgstr "8 حفظ حالة" msgid "Save State..." msgstr "حفظ حالة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "حفظ باسم" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "حفظ مضغوط GCM/ISO" @@ -4594,11 +4771,11 @@ msgstr "حفظ مضغوط GCM/ISO" msgid "Save current perspective" msgstr "حفظ المنظور الحالي" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "حفظ الضغط GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -4609,6 +4786,7 @@ msgid "Scaled EFB Copy" <<<<<<< HEAD msgstr "EFB Copia a escala" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 <<<<<<< HEAD ======= @@ -4621,15 +4799,18 @@ msgstr "EFB Copia a escala" >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "فحص %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "بحث ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "فحص" @@ -4645,12 +4826,12 @@ msgstr "انتقل تأمين" msgid "Search Filter" msgstr "بحث فلتر" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 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:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "" @@ -4660,6 +4841,7 @@ msgstr "" msgid "Select" msgstr "حدد" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4684,6 +4866,14 @@ msgstr "اختر ملف تسجيل" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "اختر ملف تسجيل" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "لتثبيت wad حدد ملف" @@ -4709,16 +4899,21 @@ msgstr "اختر النوافذ العائمة" msgid "Select the file to load" msgstr "حدد الملف لتحميل" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "حدد حفظ الملف" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "حدد حالة التحميل" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 @@ -4738,6 +4933,9 @@ msgstr "حدد حالة التحميل" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "حدد حالة الحفظ" @@ -4759,7 +4957,7 @@ msgstr "" "\n" "إذاغير متأكد حدد التلقائي." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "تحديد الخط" @@ -4807,11 +5005,11 @@ msgstr "موضع الاستشعار:" msgid "Separator" msgstr "الفاصل" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Serbian" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "المنفذ التسلسلي 1 -- وهذا هو المنفذ الذي الأجهزة مثل استخدام محول شبكة" @@ -4820,11 +5018,11 @@ msgstr "المنفذ التسلسلي 1 -- وهذا هو المنفذ الذي msgid "Set" msgstr "ضبط" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "تعيين كافتراضي ايزو" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "تعيين كافتراضي بطاقة الذاكرة %c" @@ -4834,7 +5032,7 @@ msgstr "تعيين كافتراضي بطاقة الذاكرة %c" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "إعدادات" @@ -4846,7 +5044,7 @@ msgstr "SetupWiiMem: الإعداد غير قادر على إيجاد ملف" msgid "Shake" msgstr "هزة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "الاسم المختصر :" @@ -4874,7 +5072,7 @@ msgstr "أظهر شريط الأدوات" msgid "Show Drives" msgstr "اظهر محرك الاقراص" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "إظهار نسخة الصادرات للمناطق" @@ -4890,7 +5088,7 @@ msgstr "فرنسا" msgid "Show GameCube" msgstr "جيم كيوب" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "إظهار مدخلات العرض" @@ -4906,7 +5104,7 @@ msgstr "اليابان" msgid "Show Korea" msgstr "كوريا" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "أظهر اللغة :" @@ -4926,7 +5124,7 @@ msgstr "عرض الاجهزه" msgid "Show Regions" msgstr "إظهار المناطق" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "إظهار الإحصاءات" @@ -4946,11 +5144,11 @@ msgstr "Wad اظهار" msgid "Show Wii" msgstr "الوي" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "ظهور رسالة قبل وقف اللعبة." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 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 " @@ -4960,23 +5158,23 @@ msgstr "" "يمكن تجنب تعطيل هذه الرسائل المزعجة ، ولكنه يمكن تعني أيضا أن دولفين يتعطل " "فجأة دون أي تفسير على الإطلاق." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "إظهار اول كتلة" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "إظهار كتل حفظ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "إظهار حفظ التعليقات" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "إظهار أيقونة الحفظ " -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "إظهارعنوان الحفظ " @@ -5013,7 +5211,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "ويموت جانبي" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Simplified Chinese" @@ -5021,11 +5219,11 @@ msgstr "Simplified Chinese" msgid "Size" msgstr "الحجم" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "تخطي البيوس" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "" @@ -5066,11 +5264,11 @@ msgstr "" msgid "Slot %i" msgstr "فتحة %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "A خانة " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "B خانة " @@ -5093,7 +5291,7 @@ msgstr "" "انها مفيدة فقط لأغراض التصحيح.\n" "هل حقا تريد تمكين تقديم البرامج؟ إذا لم تكن متأكدا، اختر 'لا'.." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "إعدادات الصوت" @@ -5111,6 +5309,7 @@ msgstr "فشل إنشاء المخزن المؤقت الصوت : %s" msgid "Space" msgstr "مجال" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5126,6 +5325,11 @@ msgstr "مجال" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Spanish" @@ -5157,7 +5361,7 @@ msgstr "" msgid "Specify a video backend" msgstr "حدد الخلفية ملف فيديو" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "تسريع معدل نقل القرص" @@ -5165,7 +5369,7 @@ msgstr "تسريع معدل نقل القرص" msgid "Square Stick" msgstr "مربع العصا" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "وحدة تحكم القياسية" @@ -5263,12 +5467,12 @@ msgstr "استيرادها بنجاح حفظ الملفات" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "نظام اللغة :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "تايوان" @@ -5307,7 +5511,7 @@ msgstr "الجدول الأيمن" msgid "Take Screenshot" msgstr "اخذ لقطه من الشاشه" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" <<<<<<< HEAD msgstr "" @@ -5348,7 +5552,7 @@ msgstr "" msgstr "Texture Cache" >>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "" @@ -5364,13 +5568,13 @@ msgstr "عنوان غير صالح" msgid "The checksum was successfully fixed" msgstr "تم إصلاح بنجاح الاختباري" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "الدليل المختار هو بالفعل في قائمة" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5392,7 +5596,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "الملف %s بالفعل مفتوح، لن الملف غير عنوان مكتوب." -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "لا وجود له (%s) الملف الذي حددته" @@ -5410,11 +5614,12 @@ msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#, fuzzy msgid "" "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." +"If unsure, use the rightmost value." msgstr "" "أكثر أمانا ضبط هذا، فإن على الأرجح أقل المضاهاة تكون مفقودة أي تحديثات " "الملمس من ذاكرة الوصول العشوائي.\n" @@ -5457,7 +5662,7 @@ msgstr "" msgid "The value is invalid" msgstr "قيمة غير صالحة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "ثيم" @@ -5465,13 +5670,13 @@ msgstr "ثيم" msgid "Theme selection went wrong" msgstr "اختيار ثيم خاظئ" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5483,7 +5688,7 @@ msgid "" "Replay itself." msgstr "هذه المحاكاة إعادة العمل لا تدعم تعديل الرموز التي اعادتها العمل نفسه." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "هذا يمكن أن يسبب بطء في القائمة لوى وبعض الألعاب." @@ -5507,24 +5712,10 @@ msgstr "" "إذا لم تكن متأكدا اترك هذا غير محددة." #: 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" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" -"يستخدم هذا للسيطرة على سرعة اللعبة خنق الصوت.\n" -"يؤدي تعطيل هذا غير عادية يمكن أن يسبب سرعة اللعبة ، مثل سريع جدا.\n" -"لكن في بعض الأحيان يمكن أن يسبب تمكين هذا الضجيج المستمر.\n" -"\n" -"اختصار : اضغط باستمرار على الفور لتعطيل الخنق في لوحة المفاتيح." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr " BGM هذا وتستخدم لتشغيل مسارات الموسيقى ، مثل." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5532,7 +5723,7 @@ msgid "" "cause occasional crashes/glitches." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "هذا تسمح لك التعديل اليدوي رسائل كتبها هذا المؤلف ملف التكوين" @@ -5555,7 +5746,7 @@ msgstr "العنوان" msgid "To" msgstr "إلى" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "تبديل جميع أنواع السجل" @@ -5575,6 +5766,7 @@ msgstr "اللعب بالشاشة كاملة" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5582,14 +5774,17 @@ msgstr "اللعب بالشاشة كاملة" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "أعلى" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Traditional Chinese" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "حاول تحميل نوع ملف غير معروف." @@ -5597,7 +5792,7 @@ msgstr "حاول تحميل نوع ملف غير معروف." msgid "Triggers" msgstr "Triggers" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "محاولة قراءة من SYSCONF غير صالحة" @@ -5607,7 +5802,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Turkish" @@ -5628,11 +5823,11 @@ msgstr "UDP منفذ :" msgid "UDP Wiimote" msgstr "UDP Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "غير معروف" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "امريكا" @@ -5717,7 +5912,7 @@ msgstr "التحديث" msgid "Upright Wiimote" msgstr "ويموت مستقيم" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "(PAL60) استخدم وضع " @@ -5729,7 +5924,7 @@ msgstr "استخدام شاشة كاملة" msgid "Use Hex" msgstr "استخدام الهيكس" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "" @@ -5760,7 +5955,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "فائدة" @@ -5784,25 +5979,29 @@ msgstr "القيمة:" msgid "Verbosity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "فديو" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "الظاهري" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "الصوت" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "خطأ في إنشاء wad: فشل التثبيت %s" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "خطأ في إنشاء wad: فشل التثبيت %s" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5821,15 +6020,15 @@ msgstr "" msgid "Warning" msgstr "التنبيه" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "تحذير -- ايزو ابتداء من الخطأ وضع وحدة التحكم!" @@ -5895,7 +6094,7 @@ msgstr "" ======= >>>>>>> Update Arabic and Japanese translations. -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5903,7 +6102,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5911,7 +6110,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5939,7 +6138,7 @@ msgstr "" msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "شاشة واسعة هاك" @@ -5947,15 +6146,15 @@ msgstr "شاشة واسعة هاك" msgid "Width" msgstr "عرض" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "الوي" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "جهاز الوي" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Wii NAND Root:" @@ -5963,6 +6162,7 @@ msgstr "Wii NAND Root:" msgid "Wii Save Import" msgstr "استيراد حفظ الوي" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5972,6 +6172,9 @@ msgstr "استيراد حفظ الوي" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "ملفات حفظ الوي (*.bin)|*.bin" @@ -6038,10 +6241,11 @@ msgstr "نوافذ القائمة" msgid "Windows Right" msgstr "نوافذ اليمين" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "كلمة ختامية" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -6057,6 +6261,11 @@ msgstr "كلمة ختامية" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "العمل" @@ -6064,6 +6273,11 @@ msgstr "العمل" msgid "Write to Console" msgstr "الكتابة إلى وحدة التحكم" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "الكتابة على الملف" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "الكتابة على الملف" @@ -6117,7 +6331,7 @@ msgstr "يجب إدخال صالح العشري، أو الست عشرية قي msgid "You must enter a valid profile name." msgstr "يجب إدخال اسم الملف صالح." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "يجب إعادة تشغيل دولفين من أجل التغيير نافذ المفعول." @@ -6138,7 +6352,7 @@ msgstr "" "يجب أن يكون 0x%04x (but is 0x%04llx)\n" "هل تريد إنشاء واحدة جديدة?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "ZTP هاك" @@ -6208,7 +6422,7 @@ msgstr "" msgid "^ ADD" msgstr "^أضف " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -6239,12 +6453,12 @@ msgstr "ليس حفظ الوي أو قراءة فشلة لحجم عنوان ا msgid "s" msgstr "s" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "أمر غير معروف 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute returned -1 on application run!" @@ -6486,6 +6700,9 @@ msgstr "أو" #~ msgid "Emulator Display Settings" #~ msgstr "إعدادات العرض " +#~ msgid "Enable Audio Throttle" +#~ msgstr "Enable Audio Throttle" + #~ msgid "Enable CPU Access" #~ msgstr "CPU Access تمكين" @@ -6877,6 +7094,19 @@ msgstr "أو" #~ msgid "The file " #~ msgstr "El archivo " +#~ msgid "" +#~ "This is used to control game speed by sound throttle.\n" +#~ "Disabling this could cause abnormal game speed, such as too fast.\n" +#~ "But sometimes enabling this could cause constant noise.\n" +#~ "\n" +#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." +#~ msgstr "" +#~ "يستخدم هذا للسيطرة على سرعة اللعبة خنق الصوت.\n" +#~ "يؤدي تعطيل هذا غير عادية يمكن أن يسبب سرعة اللعبة ، مثل سريع جدا.\n" +#~ "لكن في بعض الأحيان يمكن أن يسبب تمكين هذا الضجيج المستمر.\n" +#~ "\n" +#~ "اختصار : اضغط باستمرار على الفور لتعطيل الخنق في لوحة المفاتيح." + #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "Esto es usado comunmente para reproducir voces y efectos de sonido." diff --git a/Languages/po/ca.po b/Languages/po/ca.po index e7664edac1..2cdcaf6800 100644 --- a/Languages/po/ca.po +++ b/Languages/po/ca.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -16,6 +17,9 @@ msgstr "" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Update from master branch. +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-08-19 08:36-0500\n" "Last-Translator: Jordi Coma \n" "Language-Team: Catalan \n" @@ -63,9 +67,9 @@ msgstr "\"%s\" no és un fitxer GCM/ISO valid, o no és una ISO GC/Wii." msgid "%1$sCopy%1$s" msgstr "%1$sCopia%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -162,7 +166,7 @@ msgstr "%sExportar com a GCI%s" msgid "%sImport GCI%s" msgstr "%sImportar GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u blocs lliures; %u Entrades Lliures" @@ -195,11 +199,11 @@ msgstr "Gestor de &Trucs" msgid "&DSP Settings" msgstr "Configuració de &DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&Eliminar ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&EliminarISOs seleccionades ..." @@ -263,7 +267,7 @@ msgstr "&Pausa" msgid "&Play" msgstr "&Executar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&Propietats" @@ -307,7 +311,7 @@ msgstr "&Visualitza" msgid "&Wiimote Settings" msgstr "Configuració «&Wiimote»" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "&Wiki" @@ -351,7 +355,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -360,7 +364,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -417,13 +421,13 @@ msgstr "" "\n" "Vostè ha d'enviar el port TCP per rebre!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "AM-placa base" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "Codis AR " @@ -435,11 +439,11 @@ msgstr "Sobre Dolphin" msgid "Acceleration" msgstr "Acceleració" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "Precisió:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Emulació acurada de Vbeam" @@ -560,11 +564,11 @@ msgstr "Adaptador:" msgid "Add" msgstr "Afegeix" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "Afegeix codi ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "Afegeix Pegat" @@ -572,6 +576,7 @@ msgstr "Afegeix Pegat" msgid "Add new pane" msgstr "Afegeix un nou panell" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -587,6 +592,11 @@ msgstr "Afegeix un nou panell" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Afegir ..." @@ -634,11 +644,11 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "Ajustar la pressió de control analògic per activar els botons." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "Avançada" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Configuració avançada" @@ -646,14 +656,15 @@ msgstr "Configuració avançada" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Tots els arxius GC / Wii (elf, dol, gcm, iso, ciso, GCZ, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Totes les imatges GC / Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "Tots els fitxers GameCube GCM (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -666,18 +677,22 @@ msgstr "Tots els fitxers GameCube GCM (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Tots els Estats (savi, s##\")" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "Tots els fitxers ISO Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Tots els fitxers ISO comprimits de GC o Wii (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "Tots els fitxers (*.*)|*.*" @@ -693,7 +708,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "Wiimote emulat" @@ -714,7 +729,7 @@ msgstr "«Apploader» té una mida dolenta ...realment és un «apploader»?" msgid "Apploader unable to load from file" msgstr "«Apploader» no ha pogut carregar des de l'arxiu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Apploader:" @@ -732,7 +747,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat (off)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Àrab" @@ -741,7 +756,7 @@ msgstr "Àrab" msgid "Are you sure you want to delete \"%s\"?" msgstr "Esteu segur que voleu suprimir \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -749,11 +764,12 @@ msgstr "" "Esteu segur que voleu eliminar aquests arxius? \n" "No es podran recuperar mai més!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 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 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -763,6 +779,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Relació d'aspecte:" @@ -771,18 +790,20 @@ msgstr "Relació d'aspecte:" msgid "At least one pane must remain open." msgstr "Almenys un panell ha de romandre obert." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Àudio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Suport d'àudio:" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error en obrir el dispositiu AO \n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -792,6 +813,9 @@ msgstr "AudioCommon: Error en obrir el dispositiu AO \n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -835,7 +859,7 @@ msgstr "" msgid "Back" msgstr "Tornar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Configuració del Suport" @@ -862,11 +886,11 @@ msgstr "Mala capçalera a l'arxiu" msgid "Banner" msgstr "Imatge" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "Detalls del Imatge" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "Imatge:" @@ -878,7 +902,7 @@ msgstr "Barra" msgid "Basic" msgstr "Bàsic" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Configuració bàsica" @@ -909,6 +933,7 @@ msgstr "Blau dret" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -916,6 +941,9 @@ msgstr "Blau dret" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Abaix" @@ -924,7 +952,7 @@ msgstr "Abaix" msgid "Bound Controls: %lu" msgstr "Controls enllaçats: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Trencat" @@ -940,7 +968,7 @@ msgstr "Examineu un directori per afegir" msgid "Browse for an ISO directory..." msgstr "Examineu un directori ISO ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "Examineu el directori de sortida" @@ -970,11 +998,11 @@ msgstr "Palanca-C" msgid "C-Stick" msgstr "Palanca-C" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "Motor d'emulació de CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "Llistes de memòria cau de pantalla" @@ -1037,7 +1065,7 @@ msgstr "No es pot obrir% s" msgid "Cannot unregister events with events pending" msgstr "No es pot des-registrar esdeveniments amb esdeveniments pendents" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1048,7 +1076,7 @@ msgstr "" "%s\n" "No és un arxiu de targeta de memòria gamecube vàlid." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1066,8 +1094,6 @@ msgstr "No es pot trobar WiiMote per bd: %02x:%02x:%02x:%02x:%02x:%02x" msgid "Cant find WiiMote by connection handle %02x" msgstr "No es pot trobar l'identificador de connexió WiiMote %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1077,7 +1103,7 @@ msgstr "No es pot llegir des del connector DVD - Interfície DVD: Error greu" msgid "Caps Lock" msgstr "Bloc Maj." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "Català" @@ -1102,7 +1128,7 @@ msgstr "Canviar Disc" msgid "Change Game" msgstr "Canvi de joc" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1118,8 +1144,8 @@ msgstr "Canvia el signe del paràmetre zLluny (després de correcció)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Canvia el signe del paràmetre zAprop (després de correcció)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "Canviar això no tindrà cap efecte mentre l'emulador s'executa!" @@ -1139,31 +1165,31 @@ msgstr "Cerca trucs" msgid "Cheats Manager" msgstr "Administrador de trucs" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Xinès (simplificat)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Xinès (tradicional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "Tria un directori arrel del DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "Tria el directori arrel del NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Triar una ISO per defecte:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "Trieu un directori per afegir" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Trieu un arxiu per obrir" @@ -1171,7 +1197,7 @@ msgstr "Trieu un arxiu per obrir" msgid "Choose a memory card:" msgstr "Triar una targeta de memòria:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1179,8 +1205,8 @@ msgstr "" "Trieu l'arxiu a utilitzar com «apploader»: (s'aplica als discos construïts a " "partir de només els directoris)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Seleccioneu la carpeta on extreure" @@ -1192,14 +1218,14 @@ msgstr "Palanca Cercle" msgid "Classic" msgstr "Clàssic" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "Esborrar" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "Fallada a l'esborrar." @@ -1215,6 +1241,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 @@ -1223,6 +1250,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Tancar" @@ -1246,20 +1277,20 @@ msgstr "Comanda" msgid "Comment" msgstr "Comentari" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Comentari:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "Comprimir ISO ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Comprimir ISOs seleccionades ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "Comprimeix ISO" @@ -1286,13 +1317,13 @@ msgstr "Configurar Control" msgid "Configure..." msgstr "Configuració..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "Confirmar contraescriptura del fitxer" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "Confirmar a l'aturar" @@ -1301,7 +1332,7 @@ msgstr "Confirmar a l'aturar" msgid "Connect" msgstr "Connectar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "Connectar el teclat USB" @@ -1358,12 +1389,12 @@ msgstr "Convertir a GCI" msgid "Copy failed" msgstr "Copia fallada" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "Copiar a la targeta de memòria %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "Nucli" @@ -1393,7 +1424,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "No es pot reconèixer el fitxer ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "No s'ha pogut desar %s" @@ -1407,7 +1438,7 @@ msgstr "" "executant actualment! \n" "(Configurar els controls mentre el joc s'executa no està actualment suportat)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1420,7 +1451,7 @@ msgstr "" "Esteu executant Dolphin des d'un CD / DVD, o l'arxiu de targeta de memòria " "està protegit contra escriptura?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "No s'ha trobat la comanda d'obertura per l'extensió 'ini'!" @@ -1437,7 +1468,7 @@ msgstr "" msgid "Count:" msgstr "Compta:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "País:" @@ -1451,25 +1482,25 @@ msgstr "Crear Codi AR" msgid "Create new perspective" msgstr "Crear una nova perspectiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "Creat per KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Creat per Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "Creat per VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "Creat per black_rider i publicat en ForumW.org > Web Developments" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "Creador:" @@ -1477,7 +1508,7 @@ msgstr "Creador:" msgid "Critical" msgstr "Crític" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "Retallar" @@ -1500,7 +1531,7 @@ msgstr "Atenuar" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "El directori actual ha canviat de %s a %s després de wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "Projecció personalitzada" @@ -1508,11 +1539,11 @@ msgstr "Projecció personalitzada" msgid "Custom Projection Hack Settings" msgstr "Configuració de la projecció personalitzada" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "Configuració d'alguns paràmetres de projecció Ortogràfica." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Txec" @@ -1524,10 +1555,11 @@ msgstr "Direcció digital" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "Motor d'emulació DSP" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1538,18 +1570,22 @@ msgstr "Motor d'emulació DSP" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulació DSP HLE (ràpid)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "Intèrpret DSP LLE (lent)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "DSP LLE al fil d'execució" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "Recompilador DSP LLE " @@ -1557,15 +1593,23 @@ msgstr "Recompilador DSP LLE " msgid "DSP settings" msgstr "Configuració DSP " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "Arrel del DVD:" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "Mida de dades" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "Data:" @@ -1586,7 +1630,7 @@ msgstr "Zona morta" msgid "Debug" msgstr "Depuració" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "Depuració" @@ -1594,16 +1638,16 @@ msgstr "Depuració" msgid "Decimal" msgstr "Decimals" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "Descomprimir ISO ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "Descomprimir ISO seleccionades..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "Descomprimint ISO" @@ -1611,11 +1655,11 @@ msgstr "Descomprimint ISO" msgid "Default" msgstr "Per defecte" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "ISO per defecte:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "Font per defecte" @@ -1624,7 +1668,7 @@ msgstr "Font per defecte" msgid "Delete" msgstr "Eliminar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "Eliminar partida desada" @@ -1633,7 +1677,7 @@ msgstr "Eliminar partida desada" msgid "Delete the existing file '%s'?" msgstr "Eliminar el fitxer existent '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "Descripció" @@ -1641,8 +1685,8 @@ msgstr "Descripció" msgid "Detect" msgstr "Detectar" -#: 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 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." @@ -1654,8 +1698,8 @@ msgstr "" msgid "Device" msgstr "Dispositiu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Configuració del dispositiu" @@ -1680,23 +1724,23 @@ msgstr "" "i també ha fallat la comprovació de la suma de la copia del directory" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "Deshabilitar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "Deshabilitar boira" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "Deshabilitar l'il·luminació" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "Deshabilitar la profunditat per-pixel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "Deshabilitar Textures" @@ -1741,7 +1785,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Disc" @@ -1768,6 +1812,7 @@ msgstr "" msgid "Divide" msgstr "Divideix" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1777,10 +1822,13 @@ msgstr "Divideix" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Voleu aturar l'emulació actual?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1805,6 +1853,7 @@ msgstr "Configuració de Wiimote emulat" msgid "Dolphin FIFO" msgstr "FIFO Dolphin" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1829,6 +1878,14 @@ msgstr "Configuració del control GC Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Configuració del control GC Dolphin" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin Pel·lícules TAS (*.dtm)" @@ -1861,11 +1918,11 @@ msgstr "" msgid "Down" msgstr "Avall" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "Descarregar Codis (base de dades WiiRD)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Descarregat %lu codis. (Afegits %lu)" @@ -1874,23 +1931,23 @@ msgstr "Descarregat %lu codis. (Afegits %lu)" msgid "Drums" msgstr "Tambors" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "Maniquí" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "Bolcat d'àudio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "Bolcat de destinació EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "Bolcat d'imatges" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "Bolcat de textures" @@ -1925,6 +1982,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1940,6 +1998,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Holandès" @@ -1964,7 +2027,7 @@ msgstr "" "Dolphin, probablement és necessari reiniciar el Windows per veure el nou " "controlador." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "EUROPA" @@ -1980,7 +2043,7 @@ msgstr "Edita" msgid "Edit ActionReplay Code" msgstr "Modificar codi ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Modificar configuració" @@ -1992,8 +2055,8 @@ msgstr "Modificar el pagat" msgid "Edit current perspective" msgstr "Modificar perspectiva actual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "Modificació ..." @@ -2043,7 +2106,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Wiimote emulat" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "Estat d'emulació:" @@ -2072,23 +2135,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "Habilitar el registre de logs d'AR" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "Habilitar la regulació de so" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "Habilitar les millors tècniques disponibles" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Habilitar fusió de Bloc" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -2101,6 +2164,7 @@ msgstr "" msgid "Enable Cache" msgstr "Habilitar memòria cau" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2110,51 +2174,54 @@ msgstr "Habilitar memòria cau" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Activar Trucs" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "Habilitar Música DTK" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Habilitar Doble nucli" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Habilitar Doble nucli (acceleració)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "Activar tecles d'accés ràpid" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Habilitar salt d'inactiu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Habilitar salt d'inactiu (acceleració)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Habilitar MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "Habilitar exploració &Progressiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "Habilitar el protector de pantalla" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "Habilitar pantalla panoràmica" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "Habilitar malla" @@ -2170,7 +2237,7 @@ msgstr "" "Millora la qualitat visual de les textures que es troben en un angle de " "visió obliqua." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2178,7 +2245,7 @@ msgstr "" "Habilitar l'accés al disc ràpid. Necessari per a alguns jocs. (Activat = " "ràpid, Desactivat = Compatible)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "Habilitar pàgines" @@ -2206,7 +2273,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2214,7 +2281,7 @@ msgstr "" "Activi aquesta opció per accelerar The Legend of Zelda: Twilight Princess. " "Deshabilitar per a qualsevol altre joc." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2224,7 +2291,7 @@ msgstr "" "Gestió de memòria. Precisa en el maquinari, però lent per emular. " "(Activat=compatible, Desactivat = ràpid)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "Activa la modificació personalitzada de projecció" @@ -2240,7 +2307,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2262,6 +2329,7 @@ msgstr "" msgid "End" msgstr "Fi" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2277,6 +2345,11 @@ msgstr "Fi" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Anglès" @@ -2307,6 +2380,7 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Error" @@ -2337,20 +2411,26 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "Error" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "Error en carregar l'idioma seleccionat. Es retorna a l'idioma per defecte " "del sistema." -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, 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 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2385,7 +2465,7 @@ msgstr "Sortir de Dolphin amb emulador" msgid "Export Failed" msgstr "Fallada d'exportació" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "Exportar fitxer" @@ -2398,15 +2478,15 @@ msgstr "Exportar gravació" msgid "Export Recording..." msgstr "Exportar gravació ..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "Exportar partida desada" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "Exportar partida desada Wii (Experimental)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "Exportar totes les partides desades" @@ -2422,7 +2502,7 @@ msgstr "Desar exportació com a..." msgid "Extension" msgstr "Extensió" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "Memòria cau d'imatge externa" @@ -2434,44 +2514,44 @@ msgstr "Paràmetre addicional" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Paràmetre addicional útil només a ''Metroid: Other M''." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "Extreure tots els arxius ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "Extreure «Apploader» ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "Extreure DOL ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "Extreure del repertori ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "Extreure arxiu ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "Extreure partició ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "Extraient %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "Extreure tots els arxius" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "Extraient Directori" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "Extraient ..." @@ -2483,11 +2563,11 @@ msgstr "Byte FIFO" msgid "FIFO Player" msgstr "Jugador FIFO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "FRANÇA" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "Mida FST:" @@ -2499,11 +2579,11 @@ msgstr "Error al connectar!" msgid "Failed to Listen!!" msgstr "Error a l'escoltar!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "Error al descarregar codis." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Error a l' extreure a %s!" @@ -2620,18 +2700,28 @@ msgstr "No s'ha pogut escriure la capçalera per %s" msgid "Failed to write header for file %d" msgstr "No s'ha pogut escriure la capçalera pel fitxer% d" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "Ràpid" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "Mipmaps ràpids" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "Versió ràpida de la MMU. No funciona per a tots els jocs." +#: Source/Core/Core/Src/Movie.cpp:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "Jugador fifo" @@ -2640,7 +2730,7 @@ msgstr "Jugador fifo" msgid "File Info" msgstr "informació del fitxer" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "L'arxiu no conté codis." @@ -2673,16 +2763,16 @@ msgstr "L'arxiu no es pot reconèixer com una targeta de memòria" msgid "File not compressed" msgstr "Arxiu no comprimit" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Mode d'obertura desconegut: 0x% 02x " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "Sistema d'arxius" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "'ini' Tipus de fitxer és desconegut! no s'obre!" @@ -2690,7 +2780,7 @@ msgstr "'ini' Tipus de fitxer és desconegut! no s'obre!" msgid "First Block" msgstr "Primer Bloc" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "Arregla les sumes de comprovació" @@ -2702,7 +2792,7 @@ msgstr "Forçar 16:9" msgid "Force 4:3" msgstr "Forçar 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "Força la consola com NTSC-J" @@ -2735,7 +2825,7 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2771,7 +2861,7 @@ msgstr "Imatge" msgid "Frame Advance" msgstr "Avançar imatges" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "Bolcat d'imatges utilitzant FFV1" @@ -2783,7 +2873,7 @@ msgstr "Rang d'imatges" msgid "Frame S&kipping" msgstr "Salta imatge&s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Limit d'imatges/s:" @@ -2791,10 +2881,11 @@ msgstr "Limit d'imatges/s:" msgid "Frames To Record" msgstr "Imatges a Enregistrar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "Visió lliure" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2810,6 +2901,11 @@ msgstr "Visió lliure" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Francès" @@ -2843,7 +2939,7 @@ msgstr "Configuració de gràfics" msgid "GCPad" msgstr "Control GC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "ID del Joc:" @@ -2859,15 +2955,15 @@ msgstr "El joc no està funcionant!" msgid "Game not found!!" msgstr "Joc no trobat!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "Configuració de jocs específics" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Configuració de joc" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" @@ -2878,6 +2974,7 @@ msgstr "Configuració control «&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 @@ -2885,6 +2982,9 @@ msgstr "Configuració control «&Gamecube»" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Targetes de memòria per GameCube (*.raw, *.gcp)" @@ -2893,15 +2993,17 @@ msgid "Gamecube Pad settings" msgstr "Configuració control Gamecube" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Codis Gecko" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" "Codi Gecko ha fallat a executar (CT%i CST%i) (%s) \n" "(Pot ser un codi incorrecte o el tipus de codi encara no està suportat.)" @@ -2910,6 +3012,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 @@ -2918,6 +3021,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "General" @@ -2926,6 +3032,7 @@ msgstr "General" msgid "General Settings" msgstr "Configuració General" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2941,6 +3048,11 @@ msgstr "Configuració General" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Alemany" @@ -2981,7 +3093,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Grec" @@ -3013,7 +3125,7 @@ msgstr "Modificacions" msgid "Header checksum failed" msgstr "Comprovació de la checksum de capçalera ha fallat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Hebreu" @@ -3083,12 +3195,16 @@ msgstr "Tecla d'accés de configuració" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Tecles d'accés" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Hongarès" @@ -3096,14 +3212,14 @@ msgstr "Hongarès" msgid "Hybrid Wiimote" msgstr "Wiimote Híbrid" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS: Ha Tractat d'obtenir dades d'un bitllet desconegut:%08x/" "%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -3116,11 +3232,11 @@ msgstr "" "TitleID %016llx. \n" "Probablement Dolphin es penjarà ara." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - destinació dolenta" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "Configuració de IPL" @@ -3136,15 +3252,15 @@ msgstr "Punter IR" msgid "IR Sensitivity:" msgstr "Sensibilitat d'IR:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "Detalls d'ISO:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "Directoris ISO:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "ITÀLIA" @@ -3152,23 +3268,25 @@ msgstr "ITÀLIA" msgid "Icon" msgstr "Icona" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "Si el FPS és irregular, aquesta opció pot ser útil. (Activat = compatible, " "Desactivat = ràpid)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy 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." +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " +"Audio to throttle using the DSP (might fix audio clicks but can also cause " +"constant noise depending on the game)." msgstr "" "Si heu establert límit al nombre d'imatges per segon major que la velocitat " "del joc complet (NTSC: 60, PAL: 50), també cal deshabilitar la regulació de " @@ -3206,7 +3324,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "Desar importació" @@ -3257,7 +3375,7 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "En Joc" @@ -3266,7 +3384,7 @@ msgid "In-Game" msgstr "En-joc" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info" @@ -3286,7 +3404,7 @@ msgstr "Insereix" msgid "Insert Encrypted or Decrypted code here..." msgstr "Inseriu el codi xifrat o desxifrat aquí ..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Inserir la targeta SD" @@ -3298,7 +3416,7 @@ msgstr "Introduïu un nom aquí .." msgid "Install WAD" msgstr "Instal·lar WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Instal·lar al Menú de Wii" @@ -3309,6 +3427,7 @@ msgstr "" "InstallExceptionHandler cridat, però aquesta plataforma no està suportada " "encara." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3318,14 +3437,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Instal·lant WAD ..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "Interfície" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "Configuració d'interfície" @@ -3350,11 +3472,11 @@ msgstr "Error intern LZO - lzo_init () ha fallat" msgid "Internal Resolution:" msgstr "Resolució Interna:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Intèrpret (molt lent)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "Introducció" @@ -3371,7 +3493,7 @@ msgstr "Valor invàlid!" msgid "Invalid bat.map or dir entry" msgstr "Invàlid bat.map o entrada al directori" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "Tipus d'esdeveniment invàlid %i" @@ -3391,14 +3513,15 @@ msgstr "" "% s\n" "És possible que necessiti re-descarregar aquest joc." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "Enregistrament de fitxer invàlid" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "Estat invàlid" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3414,27 +3537,32 @@ msgstr "Estat invàlid" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italià" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "JAPÓ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "Recompilador JIT (recomanat)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "Recompilador JITIL experimental" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japonès" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "COREA" @@ -3443,8 +3571,8 @@ msgstr "COREA" msgid "Key" msgstr "Clau" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Corea" @@ -3462,7 +3590,7 @@ msgstr "Botó L" msgid "L-Analog" msgstr "L-Analògic" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "Idioma:" @@ -3515,7 +3643,7 @@ msgstr "" msgid "Less Than" msgstr "Menys de" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "Limitar per FPS " @@ -3523,7 +3651,7 @@ msgstr "Limitar per FPS " msgid "Load" msgstr "Carregar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "Carrega textures personalitzades" @@ -3571,6 +3699,7 @@ msgstr "Carregar ranura d'estat 8" msgid "Load State..." msgstr "Carregar Estat..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3592,6 +3721,13 @@ msgstr "Carregar el menú del sistema Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "Carregar el menú del sistema Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar menú del sistema Wii %d%c" @@ -3618,7 +3754,7 @@ msgstr "Carrega els fitxer especificats (DOL, ELF, GCM, ISO, WAD)" msgid "Local" msgstr "Local" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Bloca els fils d'execució als nuclis" @@ -3630,11 +3766,11 @@ msgstr "Registre Log" msgid "Log Configuration" msgstr "Configuració del registre Log" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Tipus de registre Log" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Sortides del registrador Log" @@ -3664,7 +3800,7 @@ msgstr "" "desajust MD5 \n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "Modificació de velocitat MMU" @@ -3686,11 +3822,11 @@ msgstr "Arxius MadCatz Gameshark (*.gcs)" msgid "Main Stick" msgstr "Palanca principal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "ID Fabricant:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "Fabricant:" @@ -3714,6 +3850,7 @@ msgstr "Byte de memòria" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3721,6 +3858,9 @@ msgstr "Byte de memòria" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Targeta de memòria" @@ -3758,7 +3898,7 @@ msgstr "" msgid "Menu" msgstr "Menú" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "Micròfon" @@ -3767,11 +3907,11 @@ msgstr "Micròfon" msgid "Min" msgstr "Mínim" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "Altres" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Altres Configuracions" @@ -3792,7 +3932,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "Fonts d'espiat simple" @@ -3805,7 +3945,7 @@ msgstr "Motion Plus®" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3828,7 +3968,7 @@ msgstr "" msgid "Multiply" msgstr "Múltiple" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3920,6 +4060,7 @@ msgstr "NP Tabulador" msgid "NP Up" msgstr "NP Amunt" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3929,6 +4070,9 @@ msgstr "NP Amunt" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3937,7 +4081,7 @@ msgstr "Nom:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Nom:" @@ -3951,7 +4095,7 @@ msgid "New Scan" msgstr "Nou escaneig" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "Pàgina següent" @@ -3963,7 +4107,7 @@ msgstr "Següent escaneig" msgid "Nickname :" msgstr "Sobrenom:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "No país (SDK)" @@ -4002,7 +4146,7 @@ msgstr "No s'ha trobat la carpeta de partides desades per el joc %s" msgid "None" msgstr "Cap" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Noruega Bokmaal" @@ -4010,8 +4154,8 @@ msgstr "Noruega Bokmaal" msgid "Not Equal" msgstr "No igual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "Sense establir" @@ -4031,7 +4175,7 @@ msgstr "No està connectat" msgid "Notes" msgstr "Notes" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "Notes:" @@ -4069,7 +4213,7 @@ msgstr "Objecte" msgid "Object Range" msgstr "Rang d'objecte" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Apagar" @@ -4095,11 +4239,11 @@ msgstr "Només queden %d blocs disponibles" msgid "Open" msgstr "Obrir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "Obrir directori &contingut" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "Obrir la carpeta de partide&s desades" @@ -4121,11 +4265,11 @@ msgstr "OpenAL: no es poden trobar dispositius de so" msgid "OpenAL: can't open device %s" msgstr "OpenAL: no es pot obrir el dispositiu %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "Descodificador de textura OpenCL" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "Activar descodificador de textura OpenMP" @@ -4157,7 +4301,7 @@ msgstr "" "i importeu les partides desades una targeta de memòria nova\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "Altres" @@ -4209,19 +4353,20 @@ msgstr "Paràgraf" msgid "Parameters" msgstr "Paràmetres" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partició %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Pegats" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Camins" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4234,6 +4379,10 @@ msgstr "Camins" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -4242,7 +4391,7 @@ msgstr "Pausa" msgid "Per-Pixel Lighting" msgstr "Il·luminació per píxel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Perfecte" @@ -4255,6 +4404,7 @@ msgstr "Perspectiva %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 ======= @@ -4265,6 +4415,10 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Executar" @@ -4278,7 +4432,7 @@ msgstr "Reproduir enregistrament" msgid "Play/Pause" msgstr "Reproduir/Pausa" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "Jugable" @@ -4290,6 +4444,7 @@ msgstr "Opcions de reproducció" msgid "Players" msgstr "Jugadors" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4299,6 +4454,9 @@ msgstr "Jugadors" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Confirmeu ..." @@ -4310,23 +4468,23 @@ msgstr "Creeu una perspectiva abans de desar" msgid "Plus-Minus" msgstr "Més-Menys" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Polonès" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Port 4" @@ -4335,11 +4493,11 @@ msgstr "Port 4" msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portuguès" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portuguès (Brasil)" @@ -4347,17 +4505,17 @@ msgstr "Portuguès (Brasil)" msgid "Post-Processing Effect:" msgstr "Efectes de post-procés:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4370,7 +4528,7 @@ msgstr "Preestablerts:" msgid "Prev Page" msgstr "Pàgina anterior" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "Pàgina anterior" @@ -4421,7 +4579,7 @@ msgstr "R-Analògic" msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "RÚSSIA" @@ -4434,7 +4592,7 @@ msgstr "Rang" msgid "Read-only mode" msgstr "Només lectura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "Real" @@ -4510,6 +4668,7 @@ msgstr "Actualitzar llista" msgid "Refresh game list" msgstr "Actualitza la llista de jocs" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4528,6 +4687,12 @@ msgstr "Actualitza la llista de jocs" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Treure" @@ -4580,11 +4745,11 @@ msgstr "Palanca dreta" msgid "Rumble" msgstr "Vibració" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Executar DSP LLE en un fil d'execució dedicat (no recomanat)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Rússia" @@ -4592,10 +4757,11 @@ msgstr "Rússia" msgid "Sa&ve State" msgstr "&Desa l'estat" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "Segur" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4605,6 +4771,9 @@ msgstr "Segur" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Freqüència de mostreig:" @@ -4662,12 +4831,12 @@ msgstr "Desar ranura estat 8" msgid "Save State..." msgstr "Desar Estat ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Desar com ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Desar GCM/ISO comprimit" @@ -4675,11 +4844,11 @@ msgstr "Desar GCM/ISO comprimit" msgid "Save current perspective" msgstr "Desar perspectiva actual" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "Desar GCM/ISO descomprimit" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "La pal·lícula guardada %s és corrupta, s'atura la gravació..." @@ -4688,6 +4857,7 @@ msgstr "La pal·lícula guardada %s és corrupta, s'atura la gravació..." msgid "Scaled EFB Copy" msgstr "Copia EFB escalada" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4697,15 +4867,18 @@ msgstr "Copia EFB escalada" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Escanejant %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "Cercant ISOs" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "Cercant ..." @@ -4721,12 +4894,12 @@ msgstr "Bloc desplaçament" msgid "Search Filter" msgstr "Filtre de cerca" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Cercar en subcarpetes" -#: 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:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "La secció %s no trobada a SYSCONF" @@ -4736,6 +4909,7 @@ msgstr "La secció %s no trobada a SYSCONF" msgid "Select" msgstr "Seleccionar" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4760,6 +4934,14 @@ msgstr "Seleccionar el fitxer de gravació" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Seleccionar el fitxer de gravació" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Seleccionar un fitxer WAD de Wii per instal·lar" @@ -4784,6 +4966,7 @@ msgstr "Seleccioneu finestres flotants" msgid "Select the file to load" msgstr "Seleccioneu el fitxer a carregar" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 @@ -4800,19 +4983,26 @@ msgstr "Seleccioneu l'estat a carregar" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Seleccioneu el fitxer de partida desada" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Seleccioneu l'estat a carregar" +<<<<<<< HEAD <<<<<<< 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. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Seleccioneu l'estat a desar" @@ -4834,7 +5024,7 @@ msgstr "" "\n" "Si no n'esteu segurs, seleccioneu Automàtic" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Font seleccionada" @@ -4882,11 +5072,11 @@ msgstr "Barra de sensors de posició" msgid "Separator" msgstr "Separador" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Serbi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4897,11 +5087,11 @@ msgstr "" msgid "Set" msgstr "Definir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "Definir la imatge ISO per &defecte" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "Definir com a targeta de memòria predeterminada %c" @@ -4913,7 +5103,7 @@ msgstr "" "SetARCode_IsActive: L'índex és major que la grandària de la llista de codis " "AR %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "Configuració ..." @@ -4925,7 +5115,7 @@ msgstr "SetupWiiMem: No es troba el fitxer de configuració" msgid "Shake" msgstr "Sacsejar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "Nom curt:" @@ -4953,7 +5143,7 @@ msgstr "Mostrar Barra d'&eines" msgid "Show Drives" msgstr "Mostrar unitats" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "Mostrar regions de copia EFB" @@ -4969,7 +5159,7 @@ msgstr "Mostrar França" msgid "Show GameCube" msgstr "Mostrar GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "Mostrar entrada" @@ -4985,7 +5175,7 @@ msgstr "Mostrar Japó" msgid "Show Korea" msgstr "Mostrar Corea" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "Mostrar Idioma:" @@ -5005,7 +5195,7 @@ msgstr "Mostrar Plataformes" msgid "Show Regions" msgstr "Mostrar Regions" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "Mostrar estadístiques" @@ -5025,11 +5215,11 @@ msgstr "Mostrar Wad" msgid "Show Wii" msgstr "Mostrar Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "Mostrar un missatge de confirmació abans d'aturar el joc." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 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 " @@ -5039,23 +5229,23 @@ msgstr "" "Deshabilitar d'això pot evitar els missatges molestos i no crítics, però " "també pot significar que Dolphin de sobte es pengi sense cap explicació." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "Mostra primer bloc" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "Mostra blocs de partida desada" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "Mostra desar un comentari" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "Mostra icona de desar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "Mostra títol desat" @@ -5093,7 +5283,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Wiimote horitzontal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Xinès simplificat" @@ -5101,11 +5291,11 @@ msgstr "Xinès simplificat" msgid "Size" msgstr "Mida" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "Saltar BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "Salta pas Dest. Alpha" @@ -5148,11 +5338,11 @@ msgstr "" msgid "Slot %i" msgstr "Ranura %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Ranura A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Ranura B" @@ -5177,7 +5367,7 @@ msgstr "" "Realment voleu activar el renderitzat per software? Si no n'esteu segurs, " "seleccioneu 'No'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "Configuració de so" @@ -5195,6 +5385,7 @@ msgstr "Ha fallat la creació del buffer de so: %s" msgid "Space" msgstr "Espai" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5210,6 +5401,11 @@ msgstr "Espai" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Espanyol" @@ -5242,7 +5438,7 @@ msgstr "" msgid "Specify a video backend" msgstr "Especifiqueu un suport de vídeo." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Accelerar la tassa de transferència de Disc" @@ -5250,7 +5446,7 @@ msgstr "Accelerar la tassa de transferència de Disc" msgid "Square Stick" msgstr "Palanca quadrada" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "Control estàndard" @@ -5348,12 +5544,12 @@ msgstr "Arxius de partides desades importats correctament" msgid "Swing" msgstr "Oscil·lació" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Idioma del sistema:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "TAIWAN" @@ -5392,7 +5588,7 @@ msgstr "Taula dreta" msgid "Take Screenshot" msgstr "Capturar pantalla" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -5408,7 +5604,7 @@ msgstr "Textura" msgid "Texture Cache" msgstr "Memòria cau de textura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "Superposició del format de textura" @@ -5424,13 +5620,13 @@ msgstr "L'adreça és invàlida" msgid "The checksum was successfully fixed" msgstr "La suma de comprovació s'ha fixat amb èxit" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "El directori triat ja és a la llista" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5453,7 +5649,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "El fitxer %s ja estava oberta, la capçalera de l'arxiu no s'escriurà." -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "L'arxiu especificat (%s) no existeix" @@ -5471,11 +5667,12 @@ msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "El resultat del desxifratge el codi AR no conté cap línia." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#, fuzzy msgid "" "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." +"If unsure, use the rightmost value." msgstr "" "Quant més segura ajusteu això, més probablement l'emulador no es saltarà " "actualitzacions de textura de la RAM.\n" @@ -5520,7 +5717,7 @@ msgstr "L'arxiu especificat \"%s\" no existeix" msgid "The value is invalid" msgstr "El valor és invàlid." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Tema visual" @@ -5528,7 +5725,7 @@ msgstr "Tema visual" msgid "Theme selection went wrong" msgstr "Hi ha hagut un error a la selecció del tema visual." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5536,7 +5733,7 @@ msgstr "" "Hi ha d'haver una entrada per 00000001/00000002. El seu bolcat de la NAND " "probablement és incompleta." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5552,7 +5749,7 @@ msgstr "" "Aquest simulador «ActionReplay» no és compatible amb els codis que " "modifiquen «ActionReplay»." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "Pot causar alentiment al Menú Wii i alguns jocs." @@ -5575,25 +5772,11 @@ msgstr "" "Si no n'esteu segur, deixeu-ho desactivat." #: 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" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" -"S'utilitza per controlar la velocitat del joc per la de so. \n" -"Desactivar-ho pot causar una velocitat anormal, pot ser massa ràpida.\n" -"Però de vegades activant-ho pot causar soroll constant.\n" -"\n" -"Drecera de teclat : Arpeta per desactivar-ho." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "" "Això s'utilitza per reproduir pistes de música, com BGM (música de fons)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5605,7 +5788,7 @@ msgstr "" "Causa millores importants de velocitat en ordinadors amb més d'un nucli, " "però també poden causar interferències/fallades." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "Li permetrà editar manualment el fitxer de configuració INI" @@ -5628,7 +5811,7 @@ msgstr "Títol" msgid "To" msgstr "a" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "Activar tots els tipus de registre de Log" @@ -5648,6 +5831,7 @@ msgstr "Activar pantalla completa" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5655,14 +5839,17 @@ msgstr "Activar pantalla completa" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Dalt" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Xinés tradicional" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "S'ha intentat de carregar un tipus de fitxer desconegut." @@ -5670,7 +5857,7 @@ msgstr "S'ha intentat de carregar un tipus de fitxer desconegut." msgid "Triggers" msgstr "Gatells" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Provant de llegir des d'un SYSCONF invàlid" @@ -5682,7 +5869,7 @@ msgstr "" "Intentant de llegir des d'un SYSCONF invàlid \n" "identificadors de Wiimote bt no estan disponibles" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Turc" @@ -5703,11 +5890,11 @@ msgstr "Port UDP:" msgid "UDP Wiimote" msgstr "Wiimote UDP" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "DESCONEGUT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "EUA" @@ -5793,7 +5980,7 @@ msgstr "Actualitzar" msgid "Upright Wiimote" msgstr "Wiimote vertical" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Utilitzar mode EuRGB60 (PAL60)" @@ -5805,7 +5992,7 @@ msgstr "Utilitzar pantalla completa" msgid "Use Hex" msgstr "Utilitzeu hexagonal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Utilitzar advertències" @@ -5837,7 +6024,7 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "Utilitat" @@ -5861,25 +6048,29 @@ msgstr "Valor:" msgid "Verbosity" msgstr "Verbositat" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Video" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Virtual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Volum" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "instal·lació del WAD ha fallat: Error en crear %s" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "instal·lació del WAD ha fallat: Error en crear %s" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5898,15 +6089,15 @@ msgstr "" msgid "Warning" msgstr "Advertència" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "Advertència - Inicialitzant DOL en mode de consola incorrecte!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Advertència - Inicialitzant ELF en mode de consola incorrecte!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Advertència - Inicialitzant ISO en mode de consola incorrecte!" @@ -5936,7 +6127,7 @@ msgstr "" "i que tenen el mateix nom que un arxiu a la targeta de memòria\n" "Voleu continuar?" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5944,7 +6135,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5952,7 +6143,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5980,7 +6171,7 @@ msgstr "WaveFileWriter - Fitxer no obert." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "Modificació de pantalla panoràmica" @@ -5988,15 +6179,15 @@ msgstr "Modificació de pantalla panoràmica" msgid "Width" msgstr "Ample" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Consola Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Arrel de la NAND:" @@ -6004,6 +6195,7 @@ msgstr "Arrel de la NAND:" msgid "Wii Save Import" msgstr "Importar partida guardada Wii" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -6013,6 +6205,9 @@ msgstr "Importar partida guardada Wii" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Arxius de partida guardada Wii (*.bin)|*.bin" @@ -6079,10 +6274,11 @@ msgstr "Finestra menú" msgid "Windows Right" msgstr "Finestra dreta" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "Envoltant de paraula" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -6098,6 +6294,11 @@ msgstr "Envoltant de paraula" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Treballant ..." @@ -6105,6 +6306,11 @@ msgstr "Treballant ..." msgid "Write to Console" msgstr "Escriu a consola" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "Escriu en un Fitxer" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "Escriu en un Fitxer" @@ -6160,7 +6366,7 @@ msgstr "Heu d'entrar un decimal, hexadecimal o octal vàlid." msgid "You must enter a valid profile name." msgstr "Heu d'introduir un nom de perfil vàlid." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Ha de reiniciar Dolphin perquè el canvi tingui efecte." @@ -6183,7 +6389,7 @@ msgstr "" "Hauria de ser 0x%04x (però és 0x%04llx) \n" "Vol generar un de nou?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "Modificador ZTP" @@ -6255,7 +6461,7 @@ msgstr "" msgid "^ ADD" msgstr "^ Afegir" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -6288,12 +6494,12 @@ msgstr "" msgid "s" msgstr "s" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "Comanda desconeguda 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute Ha retornat -1 en l'execució de l'aplicació!" @@ -6437,6 +6643,9 @@ msgstr "| O" #~ msgid "Emulator Display Settings" #~ msgstr "Configuració de pantalla de l'emulador" +#~ msgid "Enable Audio Throttle" +#~ msgstr "Habilitar la regulació de so" + #~ msgid "Enable CPU Access" #~ msgstr "Habilitar l'accés a CPU" @@ -6673,6 +6882,19 @@ msgstr "| O" <<<<<<< HEAD ======= >>>>>>> Update from master branch. +#~ msgid "" +#~ "This is used to control game speed by sound throttle.\n" +#~ "Disabling this could cause abnormal game speed, such as too fast.\n" +#~ "But sometimes enabling this could cause constant noise.\n" +#~ "\n" +#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." +#~ msgstr "" +#~ "S'utilitza per controlar la velocitat del joc per la de so. \n" +#~ "Desactivar-ho pot causar una velocitat anormal, pot ser massa ràpida.\n" +#~ "Però de vegades activant-ho pot causar soroll constant.\n" +#~ "\n" +#~ "Drecera de teclat : Arpeta per desactivar-ho." + #~ msgid "" #~ "Unknown pointer %#08x\n" #~ "Continue?" diff --git a/Languages/po/cs.po b/Languages/po/cs.po index b561011572..d9d24e6b40 100644 --- a/Languages/po/cs.po +++ b/Languages/po/cs.po @@ -11,6 +11,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" @@ -26,6 +27,9 @@ msgstr "" "PO-Revision-Date: 2011-10-15 14:50+0100\n" >>>>>>> Update Greek and Czech translations ======= +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-12-19 07:39+0100\n" >>>>>>> Update Czeck translation. ======= @@ -72,9 +76,9 @@ msgstr "\"%s\" je neplatný soubor GCM/ISO, nebo není GC/Wii ISO." msgid "%1$sCopy%1$s" msgstr "%1$sKopírovat%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -120,7 +124,8 @@ msgid "" "file is not large enough to be a valid memory card file (0x%x bytes)" msgstr "" "%s nelze načíst jako paměťovou kartu\n" -"soubor není dostatečně velký, aby byl platným souborem paměťové karty (0x%x bajtů)" +"soubor není dostatečně velký, aby byl platným souborem paměťové karty (0x%x " +"bajtů)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 #, c-format @@ -168,7 +173,7 @@ msgstr "%sExportovat GCI%s" msgid "%sImport GCI%s" msgstr "%sImportovat GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u Volných Bloků; %u Volných Záznamů Adr" @@ -201,11 +206,11 @@ msgstr "Správce &Cheatů" msgid "&DSP Settings" msgstr "&DSP Nastavení" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&Smazat ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&Smazat vybraná ISO..." @@ -269,7 +274,7 @@ msgstr "&Pauza" msgid "&Play" msgstr "&Přehrát" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&Vlastnosti" @@ -313,7 +318,7 @@ msgstr "&Zobrazit" msgid "&Wiimote Settings" msgstr "&Wiimote Nastavení" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "&Wiki" @@ -357,7 +362,7 @@ msgstr "" msgid "" msgstr "<Žádné rozlišení nenalezeno>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -366,7 +371,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -392,11 +397,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" @@ -406,11 +413,13 @@ msgid "" msgstr "" "POZOR:\n" "\n" -"Netplay bude v současnosti správně fungovat pouze při použití následujících nastavení:\n" +"Netplay bude v současnosti správně fungovat pouze při použití následujících " +"nastavení:\n" " - Dvojité Jádro [VYPNUTO]\n" " - Přiškrcení Zvuku [VYPNUTO]\n" " - DSP-HLE s \"Nulovým Zvukem\" nebo DSP-LLE\n" -" - Ručně nastavit přesné číslo ovladačů, které budou použity na [Standardní Ovladač]\n" +" - Ručně nastavit přesné číslo ovladačů, které budou použity na [Standardní " +"Ovladač]\n" "\n" "Všichni hráči by měli používat stejné nastavení i verzi Dolphina.\n" "Zakázat všechny paměťové karty nebo je poslat hráčům před spuštěním.\n" @@ -418,13 +427,13 @@ msgstr "" "\n" "Musíte přesměrovat Váš TCP port na hostitele!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "AM Základní Deska" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "Kódy AR" @@ -436,11 +445,11 @@ msgstr "O Dolphinu" msgid "Acceleration" msgstr "Zrychlení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "Přesnost:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Precizní emulace VBeam" @@ -459,7 +468,8 @@ msgstr "Precizní emulace 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 "" @@ -490,23 +500,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 "Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Kódu Přidat (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" +msgstr "" +"Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Kódu Přidat " +"(%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 "Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Naplnit a Sesunout (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " +"(%s)" +msgstr "" +"Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Naplnit a " +"Sesunout (%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 "Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Ram Zápisu A Naplnění (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " +"Fill (%s)" +msgstr "" +"Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Ram Zápisu A " +"Naplnění (%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 "Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Zápisu Do Ukazatele (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Write To " +"Pointer (%s)" +msgstr "" +"Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Zápisu Do " +"Ukazatele (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:803 #, c-format @@ -515,8 +540,10 @@ msgstr "Chyba Action Replay: Neplatná hodnota (%08x) v Kopii Paměti (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:684 #, c-format -msgid "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" -msgstr "Chyba Action Replay: Hlavní Kód a Zápis do CCXXXXXX nejsou zavedeny (%s)" +msgid "" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +msgstr "" +"Chyba Action Replay: Hlavní Kód a Zápis do CCXXXXXX nejsou zavedeny (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:196 #, c-format @@ -552,11 +579,11 @@ msgstr "Adaptér:" msgid "Add" msgstr "Přidat" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "Přidat kód ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "Přidat Záplatu" @@ -568,6 +595,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 @@ -591,6 +619,11 @@ msgstr "Přidat nový panel" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Přidat..." @@ -602,14 +635,16 @@ msgstr "Adresa :" 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." msgstr "" "Přidá zadanou hodnotu do Parametru ZFar.\n" "Dva způsoby jak vyjádřit hodnoty v plovoucí desetinné čárce.\n" -"Příklad: přímé zadání \"200\" nebo \"0.0002\" má stejný účinek, získaná hodnota bude \"0.0002\".\n" +"Příklad: přímé zadání \"200\" nebo \"0.0002\" má stejný účinek, získaná " +"hodnota bude \"0.0002\".\n" "Hodnoty: (0->+/-Celé číslo) nebo (0->+/-PDČ[6 desetinných míst])\n" "\n" "Poznámka: Zkontrolujte Konzoli/Okno protokolu pro získané hodnoty" @@ -618,14 +653,16 @@ 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." msgstr "" "Přidá zadanou hodnotu do Parametru zNear.\n" "Dva způsoby jak vyjádřit hodnoty v plovoucí desetinné čárce.\n" -"Příklad: přímé zadání \"200\" nebo \"0.0002\" má stejný účinek, získaná hodnota bude \"0.0002\".\n" +"Příklad: přímé zadání \"200\" nebo \"0.0002\" má stejný účinek, získaná " +"hodnota bude \"0.0002\".\n" "Hodnoty: (0->+/-Celé číslo) nebo (0->+/-PDČ[6 desetinných míst])\n" "\n" "Poznámka: Zkontrolujte Konzoli/Okno protokolu pro získané hodnoty\"" @@ -634,11 +671,11 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "Upravte tlak analogového ovládání potřebný k aktivaci tlačítek." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "Pokročilé" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Pokročilá Nastavení" @@ -646,11 +683,11 @@ msgstr "Pokročilá Nastavení" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Všechny soubory GC/Wii (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Všechny obrazy GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "Všechny soubory Gamecube GCM )gcm)" @@ -658,6 +695,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 ======= @@ -676,35 +714,45 @@ msgstr "Všechny soubory Gamecube GCM )gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Všechny Uložené Stavy (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "Všechny soubory Wii ISO (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Všechny komprimované soubory GC/WII ISO (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "Všechny soubory (*.*)|*.*" #: 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 "" -"Umožní přepínání jistých možností pomocí horkých kláves 3, 4, 5, 6 a 7 uvnitř okna emulace.\n" +"Umožní přepínání jistých možností pomocí horkých kláves 3, 4, 5, 6 a 7 " +"uvnitř okna emulace.\n" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 <<<<<<< HEAD +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Alternate Wiimote Timing" msgstr "Střídat časování Wiimote" ======= @@ -739,7 +787,7 @@ msgstr "Zavaděč aplikace má špatnou velikost... je to vážně zavaděč?" msgid "Apploader unable to load from file" msgstr "Zavaděč aplikace nemohl načíst soubor" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Zavaděč aplikace:" @@ -757,7 +805,7 @@ msgstr "" "\n" " Pokud si nejste jisti, zvolte (vypnuto)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Arabština" @@ -766,7 +814,7 @@ msgstr "Arabština" msgid "Are you sure you want to delete \"%s\"?" msgstr "Jste si jisti, že chcete smazat \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -774,10 +822,11 @@ msgstr "" "Jste si jisti, že chcete tyto soubory smazat?\n" "Budou navždy ztraceny!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 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 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -794,6 +843,9 @@ msgstr "Opravdu chcete smazat tento soubor? Bude navždy ztracen!" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 >>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Aspect Ratio:" @@ -803,18 +855,20 @@ msgstr "Poměr Stran:" msgid "At least one pane must remain open." msgstr "Alespoň jeden panel musí být otevřen." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Backend Zvuku:" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Chyba při otevírání zařízení zvukového výstupu.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -831,6 +885,9 @@ msgstr "AudioCommon: Chyba při otevírání zařízení zvukového výstupu.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 >>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Auto" @@ -874,7 +931,7 @@ msgstr "" msgid "Back" msgstr "Zpět" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Nastavení Backendu" @@ -901,11 +958,11 @@ msgstr "Špatná hlavička souboru" msgid "Banner" msgstr "Plakát" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "Detaily Plakátu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "Plakát:" @@ -917,7 +974,7 @@ msgstr "Vibráto" msgid "Basic" msgstr "Základní" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Základní nastavení" @@ -950,6 +1007,7 @@ msgstr "Modrá vpravo" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -965,6 +1023,9 @@ msgstr "Modrá vpravo" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Dole" @@ -973,7 +1034,7 @@ msgstr "Dole" msgid "Bound Controls: %lu" msgstr "Spojené ovladače: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Rozbité" @@ -989,7 +1050,7 @@ msgstr "Procházet pro přidání adresáře" msgid "Browse for an ISO directory..." msgstr "Procházet pro adresář ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "Procházet pro výstupní adresář" @@ -1029,23 +1090,26 @@ msgstr "Kr Stick" msgid "C-Stick" msgstr "Kr-Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "Jádro Emulátoru Procesoru" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "Ukládat předvyt. obj. do vyr. pam." #: 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 "" "Vypočítat hodnoty hloubky 3D grafiky podle pixelu, raději než podle bodu.\n" -"Na rozdíl od osvětlení pixelu (což je pouze vylepšen), výpočty hloubky podle pixelu jsou potřebné ke správné emulaci malého počtu her.\n" +"Na rozdíl od osvětlení pixelu (což je pouze vylepšen), výpočty hloubky podle " +"pixelu jsou potřebné ke správné emulaci malého počtu her.\n" "\n" "Pokud si nejste jisti, nechejte toto zaškrtnuté." @@ -1058,7 +1122,8 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Vypočítat osvětlení 3D grafiky podle pixelu, raději než podle bodu.\n" -"Sníží rychlost emulace o nějaké procento (záleží na Vašem grafikém procesoru).\n" +"Sníží rychlost emulace o nějaké procento (záleží na Vašem grafikém " +"procesoru).\n" "Toto je většinou bezpečné vylepšení, ale může někdy způsobit problémy.\n" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." @@ -1079,7 +1144,7 @@ msgstr "Nelze otevřít %s" msgid "Cannot unregister events with events pending" msgstr "Nelze odhlásit události, když jsou očekávány" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1090,7 +1155,7 @@ msgstr "" "%s\n" "není platný soubor paměťové karty gamecube" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1108,8 +1173,6 @@ msgstr "Nelze najít Wiimote podle bz: %02x:%02x:%02x:%02x:%02x:%02x" msgid "Cant find WiiMote by connection handle %02x" msgstr "Nelze najít Wiimote pomocí obslužné rutiny spojení %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1119,7 +1182,7 @@ msgstr "Nelze číst ze zásuvného modulu DVD - DVD-Rozhraní: Závažná chyba msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "Katalánština" @@ -1144,7 +1207,7 @@ msgstr "Vyměnit Disk" msgid "Change Game" msgstr "Změnit hru" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1160,8 +1223,8 @@ msgstr "Změní znaménko na Parametr zFar (po korekci)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Změní znaménko na Parametr zNear (po korekci)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "Změna tohoto se neprojeví, pokud emulátor běží!" @@ -1181,31 +1244,31 @@ msgstr "Hledání Cheatů" msgid "Cheats Manager" msgstr "Správce Cheatů" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Čínština (Zjednodušená)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Čínština (Tradiční)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "Zvolte kořenový adresář DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "Zvolte kořenový adresář NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Zvolte výchozí ISO:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "Zvolte adresář k přidání" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Zvolte soubor k otevření" @@ -1213,12 +1276,16 @@ msgstr "Zvolte soubor k otevření" msgid "Choose a memory card:" msgstr "Zvolte paměťovou kartu:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 -msgid "Choose file to use as apploader: (applies to discs constructed from directories only)" -msgstr "Zvolte soubor, který má být použit jako zavaděč aplikace: (platí pouze pro disky sestavené z adresářů)" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 +msgid "" +"Choose file to use as apploader: (applies to discs constructed from " +"directories only)" +msgstr "" +"Zvolte soubor, který má být použit jako zavaděč aplikace: (platí pouze pro " +"disky sestavené z adresářů)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Zvolte adresář pro umístění extrakce" @@ -1230,25 +1297,29 @@ msgstr "Kruhový Stick" msgid "Classic" msgstr "Klasické" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "Vyčistit" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "Vyčištění selhalo" #: Source/Core/Core/Src/NetPlayServer.cpp:259 -msgid "Client disconnect while game is running!! NetPlay is disabled. You must manually stop the game." -msgstr "Klient odpojen při běhu hry!! NetPlay je vypnut. Hru musíte ukončit ručně." +msgid "" +"Client disconnect while game is running!! NetPlay is disabled. You must " +"manually stop the game." +msgstr "" +"Klient odpojen při běhu hry!! NetPlay je vypnut. Hru musíte ukončit ručně." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1265,6 +1336,10 @@ msgstr "Klient odpojen při běhu hry!! NetPlay je vypnut. Hru musíte ukončit >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Zavřít" @@ -1288,20 +1363,20 @@ msgstr "Příkaz" msgid "Comment" msgstr "Komentář" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Komentář:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "Komprimovat ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Komprimovat vybraná ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "Komprimuji ISO" @@ -1328,13 +1403,13 @@ msgstr "Nastavit Pady" msgid "Configure..." msgstr "Nastavit..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "Potvrdit Přepsání Souboru" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "Při zastavení Potvrdit" @@ -1343,7 +1418,7 @@ msgstr "Při zastavení Potvrdit" msgid "Connect" msgstr "Připojit" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "Připojit USB Klávesnici" @@ -1408,12 +1483,12 @@ msgstr "Převést na GCI" msgid "Copy failed" msgstr "Kopírování selhalo" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "Kopírovat na Paměťovou kartu %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "Jádro" @@ -1429,15 +1504,21 @@ msgstr "Nezle spustit 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." -msgstr "\"%s\" nelze číst. Buď není v mechanice žádný disk, nebo toto není záloha GC/Wii. Nezapomeňte, že původní disky GameCube a Wii nepřečte většina PC DVD mechanik." +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\" nelze číst. Buď není v mechanice žádný disk, nebo toto není záloha GC/" +"Wii. Nezapomeňte, že původní disky GameCube a Wii nepřečte většina PC DVD " +"mechanik." #: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format msgid "Could not recognize ISO file %s" msgstr "Nelze rozpoznat ISO soubor %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "Nelze uložit %s" @@ -1450,18 +1531,20 @@ msgstr "" "Nelze nastavit pady. Hráč odešel, nebo hra v současnosti běží!.\n" "(nastavení padů za běhu hry není ještě podporováno)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, 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 "" "Nelze zapsat soubor paměťové karty %s.\n" "\n" -"Spouštíte Dolphina z CD/DVD, nebo je snad soubor s uložením chráněný proti zápisu?" +"Spouštíte Dolphina z CD/DVD, nebo je snad soubor s uložením chráněný proti " +"zápisu?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "Nelze najít příkaz pro otevření přípony 'ini'!" @@ -1478,7 +1561,7 @@ msgstr "" msgid "Count:" msgstr "Počet:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "Země:" @@ -1492,23 +1575,25 @@ msgstr "Vytvořit AR kód" msgid "Create new perspective" msgstr "Vytvořit novou perspektivu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "Vytvořil KDE-look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 -msgid "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -msgstr "Vytvořil Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +msgid "" +"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +msgstr "" +"Vytvořil Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "Vytvořil VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "Vytvořil black_rider a publikováno na ForumW.org > Web Developments" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "Tvůrce:" @@ -1516,7 +1601,7 @@ msgstr "Tvůrce:" msgid "Critical" msgstr "Kritické" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "Oříznout" @@ -1539,7 +1624,7 @@ msgstr "Crossfade" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Současný adresář se změnil z %s na %s po wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "Vlastní Hack Projekce" @@ -1547,11 +1632,11 @@ msgstr "Vlastní Hack Projekce" msgid "Custom Projection Hack Settings" msgstr "Nastavení Vlastního Hacku Projekce" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "Přizpůsobte některé Ortografické parametry Projekce" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Čeština" @@ -1563,10 +1648,11 @@ msgstr "D-Pad" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "Jádro Emulátoru DSP" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 @@ -1587,18 +1673,22 @@ msgstr "Jádro Emulátoru DSP" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulace (rychlé)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE převaděč (pomalé)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "DSP LLE ve Vlákně" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP LLE rekompilátor" @@ -1606,15 +1696,23 @@ msgstr "DSP LLE rekompilátor" msgid "DSP settings" msgstr "Nastavení DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "Kořen DVD:" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "Velikost data" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "Datum:" @@ -1635,7 +1733,7 @@ msgstr "Mrtvá Zóna" msgid "Debug" msgstr "Ladění" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "Ladění" @@ -1643,16 +1741,16 @@ msgstr "Ladění" msgid "Decimal" msgstr "Desetinné" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "Dekomprimovat ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "Dekomprimovat vybraná ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "Dekomprimuji ISO" @@ -1660,11 +1758,11 @@ msgstr "Dekomprimuji ISO" msgid "Default" msgstr "Výchozí" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "Výchozí ISO:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "Výchozí typ písma" @@ -1673,7 +1771,7 @@ msgstr "Výchozí typ písma" msgid "Delete" msgstr "Smazat" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "Smazat Uloženou Hru" @@ -1682,7 +1780,7 @@ msgstr "Smazat Uloženou Hru" msgid "Delete the existing file '%s'?" msgstr "Vymazat existující soubor '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "Popis" @@ -1690,18 +1788,22 @@ msgstr "Popis" msgid "Detect" msgstr "Zjistit" -#: 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 "Zjištěn pokus o přečtení více dat z DVD, než se vejde do výstupní paměti. Zásek." +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 +msgid "" +"Detected attempt to read more data from the DVD than fit inside the out " +"buffer. Clamp." +msgstr "" +"Zjištěn pokus o přečtení více dat z DVD, než se vejde do výstupní paměti. " +"Zásek." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 msgid "Device" msgstr "Zařízení" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Nastavení Zařízení" @@ -1726,47 +1828,53 @@ msgstr "" "i záložní kontrolní součet Adresáře selhal" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "Zakázat" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "Zakázat Mlhu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "Zakázat Osvětlení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "Zakázat Hloubku Podle Pixelu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "Zakázat Textury" #: 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 "" "Zakázat jakoukoli emulaci XFB.\n" -"Velmi zrychluje emulaci, ale způsobuje hodně chyb v mnoha hrách, které na nich závisejí (zvláště po domácku vyrobené aplikace).\n" +"Velmi zrychluje emulaci, ale způsobuje hodně chyb v mnoha hrách, které na " +"nich závisejí (zvláště po domácku vyrobené aplikace).\n" "\n" "Pokud si nejste jisti, nechejte toto zaškrtnuté." #: 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 "" "Zakázat emulaci EFB kopií.\n" -"Tyto jsou často používány pro efekty následného zpracování nebo vykreslení do textur, takže když toto zaškrtnete, dostanete velké zrychlení, ale toto také skoro vždy způsobuje problémy.\n" +"Tyto jsou často používány pro efekty následného zpracování nebo vykreslení " +"do textur, takže když toto zaškrtnete, dostanete velké zrychlení, ale toto " +"také skoro vždy způsobuje problémy.\n" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." @@ -1780,7 +1888,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Disk" @@ -1811,6 +1919,7 @@ msgstr "Rozdělit" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 @@ -1824,10 +1933,13 @@ msgstr "Rozdělit" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Chcete současnou emulaci zastavit?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1856,6 +1968,7 @@ msgstr "Dolphin FIFO" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Nastavení" @@ -1892,6 +2005,14 @@ msgstr "Dolphin GCPad Nastavení" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GCPad Nastavení" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Doplhin Filmy TAS (*.dtm)" @@ -1904,23 +2025,31 @@ msgid "Dolphin at &Google Code" msgstr "Dolphin na &Google Code" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 -msgid "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for files..." -msgstr "Dolphin nemohl nalézt žádná GX/Wii ISO. Klikněte zde dvakrát k prohledání souborů..." +msgid "" +"Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " +"files..." +msgstr "" +"Dolphin nemohl nalézt žádná GX/Wii ISO. Klikněte zde dvakrát k prohledání " +"souborů..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 -msgid "Dolphin is currently set to hide all games. Doubleclick here to show all games..." -msgstr "Dolphin je v současnosti nastaven na skrytí všech her. Klikněte zde dvakrát pro zobrazení všech her..." +msgid "" +"Dolphin is currently set to hide all games. Doubleclick here to show all " +"games..." +msgstr "" +"Dolphin je v současnosti nastaven na skrytí všech her. Klikněte zde dvakrát " +"pro zobrazení všech her..." #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Down" msgstr "Dolů" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "Stáhnout kódy (Databáze WiiRD)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Stáhnuto %lu kódů. (přídáno %lu)" @@ -1929,23 +2058,23 @@ msgstr "Stáhnuto %lu kódů. (přídáno %lu)" msgid "Drums" msgstr "Bubny" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "Atrapa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "Vypsat Zvuk" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "Vypsat Cíl EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "Vypsat Snímky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "Vypsat Textury" @@ -1983,6 +2112,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 @@ -2006,6 +2136,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Nizozemština" @@ -2019,10 +2154,17 @@ msgstr "EFB Kopie" #: 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 "CHYBA: Tato verze Dolphinu vyžaduje ovladač TAP-Win32 verze alespoň %d.%d -- Pokud jste nedávno Vaši instalaci Dolphin aktualizovali, je zapotřebí v tomto bodě restartovat, aby Windows uviděl nový ovladač." +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 "" +"CHYBA: Tato verze Dolphinu vyžaduje ovladač TAP-Win32 verze alespoň %d.%d -- " +"Pokud jste nedávno Vaši instalaci Dolphin aktualizovali, je zapotřebí v " +"tomto bodě restartovat, aby Windows uviděl nový ovladač." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "EVROPA" @@ -2038,7 +2180,7 @@ msgstr "Upravit" msgid "Edit ActionReplay Code" msgstr "Upravit kód ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Upravit nastavení" @@ -2050,8 +2192,8 @@ msgstr "Upravit záplatu" msgid "Edit current perspective" msgstr "Upravit současnou perspektivu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "Upravit" @@ -2070,24 +2212,30 @@ msgstr "Vlákno Emulace již běží" #: 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 "" "Přesně Emulovat XFB.\n" -"Velmi zpomaluje emulaci a brání vykreslování ve vysokém rozlišení, ale je nutná k řádné emulaci jistého počtu her.\n" +"Velmi zpomaluje emulaci a brání vykreslování ve vysokém rozlišení, ale je " +"nutná k řádné emulaci jistého počtu her.\n" "\n" "Pokud si nejste jisti, zaškrtněte místo tohoto virtuální emulaci 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 "" "Emulovat XFB pomocí objektů textury grafického procesoru.\n" -"Spraví mnoho her, které nefungují bez emulace EFB, aniž by byla tak pomalá jako opravdová emulace EFB. Nicméně stále může selhat v mnoha jiných hrách (zvláště po domácku vyrobené aplikace).\n" +"Spraví mnoho her, které nefungují bez emulace EFB, aniž by byla tak pomalá " +"jako opravdová emulace EFB. Nicméně stále může selhat v mnoha jiných hrách " +"(zvláště po domácku vyrobené aplikace).\n" "\n" "Pokud si nejste jisti, nechejte toto zaškrtnuté." @@ -2095,7 +2243,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Emulovaný Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "Stav Emulace:" @@ -2105,13 +2253,15 @@ msgstr "Povolit" #: 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 "" -"Zapnout 3D efekty pomocí stereoskopie použitím technologie Nvidia 3D Vision, pokud je podporována Vaším grafickým procesorem.\n" +"Zapnout 3D efekty pomocí stereoskopie použitím technologie Nvidia 3D Vision, " +"pokud je podporována Vaším grafickým procesorem.\n" "Může způsobovat problémy.\n" "Pro fungování vyžaduje režim celé obrazovky.\n" "\n" @@ -2121,15 +2271,11 @@ msgstr "" msgid "Enable AR Logging" msgstr "Povolit protokolování AR" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "Zapnout Přiškrcení Zvuku" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "Zapnout BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Zapnout Slučování Bloků" @@ -2137,9 +2283,13 @@ msgstr "Zapnout Slučování Bloků" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "Povolit výpočet ohraničujícího rámečku" @@ -2157,6 +2307,7 @@ msgstr "Povolit vyrovnávací paměť" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= ======= @@ -2168,51 +2319,54 @@ msgstr "Povolit vyrovnávací paměť" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Povolit Cheaty" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "Zapnout DTK Hudbu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Povolit dvojité jádro" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Zapnout dvojité jádro (zrychlení)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "Povolit klávesové zkratky" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Povolit Přeskakování Nečinných Příkazů" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Povolit Přeskakování Nečinných Příkazů (zrychlení)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Zapnout MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "Povolit Progresivní Skenování" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "Povolit Spořič Obrazovky" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "Povolit Širokoúhlou obrazovku" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "Povolit Drátěný Model" @@ -2230,11 +2384,15 @@ msgstr "" "\n" "Pokud si nejste jisti, zvolte 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 -msgid "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = Compatible)" -msgstr "Zapnout rychlý přístup k disku. Některé hry to potřebují. (ZAPNUTO = rychlé, VYPNUTO = Kompatibilní)" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +msgid "" +"Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " +"Compatible)" +msgstr "" +"Zapnout rychlý přístup k disku. Některé hry to potřebují. (ZAPNUTO = rychlé, " +"VYPNUTO = Kompatibilní)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "Zapnout stránky" @@ -2245,30 +2403,43 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Toto povolte, pokud chcete, aby celá obrazovka byla použita pro vykreslování.\n" +"Toto povolte, pokud chcete, aby celá obrazovka byla použita pro " +"vykreslování.\n" "Pokud je toto zakázáno, bude místo toho vytvořeno vykreslovací okno.\n" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." #: 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 "" -"Toto zapněte, pokud chcete použít hlavní okno Dolphin pro vykreslování raději, než oddělené vykreslovací okno.\n" +"Toto zapněte, pokud chcete použít hlavní okno Dolphin pro vykreslování " +"raději, než oddělené vykreslovací okno.\n" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 -msgid "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for ANY other game." -msgstr "Povolte toto pro zrychlení The Legend of Zelda: Twilight Princess. Zakažte pro VŠECHNY ostatní hry." +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +msgid "" +"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " +"ANY other game." +msgstr "" +"Povolte toto pro zrychlení The Legend of Zelda: Twilight Princess. Zakažte " +"pro VŠECHNY ostatní hry." -#: 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 "Povolit Překlad Adres Bloků (BAT); funkce Jednotky Správy Paměti. Přesně napodobuje hardware, ale je emulován pomalu. (ZAPNUTO = Kompatibilní, VYPNUTO = Rychlé)" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +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 "" +"Povolit Překlad Adres Bloků (BAT); funkce Jednotky Správy Paměti. Přesně " +"napodobuje hardware, ale je emulován pomalu. (ZAPNUTO = Kompatibilní, " +"VYPNUTO = Rychlé)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "Povolit Vlastní Hack Projekce" @@ -2284,9 +2455,13 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 -msgid "Enables the Memory Management Unit, needed for some games. (ON = Compatible, OFF = Fast)" -msgstr "Povolí Jednotku Správy Paměti, potřebnou v nějakých hrách. (ZAPNUTO = Kompatibilní, VYPNUTO = Rychlé)" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +msgid "" +"Enables the Memory Management Unit, needed for some games. (ON = Compatible, " +"OFF = Fast)" +msgstr "" +"Povolí Jednotku Správy Paměti, potřebnou v nějakých hrách. (ZAPNUTO = " +"Kompatibilní, VYPNUTO = Rychlé)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" @@ -2306,6 +2481,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 @@ -2329,6 +2505,11 @@ msgstr "End" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Angličtina" @@ -2360,6 +2541,7 @@ msgstr "Rovná se" #: 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 "Chyba" @@ -2406,20 +2588,35 @@ msgstr "" #: Source/Core/DolphinWX/Src/Main.cpp:356 >>>>>>> Update Greek and Czech translations ======= +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "Chyba" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 >>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Error loading selected language. Falling back to system default." -msgstr "Chyba při nahrávání zvoleného jazyka. Vracím se na výchozí jazyk systému." +msgstr "" +"Chyba při nahrávání zvoleného jazyka. Vracím se na výchozí jazyk systému." -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format -msgid "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). Aborting savestate load..." -msgstr "Chyba: Po \"%s\", nalezeno %d (0x%X) místo značky uložení %d (0x%X). Ukončuji načtení uloženého stavu..." +msgid "" +"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +"Aborting savestate load..." +msgstr "" +"Chyba: Po \"%s\", nalezeno %d (0x%X) místo značky uložení %d (0x%X). " +"Ukončuji načtení uloženého stavu..." -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format -msgid "Error: Trying to access %s fonts but they are not loaded. Games may not show fonts correctly, or crash." -msgstr "Chyba: Pokus o přístup k písmům %s, ale ty nejsou načtena. Hry nemusí zobrazit písma správně, nebo se můžou zhroutit" +msgid "" +"Error: Trying to access %s fonts but they are not loaded. Games may not show " +"fonts correctly, or crash." +msgstr "" +"Chyba: Pokus o přístup k písmům %s, ale ty nejsou načtena. Hry nemusí " +"zobrazit písma správně, nebo se můžou zhroutit" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:30 msgid "Escape" @@ -2446,7 +2643,7 @@ msgstr "Ukončit Dolphin s emulátorem" msgid "Export Failed" msgstr "Export Selhal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "Exportovat Soubor" @@ -2459,15 +2656,15 @@ msgstr "Exportovat Nahrávku" msgid "Export Recording..." msgstr "Exportovat Nahrávku..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "Exportovat Uloženou hru" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "Exportovat uloženou hru Wii (Experimentální)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "Exportovat všechny Uložené hry" @@ -2483,7 +2680,7 @@ msgstr "Exportovat Uloženou hru jako..." msgid "Extension" msgstr "Rozšíření" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "Vnější Vyr. Paměť Snímků" @@ -2495,44 +2692,44 @@ msgstr "Extra Parametr" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Extra Parametr užitečný pouze v ''Metroid: Other M''" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "Extrahovat Všechny Soubory..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "Extrahovat Zavaděč Aplikace..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "Extrahovat DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "Extrahovat Adresář..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "Extrahovat Soubor..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "Extrahovat Oddíl..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "Extrahuji %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "Extrahuji Všechny Soubory" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "Extrahuji Adresář" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "Extrahuji..." @@ -2544,11 +2741,11 @@ msgstr "FIFO Bajt" msgid "FIFO Player" msgstr "Přehrávač FIFO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "FRANCIE" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "Velikost FST:" @@ -2560,11 +2757,11 @@ msgstr "Připojení Selhalo!" msgid "Failed to Listen!!" msgstr "Naslouchání Selhalo!!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "Stahování kódů selhalo." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Nelze extrahovat do %s!" @@ -2584,7 +2781,8 @@ msgstr "" "Nelze načíst ROM DSP:\t%s\n" "\n" "Tento soubor je vyžadován při použití DSP LLE.\n" -"Není distribuován s Dolphinem, protože obsahuje data chráněná autorským právem.\n" +"Není distribuován s Dolphinem, protože obsahuje data chráněná autorským " +"právem.\n" "Použijte DSPSpy k výpisu soubor z Vaší skutečné konzole.\n" "\n" "Můžete použít jádro DSP HLE, které nevyžaduje výpisy ROM.\n" @@ -2681,18 +2879,28 @@ msgstr "Zápis hlavičky selhal pro %s" msgid "Failed to write header for file %d" msgstr "Selhal zápis hlavičky souboru %d" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "Rychlá" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "Rychlé Mipmapy" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "Rychlá verze MMU. Nefunguje v každé hře." +#: Source/Core/Core/Src/Movie.cpp:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "Přehrávač Fifo" @@ -2701,7 +2909,7 @@ msgstr "Přehrávač Fifo" msgid "File Info" msgstr "Informace o souboru" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "Soubor neobsahoval žádné kódy" @@ -2734,16 +2942,16 @@ msgstr "Soubor nerozpoznán jako paměťová karta" msgid "File not compressed" msgstr "Soubor není komprimovaný" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Neznámý režim otevření : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "Souborový systém" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Typ souboru 'ini' je neznámý! Nelze otevřít!" @@ -2751,7 +2959,7 @@ msgstr "Typ souboru 'ini' je neznámý! Nelze otevřít!" msgid "First Block" msgstr "První blok" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "Spravit Kontrolní Součty" @@ -2763,7 +2971,7 @@ msgstr "Vynutit 16:9" msgid "Force 4:3" msgstr "Vynutit 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "Donutit konzoli být jako NTSC-J" @@ -2795,13 +3003,15 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 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 "" "Donutí použít režim NTSC-J pro použití Japonského písma ROMu.\n" -"Pokud není zaškrtnuto, Dolphin standardně přejde na NTSC-U a automaticky zapne toto nastavení při hraní Japonských her." +"Pokud není zaškrtnuto, Dolphin standardně přejde na NTSC-U a automaticky " +"zapne toto nastavení při hraní Japonských her." #: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" @@ -2829,7 +3039,7 @@ msgstr "Snímek" msgid "Frame Advance" msgstr "Postup Snímkem" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "Uložení snímků použije FFV1" @@ -2841,7 +3051,7 @@ msgstr "Rozsah Snímku" msgid "Frame S&kipping" msgstr "Přes&kakování snímků:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Limit Snímků:" @@ -2849,7 +3059,7 @@ msgstr "Limit Snímků:" msgid "Frames To Record" msgstr "Snímky k Nahrání" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "Rozhlížení pomocí myši" @@ -2857,6 +3067,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 @@ -2880,6 +3091,11 @@ msgstr "Rozhlížení pomocí myši" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Francouzština" @@ -2912,7 +3128,7 @@ msgstr "Nastavení GCMic" msgid "GCPad" msgstr "GCPad" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "ID Hry:" @@ -2928,15 +3144,15 @@ msgstr "Hra neběží!" msgid "Game not found!!" msgstr "Hra nenalezena!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "Nastavení Konkrétní Hry" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Nastavení Hry" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" @@ -2955,6 +3171,7 @@ msgstr "Nastavení Gamecube &Pad" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 @@ -2964,6 +3181,9 @@ msgstr "Nastavení Gamecube &Pad" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Paměťové karty Gamecube (*.raw,*.gcp)" @@ -2972,15 +3192,17 @@ msgid "Gamecube Pad settings" msgstr "Gamecube Pad nastavení" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Kódy Gecko" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" "Nelze spustit GeckoKód (CT%i CST%i) (%s)\n" "(buď špatný kód, nebo typ kódu není ještě podporován.)" @@ -2990,10 +3212,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: 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/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 @@ -3017,6 +3243,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 @@ -3040,6 +3267,11 @@ msgstr "Obecná Nastavení" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Němčina" @@ -3074,19 +3306,22 @@ msgstr "Větší než" #: 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 "" -"Velmi zvýší kvalitu vytvářených textur použitím efektů vykreslení do textury.\n" +"Velmi zvýší kvalitu vytvářených textur použitím efektů vykreslení do " +"textury.\n" "Zvýšení vnitřního rozlišení zlepší účinnek tohoto nastavení.\n" "Trošku sníží výkon a možná způsobí problémy (i když to je nepravděpodobné).\n" "\n" "Pokud si nejste jisti, nechejte toto zaškrtnuté." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Řečtina" @@ -3118,7 +3353,7 @@ msgstr "Hacky" msgid "Header checksum failed" msgstr "Kontrolní součet hlavičky selhal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Hebrejština" @@ -3183,6 +3418,7 @@ msgstr "Nastavení klávesových zkratek" <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 @@ -3199,10 +3435,13 @@ msgstr "Nastavení klávesových zkratek" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Klávesové zkratky" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Maďarština" @@ -3210,27 +3449,29 @@ msgstr "Maďarština" msgid "Hybrid Wiimote" msgstr "Hybridní Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "IOCTL_ES_GETVIEWS: Pokus o získání dat z neznámého lístku: %08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, 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: Hra se pokusila znovu načíst ios nebo název, který není dostupný ve Vašem nand výpisu\n" +"IOCTL_ES_LAUNCH: Hra se pokusila znovu načíst ios nebo název, který není " +"dostupný ve Vašem nand výpisu\n" "IDNázvu %016llx.\n" "Dolphin se teď pravděpodobně zasekne" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - špatný cíl" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "Nastavení IPL" @@ -3246,15 +3487,15 @@ msgstr "Infračer. Ukazovátko" msgid "IR Sensitivity:" msgstr "Citlivost Infračer.:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "Detaily ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "Adresáře ISO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "ITÁLIE" @@ -3262,17 +3503,30 @@ msgstr "ITÁLIE" msgid "Icon" msgstr "Ikona" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 -msgid "If checked, the bounding box registers will be updated. Used by the Paper Mario games." -msgstr "Pokud je zaškrtnuto, registry ohraničujícího rámečku budou aktualizovány. Používáno v hrách Paper Mario." +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +msgid "" +"If checked, the bounding box registers will be updated. Used by the Paper " +"Mario games." +msgstr "" +"Pokud je zaškrtnuto, registry ohraničujícího rámečku budou aktualizovány. " +"Používáno v hrách Paper Mario." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 -msgid "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" -msgstr "Pokud jsou SzS nestálé, tato volba může pomoci. (ZAPNUTO = Kompatibilní, VYPNUTO = Rychlé)" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +msgid "" +"If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" +msgstr "" +"Pokud jsou SzS nestálé, tato volba může pomoci. (ZAPNUTO = Kompatibilní, " +"VYPNUTO = Rychlé)" -#: 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." -msgstr "Pokud nastavíte limit snímků větší než plná rychlost hry (NTSC:60, PAL:50), měli byste také vypnout Přiškrcení Zvuku v DSP, aby to bylo účinné." +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy +msgid "" +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " +"Audio to throttle using the DSP (might fix audio clicks but can also cause " +"constant noise depending on the game)." +msgstr "" +"Pokud nastavíte limit snímků větší než plná rychlost hry (NTSC:60, PAL:50), " +"měli byste také vypnout Přiškrcení Zvuku v DSP, aby to bylo účinné." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" @@ -3281,28 +3535,32 @@ msgstr "Ignorovat Změny Formátu" #: 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 "" "Ignorovat všechny změny formátu EFB.\n" -"Zlepší výkon v mnoha hrách, bez žádného negativního efektu. Přesto způsobuje grafické chyby v malém počtu jiných her.\n" +"Zlepší výkon v mnoha hrách, bez žádného negativního efektu. Přesto způsobuje " +"grafické chyby v malém počtu jiných her.\n" "\n" "Pokud si nejste jisti, nechejte toto zaškrtnuté." #: 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 "" "Ignorovat všechny požadavky procesoru pro čtení a zápis do EFB.\n" -"Zvýší výkon v některých hrách, ale může vypnout některé funkce související s hraním a grafické efekty.\n" +"Zvýší výkon v některých hrách, ale může vypnout některé funkce související s " +"hraním a grafické efekty.\n" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "Importovat Uloženou hru" @@ -3332,11 +3590,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 "" -"Zlepší výkon, ale způsobuje chyby ve většině her, které závisejí na správné emulaci mlhy.\n" +"Zlepší výkon, ale způsobuje chyby ve většině her, které závisejí na správné " +"emulaci mlhy.\n" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." @@ -3350,7 +3610,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "Ve Hře" @@ -3359,7 +3619,7 @@ msgid "In-Game" msgstr "Ve Hře" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info" @@ -3379,7 +3639,7 @@ msgstr "Vložit" msgid "Insert Encrypted or Decrypted code here..." msgstr "Zde vložte Zašifrovaný nebo Rozšifrovaný kód..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Vložit SD Kartu" @@ -3391,18 +3651,22 @@ msgstr "Zde vložte jméno..." msgid "Install WAD" msgstr "Instalovat WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Instalovat do Wii Menu" #: Source/Core/Core/Src/MemTools.cpp:248 -msgid "InstallExceptionHandler called, but this platform does not yet support it." -msgstr "Byl zavolán InstallExceptionHandler, ale tato platforma toto ještě nepodporuje." +msgid "" +"InstallExceptionHandler called, but this platform does not yet support it." +msgstr "" +"Byl zavolán InstallExceptionHandler, ale tato platforma toto ještě " +"nepodporuje." <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 @@ -3416,14 +3680,17 @@ msgstr "Byl zavolán InstallExceptionHandler, ale tato platforma toto ještě ne ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Instaluji WAD..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "Rozhraní" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "Nastavení Rozhraní" @@ -3448,11 +3715,11 @@ msgstr "Vnitřní chyba LZO - lzo_init() selhalo" msgid "Internal Resolution:" msgstr "Vnitřní Rozlišení:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Převaděč (VELMI pomalé)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "Intro" @@ -3469,7 +3736,7 @@ msgstr "Neplatná Hodnota!" msgid "Invalid bat.map or dir entry" msgstr "Neplatný bat.map nebo záznam adr." -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "Neplatná událost typu %i" @@ -3489,11 +3756,11 @@ msgstr "" "%s\n" "Možná budete muset hru znovu vypsat." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "Neplatný soubor s nahrávkou" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "Neplatný stav" @@ -3501,6 +3768,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 @@ -3524,27 +3792,32 @@ msgstr "Neplatný stav" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italština" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "JAPONSKO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT Rekompilátor (doporučeno)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL experimentální rekompilátor" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japonština" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "KOREA" @@ -3553,8 +3826,8 @@ msgstr "KOREA" msgid "Key" msgstr "Klávesa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Korejština" @@ -3572,7 +3845,7 @@ msgstr "Tlačítko L" msgid "L-Analog" msgstr "Levý Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "Jazyk:" @@ -3625,7 +3898,7 @@ msgstr "" msgid "Less Than" msgstr "Menší než" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "Limitovat podle SzS" @@ -3633,7 +3906,7 @@ msgstr "Limitovat podle SzS" msgid "Load" msgstr "Nahrát" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "Nahrát Vlastní Textury" @@ -3685,6 +3958,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" @@ -3718,6 +3992,13 @@ msgstr "Nahrát Systémové Menu Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "Nahrát Systémové Menu Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Nahrát Systémové Menu Wii %d%c" @@ -3744,7 +4025,7 @@ msgstr "Nahraje určený soubor (DOL, ELF, GCM, ISO, WAD)" msgid "Local" msgstr "Místní" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Uzamknout Vlákna do Jader" @@ -3756,11 +4037,11 @@ msgstr "Záznam" msgid "Log Configuration" msgstr "Nastavení Záznamu" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Typy Záznamu" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Výstup Zapisovače" @@ -3790,7 +4071,7 @@ msgstr "" "MD5 se neshoduje\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU Hack Rychlosti" @@ -3820,11 +4101,11 @@ msgstr "Soubory MadCatz Gameshark (*.gcs)" msgid "Main Stick" msgstr "Hlavní Stick" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "ID Výrobce:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "Výrobce:" @@ -3850,6 +4131,7 @@ msgstr "Bajt Paměti" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3865,12 +4147,19 @@ msgstr "Bajt Paměti" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Paměťová karta" #: Source/Core/DolphinWX/Src/MemcardManager.h:36 -msgid "Memory Card Manager WARNING-Make backups before using, should be fixed but could mangle stuff!" -msgstr "Správce Paměťových karet Varování-Před použitím zálohujte, měl by být spravený, ale mohl by věci poškodit!" +msgid "" +"Memory Card Manager WARNING-Make backups before using, should be fixed but " +"could mangle stuff!" +msgstr "" +"Správce Paměťových karet Varování-Před použitím zálohujte, měl by být " +"spravený, ale mohl by věci poškodit!" #: Source/Core/Core/Src/CoreParameter.cpp:369 #, c-format @@ -3897,7 +4186,7 @@ msgstr "Velikost paměťové karty se neshoduje s velikosti hlavičky" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "Mikrofon" @@ -3906,11 +4195,11 @@ msgstr "Mikrofon" msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "Ostatní" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Ostatní Nastavení" @@ -3921,15 +4210,17 @@ msgstr "Modifikátor" #: 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 "" -"Změnit textury, aby zobrazovali formát, v kterém jsou zakódovány. Ve většině případů vyžaduje resetovaní emulace.\n" +"Změnit textury, aby zobrazovali formát, v kterém jsou zakódovány. Ve většině " +"případů vyžaduje resetovaní emulace.\n" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "Písmo se stejnou roztečí" @@ -3942,7 +4233,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3964,9 +4255,13 @@ msgstr "" msgid "Multiply" msgstr "Násobit" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -msgid "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No effect on emulated wiimotes." -msgstr "Ztlumí reproduktor Wiimote. Spravuje náhodná odpojování u opravdových Wiimote. Žádný efekt na emulovaná Wiimote." +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +msgid "" +"Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " +"effect on emulated wiimotes." +msgstr "" +"Ztlumí reproduktor Wiimote. Spravuje náhodná odpojování u opravdových " +"Wiimote. Žádný efekt na emulovaná Wiimote." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:126 msgid "NP Add" @@ -4056,6 +4351,7 @@ msgstr "NK Nahoru" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 @@ -4068,6 +4364,9 @@ msgstr "NK Nahoru" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4076,7 +4375,7 @@ msgstr "Jméno:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Jméno: " @@ -4090,7 +4389,7 @@ msgid "New Scan" msgstr "Nové Skenování" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "Další Stránka" @@ -4102,7 +4401,7 @@ msgstr "Další Skenování" msgid "Nickname :" msgstr "Přezdívka :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "Žádná Země (SDK)" @@ -4141,7 +4440,7 @@ msgstr "Nebyl nalezen žádný ukládací adresář pro název %s" msgid "None" msgstr "Žádný" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Norský Bokmål" @@ -4149,8 +4448,8 @@ msgstr "Norský Bokmål" msgid "Not Equal" msgstr "Nerovná se" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "Nenastaven" @@ -4178,7 +4477,7 @@ msgstr "Nepřipojen" msgid "Notes" msgstr "Poznámky" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "Poznámky:" @@ -4216,7 +4515,7 @@ msgstr "Objekt" msgid "Object Range" msgstr "Rozsah Objektu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Vypnuto" @@ -4250,11 +4549,11 @@ msgstr "Pouze bloky %d jsou dostupné" msgid "Open" msgstr "Otevřít" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "Otevřít &adresář umístění" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "Otevřít Wii adre&sář uložení" @@ -4276,11 +4575,11 @@ msgstr "OpenAL: nelze nalézt zvuková zařízení" msgid "OpenAL: can't open device %s" msgstr "OpenAL: nelze otevřít zařízení %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "OpenCL Dekodér Textury" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "OpenMP Dekodér Textury" @@ -4312,13 +4611,16 @@ msgstr "" "a importujte je do nové paměťové karty\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "Jiné" #: Source/Core/Core/Src/NetPlayClient.cpp:206 -msgid "Other client disconnected while game is running!! NetPlay is disabled. You manually stop the game." -msgstr "Jiný klient odpojen při běhu hry!! NetPlay je vypnut. Hru ukončete ručně." +msgid "" +"Other client disconnected while game is running!! NetPlay is disabled. You " +"manually stop the game." +msgstr "" +"Jiný klient odpojen při běhu hry!! NetPlay je vypnut. Hru ukončete ručně." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 msgid "Output" @@ -4360,16 +4662,16 @@ msgstr "Odstavec" msgid "Parameters" msgstr "Parametry" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Oddíl %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Záplaty" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Cesty" @@ -4377,6 +4679,7 @@ msgstr "Cesty" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ======= @@ -4393,6 +4696,10 @@ msgstr "Cesty" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pozastavit" @@ -4401,7 +4708,7 @@ msgstr "Pozastavit" msgid "Per-Pixel Lighting" msgstr "Osvětlení Podle Pixelu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Dokonalá" @@ -4429,6 +4736,7 @@ msgstr "Perspektiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< 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 @@ -4436,6 +4744,10 @@ msgstr "Perspektiva %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Spustit" @@ -4449,7 +4761,7 @@ msgstr "Přehrát nahrávku" msgid "Play/Pause" msgstr "Přehrát/Pozastavit" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "Hratelné" @@ -4465,6 +4777,7 @@ msgstr "Hráči" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 @@ -4478,6 +4791,9 @@ msgstr "Hráči" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Prosím potvrďte..." @@ -4489,23 +4805,23 @@ msgstr "Před uložením si prosím vytvořte perspektivu" msgid "Plus-Minus" msgstr "Plus-Mínus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Polština" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Port 4" @@ -4514,11 +4830,11 @@ msgstr "Port 4" msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portugalština" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portugalština (Brazilská)" @@ -4526,17 +4842,17 @@ msgstr "Portugalština (Brazilská)" msgid "Post-Processing Effect:" msgstr "Efekt Následného Zpracování:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "Předčasný konec filmu v PlayController. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "Předčasný konec filmu v PlayWiimote. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "Předčasný konec filmu v PlayWiimote. %u > %u" @@ -4549,7 +4865,7 @@ msgstr "Předvolby:" msgid "Prev Page" msgstr "Před. stránka" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "Předchozí Stránka" @@ -4600,7 +4916,7 @@ msgstr "Pravý Analog" msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "RUSKO" @@ -4613,7 +4929,7 @@ msgstr "Rozsah" msgid "Read-only mode" msgstr "Režim pouze pro čtení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "Opravdová" @@ -4692,6 +5008,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 @@ -4720,6 +5037,12 @@ msgstr "Obnovit seznam her" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Odstranit" @@ -4777,11 +5100,11 @@ msgstr "Pravý Stick" msgid "Rumble" msgstr "Vibrace" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Spustit DSP LLE na samostatném vlákně (nedoporučeno)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Ruština" @@ -4789,6 +5112,7 @@ msgstr "Ruština" msgid "Sa&ve State" msgstr "Uložit Sta&v" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -4811,6 +5135,13 @@ msgstr "Bezpečná" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +msgid "Safe" +msgstr "Bezpečná" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Vzorkovací frekvence:" @@ -4868,12 +5199,12 @@ msgstr "Uložit do Slotu Stavu 8" msgid "Save State..." msgstr "Uložit Stav..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Uložit jako" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Uložit komprimované GCM/ISO" @@ -4881,11 +5212,11 @@ msgstr "Uložit komprimované GCM/ISO" msgid "Save current perspective" msgstr "Uložit současnou perspektivu" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "Uložit dekomprimované GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Uložený stav filmu %s je poškozen, nahrávání filmu je zastaveno..." @@ -4901,6 +5232,7 @@ msgstr "EFB Kopie Změněné Velikosti" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ======= ======= @@ -4912,15 +5244,18 @@ msgstr "EFB Kopie Změněné Velikosti" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Skenuji %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "Skenuji pro ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "Skenuji..." @@ -4936,14 +5271,12 @@ msgstr "Scroll Lock" msgid "Search Filter" msgstr "Hledat Filtr" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Hledat Podadresáře" -#: 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:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "Sekce %s nebyla v SYSCONF nalezena" @@ -4953,6 +5286,7 @@ msgstr "Sekce %s nebyla v SYSCONF nalezena" msgid "Select" msgstr "Vybrat" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4985,6 +5319,14 @@ msgstr "Vyberte Soubor s Nahrávkou" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Vyberte Soubor s Nahrávkou" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Vyberte soubor Wii WAD k instalování" @@ -5014,6 +5356,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" @@ -5034,16 +5377,20 @@ msgstr "Vyberte stav k nahrání" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Vyberte soubor s uloženou hrou" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Vyberte stav k nahrání" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. ======= @@ -5055,6 +5402,9 @@ msgstr "Vyberte stav k nahrání" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Vyberte stav k uložení" @@ -5074,34 +5424,39 @@ msgstr "" "Vynutit 4:3: Roztáhne obraz na poměr4:3.\n" "Roztáhnout do okna: Roztáhne obraz do velikosti okna." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Vybraný typ písma" #: 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 "" "Vybere rozlišení obrazovky použité v režimu celé obrazovky.\n" -"To by mělo být vždycky větší než nebo rovno vnitřnímu rozlišení. Dopad na výkon je zanedbatelný.\n" +"To by mělo být vždycky větší než nebo rovno vnitřnímu rozlišení. Dopad na " +"výkon je zanedbatelný.\n" "\n" "Pokud si nejste jisti, použijte Vaše rozlišení obrazovky.\n" -"Pokud si stále nejste jisti, použijte takové nejvyšší rozlišení, které Vám funguje." +"Pokud si stále nejste jisti, použijte takové nejvyšší rozlišení, které Vám " +"funguje." #: 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 "" "Zvolí jaké bude vnitřně grafické API použito.\n" -"Direct3D 9 je většinou nejrychlejší. OpenGL je ale nejpřesnější. Direct3D 11 je někde mezi nimi.\n" +"Direct3D 9 je většinou nejrychlejší. OpenGL je ale nejpřesnější. Direct3D 11 " +"je někde mezi nimi.\n" "Nezapomeňte, že backendy Direct3D jsou dostupné pouze ve Windows.\n" "\n" "Pokud si nejste jisti, použijte Direct3D 9" @@ -5118,23 +5473,26 @@ msgstr "Umístění Senzorové Tyče:" msgid "Separator" msgstr "Oddělovač" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Srbština" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 -msgid "Serial Port 1 - This is the port which devices such as the net adapter use" -msgstr "Sériový port 1 - Tito je port, který používají zařízení jako internetový adaptér" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +msgid "" +"Serial Port 1 - This is the port which devices such as the net adapter use" +msgstr "" +"Sériový port 1 - Tito je port, který používají zařízení jako internetový " +"adaptér" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 msgid "Set" msgstr "Nastavit" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "Nastavit jako &výchozí ISO" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "Nastavit jako výchozí paměťovou kartu %c" @@ -5144,7 +5502,7 @@ msgstr "Nastavit jako výchozí paměťovou kartu %c" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "SetARCode_IsActive: Index je větší než velikost seznamu ar kódu %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "Nastavení..." @@ -5156,7 +5514,7 @@ msgstr "SetupWiiMem: Nelze najít soubor s nastavením" msgid "Shake" msgstr "Třes" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "Krátké Jméno:" @@ -5184,7 +5542,7 @@ msgstr "Zobrazit Panel Nás&trojů" msgid "Show Drives" msgstr "Zobrazit Disky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "Zobrazit EFB Regiony Kopie" @@ -5200,7 +5558,7 @@ msgstr "Zobrazit Francii" msgid "Show GameCube" msgstr "Zobrazit GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "Zobrazit Obrazovku Vstupu" @@ -5216,7 +5574,7 @@ msgstr "Zobrazit JAP" msgid "Show Korea" msgstr "Zobrazit Koreu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "Jazyk Zobrazení:" @@ -5236,7 +5594,7 @@ msgstr "Zobrazit Platformy" msgid "Show Regions" msgstr "Zobrazit Regiony" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "Zobrazit Statistiky" @@ -5256,45 +5614,49 @@ msgstr "Zobrazit Wad" msgid "Show Wii" msgstr "Zobrazit Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "Zobrazí rámeček s potvrzením před zastavením hry." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 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 "" "Zobrazit rámeček se zprávou, při zjištění potenciálně závažné chyby.\n" -"Vypnutím tohoto se můžete vyhnout otravným a nezávažným zprávám, ale Dolphin může také být náhle ukončen bez jakéhokoliv vysvětlení." +"Vypnutím tohoto se můžete vyhnout otravným a nezávažným zprávám, ale Dolphin " +"může také být náhle ukončen bez jakéhokoliv vysvětlení." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "Zobrazit první blok" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "Zobrazit uložené bloky" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "Zobrazit komentář uložení" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "Zobrazit ikonu uložení" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "Zobrazit název uložení" #: 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 "" -"Zobrazí počet snímků vykreslených za sekundu jako měřítko rychlosti emulace.\n" +"Zobrazí počet snímků vykreslených za sekundu jako měřítko rychlosti " +"emulace.\n" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." @@ -5320,7 +5682,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Šikmý Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Zjednodušená čínština" @@ -5328,11 +5690,11 @@ msgstr "Zjednodušená čínština" msgid "Size" msgstr "Velikost" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "Přeskočit BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "Vypnout Průchod Cíl. Průhl." @@ -5342,11 +5704,13 @@ msgstr "Přeskočit EFB Přístup z Procesoru" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 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 "" -"Přeskočit průchod cílové průhlednosti používaný ve většině her pro různé grafické efekty.\n" +"Přeskočit průchod cílové průhlednosti používaný ve většině her pro různé " +"grafické efekty.\n" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." @@ -5354,13 +5718,15 @@ 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 "" "Lehce zrychlí kopie EFB do RAM obětováním přesnosti emulace.\n" "Někdy také zvýší kvalitu obrazu.\n" -"Pokud se setkáváte s jakýmikoliv problémy, zkuste zvýšit přesnost textury, nebo tuto možnost vypnout.\n" +"Pokud se setkáváte s jakýmikoliv problémy, zkuste zvýšit přesnost textury, " +"nebo tuto možnost vypnout.\n" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." @@ -5370,11 +5736,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Slot B" @@ -5388,15 +5754,18 @@ msgstr "Softwarový Vykreslovač" #: 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 "" -"Softwarové vykreslování je řádově pomalejší, než při použití ostatních backendů.\n" +"Softwarové vykreslování je řádově pomalejší, než při použití ostatních " +"backendů.\n" "Je užitečné pouze pro účely ladění.\n" -"Opravdu chcete zapnout softwarové vykreslování? Pokud si nejste jisti, zvolte 'Ne'." +"Opravdu chcete zapnout softwarové vykreslování? Pokud si nejste jisti, " +"zvolte 'Ne'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "Nastavení Zvuku" @@ -5418,6 +5787,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 @@ -5441,6 +5811,11 @@ msgstr "Mezerník" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Španělština" @@ -5450,13 +5825,21 @@ msgstr "Hlasitost Reproduktoru:" #: 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 "" -"Určuje rozlišení, v kterém bude vykresleno. Vysoké rozlišení vlemi zvýší kvalitu obrazu, ale je také o dost náročnější na výkon a může způsobovat v některých hrách chyby.\n" -"\"Násobek 640x528\" je o trochu pomalejší než \"Velikost Okna\", ale také nezpůsobuje tolik problémů. Obecně řečeno, čím nižší je vnitřní rozlišení, tím lepší výkon bude.\n" +"Určuje rozlišení, v kterém bude vykresleno. Vysoké rozlišení vlemi zvýší " +"kvalitu obrazu, ale je také o dost náročnější na výkon a může způsobovat v " +"některých hrách chyby.\n" +"\"Násobek 640x528\" je o trochu pomalejší než \"Velikost Okna\", ale také " +"nezpůsobuje tolik problémů. Obecně řečeno, čím nižší je vnitřní rozlišení, " +"tím lepší výkon bude.\n" "\n" "Pokud si nejste jisti, zvolte 640x528." @@ -5464,7 +5847,7 @@ msgstr "" msgid "Specify a video backend" msgstr "Určit backend videa" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Zvýšit rychlost přenosu Disku" @@ -5472,7 +5855,7 @@ msgstr "Zvýšit rychlost přenosu Disku" msgid "Square Stick" msgstr "Čtvercový Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "Standardní Ovladač" @@ -5550,12 +5933,14 @@ msgstr "Zastavit" #: 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 "" "Ukládat EFB kopie do objektů textury grafického procesoru.\n" -"Toto není přesné, ale pro většinu her funguje dostatečně dobře a dává větší zrychlení než EFB do RAM.\n" +"Toto není přesné, ale pro většinu her funguje dostatečně dobře a dává větší " +"zrychlení než EFB do RAM.\n" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." @@ -5584,12 +5969,12 @@ msgstr "Uložení byly úspěšně importovány" msgid "Swing" msgstr "Švihnutí" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Jazyk Systému:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "TCHAJ-WAN" @@ -5635,7 +6020,7 @@ msgstr "Deska vpravo" msgid "Take Screenshot" msgstr "Vytvořit Snímek Obrazovky" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "TaruKonga (Bonga)" @@ -5651,7 +6036,7 @@ msgstr "Textura" msgid "Texture Cache" msgstr "Vyrovnávací Paměť Textur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "Překryv Formátu Textury" @@ -5667,13 +6052,13 @@ msgstr "Adresa je neplatná" msgid "The checksum was successfully fixed" msgstr "Kontrolní součet byl úspěšně opraven" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "Zvolený adresář je už v seznamu" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5684,15 +6069,19 @@ 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 "Soubor %s nemohl být otevřen pro zápis. Zkontrolujte, prosím, je-li už otevřen jiným programem." +msgid "" +"The file %s could not be opened for writing. Please check if it's already " +"opened by another program." +msgstr "" +"Soubor %s nemohl být otevřen pro zápis. Zkontrolujte, prosím, je-li už " +"otevřen jiným programem." #: Source/Core/AudioCommon/Src/WaveFile.cpp:44 #, c-format msgid "The file %s was already open, the file header will not be written." msgstr "Soubor %s je už otevřen, hlavička souboru nebude zapsána." -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Zadaný soubor (%s) neexistuje" @@ -5710,12 +6099,15 @@ msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "Výsledný rozšifrovaný kód AR neobsahuje žádné řádky." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#, fuzzy 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." +"If unsure, use the rightmost value." msgstr "" -"Čím bezpečnější toto bude, tím bude méně pravděpodobné, že emulátoru budou chybět jakékoliv aktualizace textur z RAM.\n" +"Čím bezpečnější toto bude, tím bude méně pravděpodobné, že emulátoru budou " +"chybět jakékoliv aktualizace textur z RAM.\n" "\n" "Pokud si nejste jisti, použijte druhou nejrychlejší hodnotu zprava." @@ -5724,8 +6116,12 @@ msgid "The save you are trying to copy has an invalid file size" msgstr "Uložená hra, kterou se snažíte zkopírovat má neplatnou délku souboru" #: Source/Core/DolphinWX/Src/Main.cpp:353 -msgid "The selected language is not supported by your system. Falling back to system default." -msgstr "Zvolený jazyk není Vašim systémem podporován. Vracím se na výchozí jazyk systému." +msgid "" +"The selected language is not supported by your system. Falling back to " +"system default." +msgstr "" +"Zvolený jazyk není Vašim systémem podporován. Vracím se na výchozí jazyk " +"systému." #: Source/Core/Core/Src/NetPlayClient.cpp:43 msgid "The server and client's NetPlay versions are incompatible!" @@ -5752,7 +6148,7 @@ msgstr "Zadaný soubor \"%s\" neexistuje" msgid "The value is invalid" msgstr "Hodnota je neplatná" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Vzhled" @@ -5760,11 +6156,15 @@ msgstr "Vzhled" msgid "Theme selection went wrong" msgstr "Výběr vzhledu se zvrtl" -#: 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 "Musí existovat lístek pro 00000001/00000002. Vaše NAND vypsání je pravděpodobně neúplné" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 +msgid "" +"There must be a ticket for 00000001/00000002. Your NAND dump is probably " +"incomplete." +msgstr "" +"Musí existovat lístek pro 00000001/00000002. Vaše NAND vypsání je " +"pravděpodobně neúplné" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5773,52 +6173,52 @@ msgstr "" "Neurčený znamená, že hra použije nastavení Dolphin." #: Source/Core/Core/Src/ActionReplay.cpp:356 -msgid "This action replay simulator does not support codes that modify Action Replay itself." -msgstr "Tento simulátor action replay nepodporuje kód, který mění samotný Action Replay." +msgid "" +"This action replay simulator does not support codes that modify Action " +"Replay itself." +msgstr "" +"Tento simulátor action replay nepodporuje kód, který mění samotný Action " +"Replay." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "Toto může způsobit zpomalení ve Wii Menu a v některých hrách." #: 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 "" "Tato funkce Vám umožňuje si pohrát s herní kamerou.\n" -"Podržte pravé tlačítko myši a pohybujte s ní pro změnu pohledu kamery. Podržte SHIFT a zmáčkněte jednu z kláves WASD, abyste kamerou pohnuli v určité vzdálenosti kroku (SHIFT+0 pro rychlejší pohyb a SHIFT+9 pro pomalejší). Stiskněte SHIFT+R k resetu kamery.\n" +"Podržte pravé tlačítko myši a pohybujte s ní pro změnu pohledu kamery. " +"Podržte SHIFT a zmáčkněte jednu z kláves WASD, abyste kamerou pohnuli v " +"určité vzdálenosti kroku (SHIFT+0 pro rychlejší pohyb a SHIFT+9 pro " +"pomalejší). Stiskněte SHIFT+R k resetu kamery.\n" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." #: 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" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" -"Toto je použito pro kontrolu rychlosti hry pomocí přiškrcení zvuku.\n" -"Vypnutí tohoto může způsobit nesprávnou rychlost hry, např. příliš rychle.\n" -"Ale někdy zapnutím můžete způsobit nepřetržitý hluk.\n" -"\n" -"Klávesová Zkratka : Podržte pro okamžité vypnutí Zaškrcení." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." -msgstr "Toto se používá pro přehrávání hudebních stop, jako např. hudba v pozadí." +msgstr "" +"Toto se používá pro přehrávání hudebních stop, jako např. hudba v pozadí." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 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 "" "Toto rozdělí vlákna Obrazu a Procesoru, takže běží na oddělených jádrech.\n" -"Způsobí výrazné zvýšení rychlosti na PC s více než jedním jádrem, ale také může způsobovat občasné chyby/pády." +"Způsobí výrazné zvýšení rychlosti na PC s více než jedním jádrem, ale také " +"může způsobovat občasné chyby/pády." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "Tohle Vám umožní Ručně Upravovat konfigurační soubory INI" @@ -5841,7 +6241,7 @@ msgstr "Název" msgid "To" msgstr "Do" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "Zapnout Všechny Typy Záznamů" @@ -5873,6 +6273,7 @@ msgstr "Přepnout na Celou Obrazovku" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5880,14 +6281,17 @@ msgstr "Přepnout na Celou Obrazovku" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Nahoře" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Tradiční Čínština" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "Pokus o načtení souboru neznámého typu." @@ -5895,8 +6299,7 @@ msgstr "Pokus o načtení souboru neznámého typu." msgid "Triggers" msgstr "Spínače" -#: Source/Core/Common/Src/SysConf.h:92 -#: Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Pokus o čtení z neplatného SYSCONF" @@ -5908,7 +6311,7 @@ msgstr "" "Pokus o čtení z neplatného SYSCONF\n" "ID bt wiimote nejsou dostupné" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Turečtina" @@ -5929,11 +6332,11 @@ msgstr "UDP Port:" msgid "UDP Wiimote" msgstr "UDP Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "NEZNÁMÝ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "USA" @@ -5948,10 +6351,12 @@ 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 "" -"Nelze analyzovat řádek %lu zadaného kódu AR jako platný zašifrovaný nebo rozšifrovaný kód. Ujistěte se, že jste ho správně zadali.\n" +"Nelze analyzovat řádek %lu zadaného kódu AR jako platný zašifrovaný nebo " +"rozšifrovaný kód. Ujistěte se, že jste ho správně zadali.\n" "Chtěli byste tento řádek ignorovat a pokračovat v analýze?" #: Source/Core/DolphinWX/Src/FrameTools.cpp:404 @@ -6024,7 +6429,7 @@ msgstr "Aktualizovat" msgid "Upright Wiimote" msgstr "Svislý Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Použít režim EuRGB60 (PAL60)" @@ -6036,7 +6441,7 @@ msgstr "Použít Celou Obrazovku" msgid "Use Hex" msgstr "Použít Šestnáctkovou soustavu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Použít Obslužné Rutiny Paniky" @@ -6048,23 +6453,26 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Použít více vláken k dekódování textur.\n" -"Může vést ke zrychlení (zvláště u procesorů, která mají více než dvě jádra).\n" +"Může vést ke zrychlení (zvláště u procesorů, která mají více než dvě " +"jádra).\n" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." #: 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 "" "Normálně pokud kompilace shadera selže, je zobrazena chybová zpráva.\n" -"Nicméně, zaškrtnutím této možnosti tyto vyskakovací okna přeskočíte, což Vám umožní nepřerušované hraní.\n" +"Nicméně, zaškrtnutím této možnosti tyto vyskakovací okna přeskočíte, což Vám " +"umožní nepřerušované hraní.\n" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "Pomůcky" @@ -6088,25 +6496,29 @@ msgstr "Hodnota:" msgid "Verbosity" msgstr "Úroveň" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Obraz" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Virtuální" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Hlasitost" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "Instalace WAD selhala: chyba při vytváření %s" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "Instalace WAD selhala: chyba při vytváření %s" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -6125,15 +6537,15 @@ msgstr "" msgid "Warning" msgstr "Varování" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "Varování - DOL se spouští ve špatném režimu konzole!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Varování - ELF se spouští ve špatném režimu konzole!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Varování - ISO se spouští ve špatném režimu konzole!" @@ -6161,37 +6573,62 @@ msgstr "" "a mají stejný název jako soubor na Vaši paměťové kartě\n" "Pokračovat?" -#: 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 "Varování: Načetli jste uloženou pozici, která je umístěna po skončení současného filmu. (bajt %u > %u) (snímek %u > %u). Před pokračováním byste měli načíst jinou pozici, nebo tento stav načíst bez zapnutého režimu pouze pro čtení." - -#: 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 "Varování: Načetli jste uloženou pozici, jejíž film má neshodu v bajtu %d (0x%X). Před pokračováním byste měli načíst jinou pozici, nebo tento stav načíst bez zapnutého režimu pouze pro čtení. Jinak pravděpodobně dojde k desynchronizaci." - -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:667 #, 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" +"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 "" +"Varování: Načetli jste uloženou pozici, která je umístěna po skončení " +"současného filmu. (bajt %u > %u) (snímek %u > %u). Před pokračováním byste " +"měli načíst jinou pozici, nebo tento stav načíst bez zapnutého režimu pouze " +"pro čtení." + +#: Source/Core/Core/Src/Movie.cpp:684 +#, 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 "" +"Varování: Načetli jste uloženou pozici, jejíž film má neshodu v bajtu %d (0x" +"%X). Před pokračováním byste měli načíst jinou pozici, nebo tento stav " +"načíst bez zapnutého režimu pouze pro čtení. Jinak pravděpodobně dojde k " +"desynchronizaci." + +#: Source/Core/Core/Src/Movie.cpp:693 +#, 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" +"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" +"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" +"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 "" -"Varování: Načetli jste uloženou pozici, jejíž film má neshodu ve snímku %d. Před pokračováním byste měli načíst jinou pozici, nebo tento stav načíst bez zapnutého režimu pouze pro čtení. Jinak pravděpodobně dojde k desynchronizaci.\n" +"Varování: Načetli jste uloženou pozici, jejíž film má neshodu ve snímku %d. " +"Před pokračováním byste měli načíst jinou pozici, nebo tento stav načíst bez " +"zapnutého režimu pouze pro čtení. Jinak pravděpodobně dojde k " +"desynchronizaci.\n" "\n" -"Další informace: Současný film je dlouhý %d snímků a uložený stav filmu je dlouhý %d snímků.\n" +"Další informace: Současný film je dlouhý %d snímků a uložený stav filmu je " +"dlouhý %d snímků.\n" "\n" "Ve snímku %d současný film stiskává:\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" +"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" "Na snímku %d, film uloženého stavu stiskává:\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" +"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" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 @@ -6202,7 +6639,7 @@ msgstr "WaveFileWriter - soubor není otevřen." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "Hack Širokoúhlého obrazu" @@ -6210,15 +6647,15 @@ msgstr "Hack Širokoúhlého obrazu" msgid "Width" msgstr "Šířka" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Konzole Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Wii Kořen NAND:" @@ -6230,6 +6667,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 @@ -6243,6 +6681,9 @@ msgstr "Import uložených pozic Wii" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii soubory s uložením (*.bin)|*.bin" @@ -6317,7 +6758,7 @@ msgstr "Klávesa Windows Menu" msgid "Windows Right" msgstr "Klávesa Windows Vpravo" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "Zalamování textu" @@ -6325,6 +6766,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 @@ -6344,6 +6786,11 @@ msgstr "Zalamování textu" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Pracuji..." @@ -6351,6 +6798,11 @@ msgstr "Pracuji..." msgid "Write to Console" msgstr "Zapsat do Konzole" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "Zapsat do Souboru" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "Zapsat do Souboru" @@ -6400,13 +6852,15 @@ msgstr "Musíte zadat jméno!" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 msgid "You must enter a valid decimal, hexadecimal or octal value." -msgstr "Musíte zadat platnou hodnotu v desítkové, šestnáctkové nebo osmičkové soustavě." +msgstr "" +"Musíte zadat platnou hodnotu v desítkové, šestnáctkové nebo osmičkové " +"soustavě." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 msgid "You must enter a valid profile name." msgstr "Musíte zadat platné jméno profilu." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Pro uplatnění změn musíte Dolphin restartovat." @@ -6429,7 +6883,7 @@ msgstr "" "Měl by být 0x%04x (ale je 0x%04llx)\n" "Chcete vytvořit nový?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "ZTP hack" @@ -6466,14 +6920,19 @@ msgstr "[Vlastní]" #: 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 "" "[EXPERIMENTÁLNÍ]\n" -"Usiluje o zrychlení emulace tím, že dekódování textury přenechá grafickému procesoru použitím struktury OpenCL.\n" -"Nicméně v tuto dobu je známo, že způsobuje vady textur v různých hrách. Také je ve většině případů pomalejší, než normální dekódování textur přes procesor.\n" +"Usiluje o zrychlení emulace tím, že dekódování textury přenechá grafickému " +"procesoru použitím struktury OpenCL.\n" +"Nicméně v tuto dobu je známo, že způsobuje vady textur v různých hrách. Také " +"je ve většině případů pomalejší, než normální dekódování textur přes " +"procesor.\n" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." @@ -6486,7 +6945,8 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "[EXPERIMENTÁLNÍ]\n" -"Trochu zrychlí emulaci ukládáním předvytvořených objektů do vyrovnávací paměti\n" +"Trochu zrychlí emulaci ukládáním předvytvořených objektů do vyrovnávací " +"paměti\n" "Může ale také způsobovat problémy\n" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." @@ -6495,7 +6955,7 @@ msgstr "" msgid "^ ADD" msgstr "^ PŘIDAT" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "zavaděč aplikace (.img)" @@ -6526,12 +6986,12 @@ msgstr "není uložená hra wii nebo nelze číst z hlavičky souboru o velikost msgid "s" msgstr "s" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "neznámý příkaz 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute při běhu aplikace vrátil -1!" @@ -6695,6 +7155,9 @@ msgstr "| NEBO" #~ msgid "Emulator Display Settings" #~ msgstr "Obrazová Nastavení Emulátoru" +#~ msgid "Enable Audio Throttle" +#~ msgstr "Zapnout Přiškrcení Zvuku" + #~ msgid "Enable CPU Access" #~ msgstr "Povolit Přístup k Procesoru" @@ -6738,6 +7201,13 @@ msgstr "| NEBO" #~ msgid "Error allocating buffer" #~ msgstr "Chyba při alokaci vyrovnávací paměti" +#~ 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í." + #~ msgid "Error opening file %s for recording" #~ msgstr "Chyba při otevírání souboru %s pro nahrávání" @@ -6955,6 +7425,20 @@ msgstr "| NEBO" <<<<<<< HEAD ======= >>>>>>> Update from master branch. +#~ msgid "" +#~ "This is used to control game speed by sound throttle.\n" +#~ "Disabling this could cause abnormal game speed, such as too fast.\n" +#~ "But sometimes enabling this could cause constant noise.\n" +#~ "\n" +#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." +#~ msgstr "" +#~ "Toto je použito pro kontrolu rychlosti hry pomocí přiškrcení zvuku.\n" +#~ "Vypnutí tohoto může způsobit nesprávnou rychlost hry, např. příliš " +#~ "rychle.\n" +#~ "Ale někdy zapnutím můžete způsobit nepřetržitý hluk.\n" +#~ "\n" +#~ "Klávesová Zkratka : Podržte pro okamžité vypnutí Zaškrcení." + #~ msgid "" #~ "Unknown pointer %#08x\n" #~ "Continue?" diff --git a/Languages/po/de.po b/Languages/po/de.po index 52e4251e01..6ed4fa1ca7 100644 --- a/Languages/po/de.po +++ b/Languages/po/de.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -16,6 +17,9 @@ msgstr "" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Update from master branch. +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-02-17 01:23+0100\n" "Last-Translator: LucasX \n" "Language-Team: \n" @@ -57,9 +61,9 @@ msgstr "\"%s\" ist ein ungültiges GC/Wii-Image, oder kein GC/Wii-Image." msgid "%1$sCopy%1$s" msgstr "%1$sKopie%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -154,7 +158,7 @@ msgstr "%sGCI exportieren%s" msgid "%sImport GCI%s" msgstr "%sGCI importieren%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u freie Blöcke; %u freie Verzeichniseinträge" @@ -187,11 +191,11 @@ msgstr "&Cheat Manager" msgid "&DSP Settings" msgstr "&DSP Einstellungen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "ISO &löschen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "Ausgewählte ISOs &löschen" @@ -255,7 +259,7 @@ msgstr "Pau&se" msgid "&Play" msgstr "&Start" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&Eigenschaften" @@ -299,7 +303,7 @@ msgstr "&Ansicht" msgid "&Wiimote Settings" msgstr "&Wiimote Einstellungen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "" @@ -343,7 +347,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -352,7 +356,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -409,13 +413,13 @@ msgstr "" "\n" "TCP Port zum Hoster muss geöffnet sein!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "AR Codes" @@ -427,11 +431,11 @@ msgstr "Über Dolphin" msgid "Acceleration" msgstr "Beschleunigung" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Genaue VBeam Emulation" @@ -547,11 +551,11 @@ msgstr "Grafikkarte:" msgid "Add" msgstr "Hinzufügen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "ActionReplay Code hinzufügen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "Patch hinzufügen" @@ -559,6 +563,7 @@ msgstr "Patch hinzufügen" msgid "Add new pane" msgstr "Neue Palette hinzufügen" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -574,6 +579,11 @@ msgstr "Neue Palette hinzufügen" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Hinzufügen..." @@ -621,11 +631,11 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "Einstellung des benötigten Drucks um Analoge Tasten zu aktivieren." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "Erweitert" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Erweiterte Einstellungen" @@ -634,14 +644,15 @@ msgstr "Erweiterte Einstellungen" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Alle GC/Wii Dateien (elf, dol, gcm, iso, ciso, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Alle GC/Wii Images (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "Alle Gamecube GCM Dateien (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -654,18 +665,22 @@ msgstr "Alle Gamecube GCM Dateien (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Alle Speicherstände (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "Alle Wii ISO Dateien (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Alle komprimierten GC/Wii ISO Dateien (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "Alle Dateien (*.*)|*.*" @@ -677,7 +692,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "Emulierte Wiimote" @@ -699,7 +714,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "Kann Apploader aus dieser Datei nicht laden." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Apploader:" @@ -714,7 +729,7 @@ msgid "" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "" @@ -723,7 +738,7 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "Sind Sie sicher, dass Sie \"%s\" löschen möchten?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -731,11 +746,12 @@ msgstr "" "Sollen diese Dateien wirklich gelöscht werden?\n" "Löschen kann nicht rückgängig gemacht werden!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 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 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -745,6 +761,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Seitenverhältnis:" @@ -753,18 +772,20 @@ msgstr "Seitenverhältnis:" msgid "At least one pane must remain open." msgstr "Mindestens eine Palette muss geöffnet bleiben." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Audio Backend:" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Fehler beim öffnen des AO-Gerätes.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -774,6 +795,9 @@ msgstr "AudioCommon: Fehler beim öffnen des AO-Gerätes.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automatisch" @@ -814,7 +838,7 @@ msgstr "" msgid "Back" msgstr "Zurück" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Backend Einstellungen" @@ -842,11 +866,11 @@ msgstr "Ungültige Header-Datei" msgid "Banner" msgstr "Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "Banner Details" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "Banner:" @@ -858,7 +882,7 @@ msgstr "Leiste" msgid "Basic" msgstr "Standard" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Grundeinstellungen" @@ -889,6 +913,7 @@ msgstr "Blau rechts" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -896,6 +921,9 @@ msgstr "Blau rechts" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Unten" @@ -904,7 +932,7 @@ msgstr "Unten" msgid "Bound Controls: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Defekt" @@ -920,7 +948,7 @@ msgstr "Ordner suchen und hinzufügen" msgid "Browse for an ISO directory..." msgstr "ISO-Verzeichnis hinzufügen..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "Ausgabeverzeichnis auswählen" @@ -951,11 +979,11 @@ msgstr "C-Stick" msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "CPU Emulator Engine" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 #, fuzzy msgid "Cache Display Lists" msgstr "Anzeigeliste zwischenspeichern" @@ -996,7 +1024,7 @@ msgstr "Kann %s nicht öffnen" msgid "Cannot unregister events with events pending" msgstr "Kann Ereignisse mit Ereignis-_Pending_ nicht unregistrieren." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1006,7 +1034,7 @@ msgstr "" "Diese Datei kann nicht als Memorycard verwendet werden.\n" "Versuchen Sie die gleiche Datei zugleich in _both_ Slots zu verwenden?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 #, fuzzy msgid "" "Cannot use that file as a memory card.\n" @@ -1025,8 +1053,6 @@ msgstr "Kann WiiMote bei BD: %02x:%02x:%02x:%02x:%02x:%02x nicht finden." msgid "Cant find WiiMote by connection handle %02x" msgstr "Kann Wiimote bei Verbindungs-Handle %02x nicht finden." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1036,7 +1062,7 @@ msgstr "Kann von DVD_Plugin/DVD-Schnittstelle nicht lesen: Fataler Fehler" msgid "Caps Lock" msgstr "Feststellen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "" @@ -1061,7 +1087,7 @@ msgstr "Disc wechseln" msgid "Change Game" msgstr "Spiel wechseln" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1079,8 +1105,8 @@ msgstr "Parameter _sign_ zu zFar ändern (nach Korrektur)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Parameter _sign_ zu zNear ändern (nach Korrektur)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "" "Änderung dieser Option zeigt keine Auswirkung, solange die Emulation läuft." @@ -1101,32 +1127,32 @@ msgstr "Cheat Suche" msgid "Cheats Manager" msgstr "Cheat Manager" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Chinesisch (Vereinfacht)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Chinesisch (Traditionell)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "Wähle ein Standard DVD-Verzeichnis:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 #, fuzzy msgid "Choose a NAND root directory:" msgstr "Wähle ein Standard DVD-Verzeichnis:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Standard ISO auswählen:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "Ordner zum Hinzufügen auswählen." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Datei zum Öffnen auswählen" @@ -1134,15 +1160,15 @@ msgstr "Datei zum Öffnen auswählen" msgid "Choose a memory card:" msgstr "Wähle eine Memory Card:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" "Wähle eine Datei als Apploader aus: (Gilt nur für Discs aus Verzeichnissen)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Ordner zum Extrahieren auswählen" @@ -1154,14 +1180,14 @@ msgstr "" msgid "Classic" msgstr "Klassik" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "Löschen" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "Löschen fehlgeschlagen." @@ -1177,6 +1203,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 @@ -1185,6 +1212,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Schließen" @@ -1208,20 +1239,20 @@ msgstr "Befehl" msgid "Comment" msgstr "Kommentar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Kommentar:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "ISO komprimieren..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Ausgewählte ISOs komprimieren..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "Komprimiere ISO" @@ -1248,13 +1279,13 @@ msgstr "Pads konfigurieren" msgid "Configure..." msgstr "Konfigurieren..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "Überschreiben Bestätigen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 #, fuzzy msgid "Confirm on Stop" msgstr "Bestätigung beim Beenden" @@ -1264,7 +1295,7 @@ msgstr "Bestätigung beim Beenden" msgid "Connect" msgstr "Verbinden" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "USB-Keyboard anschließen" @@ -1321,12 +1352,12 @@ msgstr "Zu GCI konvertieren" msgid "Copy failed" msgstr "Kopieren fehlgeschlagen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "Auf Memcard %c kopieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "Kern" @@ -1356,7 +1387,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Konnte ISO-Datei %s nicht erkennen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "Konnte %s nicht speichern." @@ -1371,7 +1402,7 @@ msgstr "" "derzeit!\n" "(Pads während der Emulation einzustellen, wird noch nicht unterstützt.)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1384,7 +1415,7 @@ msgstr "" "Führen Sie Dolphin von einer CD/DVD aus, oder ist die Speicherdatei " "vielleicht schreibgeschützt?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "Konnte denn Befehl zum öffnen der Dateierweiterung 'ini' nicht finden!" @@ -1402,7 +1433,7 @@ msgstr "" msgid "Count:" msgstr "Anzahl:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "Land:" @@ -1416,26 +1447,26 @@ msgstr "AR-Code erstellen" msgid "Create new perspective" msgstr "Neue Perspektive erstellen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "Erstellt von KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Erstellt von Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "Erstellt von VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" "Erstellt von black_rider und veröffentlicht auf ForumW.org > Web Developments" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "Ersteller: " @@ -1443,7 +1474,7 @@ msgstr "Ersteller: " msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "Abschneiden" @@ -1464,7 +1495,7 @@ msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "" "Aktuelles Verzeichnis wird gemäß wxFileSelector von %s nach %s geändert!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "Benutzerdefinierter Projection-Hack" @@ -1472,11 +1503,11 @@ msgstr "Benutzerdefinierter Projection-Hack" msgid "Custom Projection Hack Settings" msgstr "Benutzerdefinierter Projection-Hack Einstellungen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "Einige orthographische Projection Parameter anpassen." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Tschechisch" @@ -1488,10 +1519,11 @@ msgstr "D-Pad" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "DSP Emulator Engine" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1502,19 +1534,23 @@ msgstr "DSP Emulator Engine" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE Emulation (schnell)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE Interpreter (langsam)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 #, fuzzy msgid "DSP LLE on Thread" msgstr "DSP LLE in eigenem Thread ausführen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP LLE Recompiler" @@ -1522,15 +1558,23 @@ msgstr "DSP LLE Recompiler" msgid "DSP settings" msgstr "DSP Einstellungen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "DVD Laufwerk:" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "Datengröße" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "Datum:" @@ -1551,7 +1595,7 @@ msgstr "Tote Zone" msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 #, fuzzy msgid "Debugging" msgstr "Debug" @@ -1560,16 +1604,16 @@ msgstr "Debug" msgid "Decimal" msgstr "Dezimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "ISO dekomprimieren..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "Ausgewählte ISOs dekomprimieren..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "Dekomprimiere ISO" @@ -1577,11 +1621,11 @@ msgstr "Dekomprimiere ISO" msgid "Default" msgstr "Standard" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "Standard ISO:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "Standard Schriftart" @@ -1590,7 +1634,7 @@ msgstr "Standard Schriftart" msgid "Delete" msgstr "Löschen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "Spielstand löschen" @@ -1599,7 +1643,7 @@ msgstr "Spielstand löschen" msgid "Delete the existing file '%s'?" msgstr "Wollen Sie die vorhandende Datei '%s' löschen?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 #, fuzzy msgid "Description" msgstr "Frage" @@ -1608,8 +1652,8 @@ msgstr "Frage" msgid "Detect" msgstr "Erkenne" -#: 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 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." @@ -1620,8 +1664,8 @@ msgstr "" msgid "Device" msgstr "Gerät" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Geräteeinstellungen" @@ -1646,25 +1690,25 @@ msgstr "" "und ebenfalls die Backup-Verzeichnis-Prüfsumme." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 #, fuzzy msgid "Disable" msgstr "kein Nebel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "kein Nebel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "keine Beleuchtung" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 #, fuzzy msgid "Disable Per-Pixel Depth" msgstr "Farbtiefe" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "keine Texturen" @@ -1694,7 +1738,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Disc" @@ -1718,6 +1762,7 @@ msgstr "" msgid "Divide" msgstr "Dividieren" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1727,10 +1772,13 @@ msgstr "Dividieren" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Laufende Emulation stoppen?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1756,6 +1804,7 @@ msgstr "Dolphin Emulierte-Wiimote Einstellungen" msgid "Dolphin FIFO" msgstr "Dolphin" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1780,6 +1829,14 @@ msgstr "Dolphin GCPad Konfiguration" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GCPad Konfiguration" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Filme (*.dtm)" @@ -1812,11 +1869,11 @@ msgstr "" msgid "Down" msgstr "Runter" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "Codes Herunterladen (WiiRD Database)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "%lu Codes heruntergeladen. (%lu hinzugefügt)" @@ -1825,23 +1882,23 @@ msgstr "%lu Codes heruntergeladen. (%lu hinzugefügt)" msgid "Drums" msgstr "Trommeln" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "Dummy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "Audio dumpen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "EFB-Target dumpen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "Frames dumpen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "Texturen dumpen" @@ -1867,6 +1924,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1882,6 +1940,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Holländisch" @@ -1907,7 +1970,7 @@ msgstr "" "aktualisiert haben, wird jezt wahrscheinlich ein Neustart benötigt, damit " "Windows denn neuen Treiber ladet." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "EUROPA" @@ -1923,7 +1986,7 @@ msgstr "Bearbeiten" msgid "Edit ActionReplay Code" msgstr "ActionReplay Code bearbeiten" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Einstellungen bearbeiten" @@ -1935,8 +1998,8 @@ msgstr "Patch bearbeiten" msgid "Edit current perspective" msgstr "Aktuelle Ansicht ändern" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "Bearbeiten..." @@ -1975,7 +2038,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Emulierte Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "Emulierbarkeit:" @@ -1997,23 +2060,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "AR Logging aktivieren" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "Audio-Throttle aktivieren" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "BAT aktivieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Blockvereinigung aktivieren" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -2027,6 +2090,7 @@ msgstr "" msgid "Enable Cache" msgstr "Cache verwenden" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2036,52 +2100,55 @@ msgstr "Cache verwenden" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Cheats aktivieren" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "DTK Musik aktivieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Dual Core aktivieren" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Dual Core aktivieren (Beschleunigung)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "Tastenkürzel aktivieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Idle-Skipping aktivieren" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Idle-Skipping aktivieren (Beschleunigung)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "MMU aktivieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "Vollbildverfahren aktivieren" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 #, fuzzy msgid "Enable Screen Saver" msgstr "Breitbildmodus" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "Breitbildmodus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "Drahtgitter aktivieren" @@ -2097,7 +2164,7 @@ msgstr "" "Anisotropische Filterung aktivieren.\n" "Verbessert die Grafikqualität bei schrägen Blickwinkeln." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2105,7 +2172,7 @@ msgstr "" "Aktiviert schnellen Zugriff auf die Disc. Wird für einige Spiele benötigt. " "(ON = Schnell, OFF = Kompatibel)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "Blättern verwenden" @@ -2125,7 +2192,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2133,7 +2200,7 @@ msgstr "" "Dies aktivieren, um \"The Legend of Zelda: Twilight Princess\" zu " "beschleunigen. Dies für JEDES andere Spiel deaktivieren." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2143,7 +2210,7 @@ msgstr "" "Speicherverwaltungs-Einheit. Präzise für die Hardware, aber langsamer zu " "Emulieren. (ON = Kompatibel, OFF = Schnell)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "Benutzerdefinierten Projection-Hack aktivieren" @@ -2155,7 +2222,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2174,6 +2241,7 @@ msgstr "" msgid "End" msgstr "Ende" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2189,6 +2257,11 @@ msgstr "Ende" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Englisch" @@ -2219,6 +2292,7 @@ msgstr "Gleich" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Fehler" @@ -2249,20 +2323,26 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "Fehler" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "Fehler beim Laden der ausgewählten Sprache. Kehre nun zu dem Systemstandart " "zurück." -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, 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 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2298,7 +2378,7 @@ msgstr "Dolphin mit Emulator beenden." msgid "Export Failed" msgstr "Exportieren fehlgeschlagen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "Datei exportieren" @@ -2311,15 +2391,15 @@ msgstr "Aufnahme exportieren" msgid "Export Recording..." msgstr "Aufnahme exportieren..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "Spielstand exportieren" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "Wii Spielstand exportieren (Experimentell)..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "Alle Spielstände exportieren" @@ -2335,7 +2415,7 @@ msgstr "Spielstand exportieren als..." msgid "Extension" msgstr "Erweiterung" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 #, fuzzy msgid "External Frame Buffer" msgstr "Extra Parameter" @@ -2348,44 +2428,44 @@ msgstr "Extra Parameter" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Extra Parameter nur in ''Metroid: Other M'' sinnvoll." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "Alle Dateien extrahieren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "Apploader extrahieren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "DOL extrahieren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "Ordner extrahieren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "Datei extrahieren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "Partition extrahieren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "Extrahiere %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "Alle Dateien extrahieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "Ordner extrahieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "Extrahieren..." @@ -2398,11 +2478,11 @@ msgstr "" msgid "FIFO Player" msgstr "Spieler" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "FRANKREICH" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "FST Größe:" @@ -2415,11 +2495,11 @@ msgstr "Verbindungsaufbau fehlgeschlagen!" msgid "Failed to Listen!!" msgstr "_Listen_ Fehlgeschlagen!!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "Download von Codes ist Fehlgeschlagen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Entpacken nach %s ist Fehlgeschlagen!" @@ -2529,19 +2609,29 @@ msgstr "Fehler beim Schreiben eines Header für %s" msgid "Failed to write header for file %d" msgstr "Fehler beim Schreiben eines Header für Datei %d" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "Schnell" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 #, fuzzy msgid "Fast Mipmaps" msgstr "Native Mipmaps laden" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "Schnellere Version der MMU. Funktioniert nicht mit allen Spielen." +#: Source/Core/Core/Src/Movie.cpp:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 #, fuzzy msgid "Fifo Player" @@ -2552,7 +2642,7 @@ msgstr "Spieler" msgid "File Info" msgstr "Code Info" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "Datei enthielt keine Codes." @@ -2585,16 +2675,16 @@ msgstr "Diese Datei wird nicht als Memorycard anerkannt." msgid "File not compressed" msgstr "Datei nicht komprimiert" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Unbekanter Open-Modus : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "Dateisystem" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Der Datentyp 'ini' ist unbekannt! Wird nicht geöffnet!" @@ -2602,7 +2692,7 @@ msgstr "Der Datentyp 'ini' ist unbekannt! Wird nicht geöffnet!" msgid "First Block" msgstr "Erster Block" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "Prüfsummen korrigieren" @@ -2614,7 +2704,7 @@ msgstr "16:9 erzwingen" msgid "Force 4:3" msgstr "4:3 erzwingen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 #, fuzzy msgid "Force Console as NTSC-J" msgstr "Konsole auf NTSC-J umschalten" @@ -2648,7 +2738,7 @@ msgstr "" "Zwingt das Spiel, Grafiken für Breitbild-Auflösungen auszugeben.\n" "Dies kann Grafikfehler verursachen!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2683,7 +2773,7 @@ msgstr "Einzelbildwiedergabe" msgid "Frame Advance" msgstr "Einzelbildwiedergabe" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 #, fuzzy msgid "Frame Dumps use FFV1" msgstr "Frame-Dumps verwenden FFV1" @@ -2697,7 +2787,7 @@ msgstr "Einzelbildwiedergabe" msgid "Frame S&kipping" msgstr "Frames ü&berspringen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Framelimit:" @@ -2705,10 +2795,11 @@ msgstr "Framelimit:" msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "Frei Umsehen" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2724,6 +2815,11 @@ msgstr "Frei Umsehen" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Französisch" @@ -2758,7 +2854,7 @@ msgstr "Tastenkürzel Einstellungen" msgid "GCPad" msgstr "GC-Pad" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "Spiel ID:" @@ -2774,15 +2870,15 @@ msgstr "Spiel wird nicht emuliert!" msgid "Game not found!!" msgstr "Spiel nicht gefunden!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "Spiel-Spezifische Einstellungen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Spieleinstellungen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" @@ -2794,6 +2890,7 @@ msgstr "Gamecube-&Pad Einstellungen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2801,6 +2898,9 @@ msgstr "Gamecube-&Pad Einstellungen" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube Memory Cards (*.raw,*.gcp)" @@ -2809,15 +2909,17 @@ msgid "Gamecube Pad settings" msgstr "Gamecube Pad Einstellungen" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Gecko Codes" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" "Fehler beim Starten des GeckoCode (CT%i CST%i) (%s)\n" "(Entweder ist der Code Fehlerhafter oder der Code-Typ wird noch nicht " @@ -2833,8 +2935,12 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Allgemein" @@ -2844,6 +2950,7 @@ msgstr "Allgemein" msgid "General Settings" msgstr "Interface Einstellungen" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2859,6 +2966,11 @@ msgstr "Interface Einstellungen" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Deutsch" @@ -2890,7 +3002,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Griechisch" @@ -2922,7 +3034,7 @@ msgstr "" msgid "Header checksum failed" msgstr "Header-Prüfsumme fehlerhaft" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Hebräisch" @@ -2992,12 +3104,16 @@ msgstr "Tastenkürzel Einstellungen" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Tastenkürzel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Ungarisch" @@ -3005,14 +3121,14 @@ msgstr "Ungarisch" msgid "Hybrid Wiimote" msgstr "Hybrid Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS: Versucht Daten von einem unbekannten Ticket zu bekommen: " "%08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -3025,11 +3141,11 @@ msgstr "" "TitleID %016llx.\n" " Dolphin wird wahrscheinlich jetzt hängen bleiben." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - Fehlerhafte Beschreibung" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "IPL Einstellungen" @@ -3045,15 +3161,15 @@ msgstr "IR-Zeiger" msgid "IR Sensitivity:" msgstr "IR-Empfindlichkeit" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "ISO Details" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "ISO Verzeichnisse" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "ITALIEN" @@ -3061,23 +3177,25 @@ msgstr "ITALIEN" msgid "Icon" msgstr "Symbol" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "Wenn die FPS sprunghaft ist, kann diese Option helfen. (ON = Kompatibel, OFF " "= Schnell)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy 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." +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " +"Audio to throttle using the DSP (might fix audio clicks but can also cause " +"constant noise depending on the game)." msgstr "" "Wenn das Framelimit höher als die Maximalgeschwindigkeit des Spiels " "(NTSC:60, PAL:50) eingestellt ist, muss Audio Throttle in den DSP-" @@ -3106,7 +3224,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "Spielstand importieren" @@ -3155,7 +3273,7 @@ msgstr "" "Beleuchtung Deaktivieren. Verbessert die Performance, aber schaltet " "Beleuchtung in Spielen ab, die sie benutzen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "Ingame" @@ -3164,7 +3282,7 @@ msgid "In-Game" msgstr "In-Game" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info" @@ -3184,7 +3302,7 @@ msgstr "Einfügen" msgid "Insert Encrypted or Decrypted code here..." msgstr "Verschlüsselten oder unverschlüsselten Code hier eingeben..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "SD-Karte einlegen" @@ -3197,7 +3315,7 @@ msgstr "Namen hier eingeben.." msgid "Install WAD" msgstr "Wii-Menü installieren" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Zum Wii-Menü hinzufügen" @@ -3208,6 +3326,7 @@ msgstr "" "InstallExceptionHandler aufgerufen, aber diese Platform unterstüzt diesn " "noch nicht." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3217,16 +3336,19 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Installing WAD..." msgstr "WAD ins Wii-Menü installieren..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 #, fuzzy msgid "Interface" msgstr "Interface Einstellungen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "Interface Einstellungen" @@ -3253,11 +3375,11 @@ msgstr "Internationaler LZO-Fehler - lzo_init() fehlerhaft" msgid "Internal Resolution:" msgstr "Vollbildauflösung:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Interpreter (SEHR langsam)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "Intro" @@ -3274,7 +3396,7 @@ msgstr "Ungültigen Wert!" msgid "Invalid bat.map or dir entry" msgstr "Ungültige bat.map oder Verzeichnis-Eintrag" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "Ungültiger Ereignis-Typ %i" @@ -3294,14 +3416,15 @@ msgstr "" "%s\n" " Möglicherweise müssen Sie dieses Spiel neu dumpen." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "Ungültige Aufnahmedatei" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "Ungültiger Status" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3317,27 +3440,32 @@ msgstr "Ungültiger Status" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italienisch" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "JAPAN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT Recompiler (empfohlen)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL experimenteller Recompiler" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japanisch" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "KOREA" @@ -3346,8 +3474,8 @@ msgstr "KOREA" msgid "Key" msgstr "Taste" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Koreanisch" @@ -3365,7 +3493,7 @@ msgstr "L Taste" msgid "L-Analog" msgstr "L-Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "Sprache:" @@ -3418,7 +3546,7 @@ msgstr "" msgid "Less Than" msgstr "Kleiner als" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "" @@ -3426,7 +3554,7 @@ msgstr "" msgid "Load" msgstr "Laden" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 #, fuzzy msgid "Load Custom Textures" msgstr "Hochauflösende Texturen laden" @@ -3475,6 +3603,7 @@ msgstr "Status aus Slot 8 laden" msgid "Load State..." msgstr "Status laden..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3484,10 +3613,14 @@ msgstr "Status laden..." ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "Wii-Menü laden (%d %c)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 @@ -3497,6 +3630,9 @@ msgstr "Wii-Menü laden (%d %c)" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii-Menü laden (%d %c)" @@ -3522,7 +3658,7 @@ msgstr "Lade die ausgewählte Datei (DOL, ELF, GCM, ISO, WAD)" msgid "Local" msgstr "Lokal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 #, fuzzy msgid "Lock Threads to Cores" msgstr "Threads an Cores binden" @@ -3536,12 +3672,12 @@ msgstr "Log" msgid "Log Configuration" msgstr "Tastenkürzel Einstellungen" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 #, fuzzy msgid "Log Types" msgstr "Typ" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 #, fuzzy msgid "Logger Outputs" msgstr "Ausgabe" @@ -3572,7 +3708,7 @@ msgstr "" "MD5 Konflikt\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU Speed Hack" @@ -3594,11 +3730,11 @@ msgstr "MadCatz Gameshark Dateien(*.gcs)" msgid "Main Stick" msgstr "Main Stick" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "Hersteller ID" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "Hersteller:" @@ -3623,6 +3759,7 @@ msgstr "Speicher" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3630,6 +3767,9 @@ msgstr "Speicher" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Memory Card" @@ -3666,7 +3806,7 @@ msgstr "" msgid "Menu" msgstr "Menü" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "Mikrofon" @@ -3676,11 +3816,11 @@ msgstr "Mikrofon" msgid "Min" msgstr "Mikrofon" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "Sonstiges" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Sonstige Einstellungen" @@ -3697,7 +3837,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "Monospaced Schriftart" @@ -3710,7 +3850,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3725,7 +3865,7 @@ msgstr "" msgid "Multiply" msgstr "Stern" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3816,6 +3956,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Hoch" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3825,6 +3966,9 @@ msgstr "NP Hoch" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3833,7 +3977,7 @@ msgstr "Name:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Name: " @@ -3847,7 +3991,7 @@ msgid "New Scan" msgstr "Neuer Scan" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "Nächste Seite" @@ -3859,7 +4003,7 @@ msgstr "Nächster Scan" msgid "Nickname :" msgstr "Nickname:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "Kein Land (SDK)" @@ -3899,7 +4043,7 @@ msgstr "Keinen Spielstand-Ordner für Tittel %s gefunden." msgid "None" msgstr "Keine" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Norwegisch" @@ -3907,8 +4051,8 @@ msgstr "Norwegisch" msgid "Not Equal" msgstr "Ungleich" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "Nicht Festgelegt" @@ -3928,7 +4072,7 @@ msgstr "Nicht Verbunden" msgid "Notes" msgstr "Notizen" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "Notizen: " @@ -3966,7 +4110,7 @@ msgstr "" msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Aus" @@ -3992,11 +4136,11 @@ msgstr "Nur %d Blöcke verfügbar" msgid "Open" msgstr "Öffnen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "Beinhaltenden &Ordner öffnen..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "&Wii Spielstand-Ordner öffnen..." @@ -4018,11 +4162,11 @@ msgstr "OpenAL: Kann kein Sound-Gerät finden" msgid "OpenAL: can't open device %s" msgstr "OpenAL: Kann Gerät %s nicht öffnen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "" @@ -4055,7 +4199,7 @@ msgstr "" "und importiere die Spielstände auf eine neue Memorycard.\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "" @@ -4107,19 +4251,20 @@ msgstr "Paragraph" msgid "Parameters" msgstr "Parameter" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partition %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Patches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Pfade" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4132,6 +4277,10 @@ msgstr "Pfade" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -4141,7 +4290,7 @@ msgstr "Pause" msgid "Per-Pixel Lighting" msgstr "Pixel Beleuchtung" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Perfekt" @@ -4154,6 +4303,7 @@ msgstr "Perspektive %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 ======= @@ -4164,6 +4314,10 @@ msgstr "Perspektive %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Start" @@ -4177,7 +4331,7 @@ msgstr "Aufnahme abspielen" msgid "Play/Pause" msgstr "Start/Pause" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "Spielbar" @@ -4190,6 +4344,7 @@ msgstr "Optionen" msgid "Players" msgstr "Spieler" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4199,6 +4354,9 @@ msgstr "Spieler" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Bitte Bestätigen..." @@ -4210,23 +4368,23 @@ msgstr "Bitte legen Sie vor dem Speichern eine Perspektive fest" msgid "Plus-Minus" msgstr "Plus-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Polnisch" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Port 4" @@ -4235,11 +4393,11 @@ msgstr "Port 4" msgid "Port :" msgstr "Port:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portugiesisch" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portugiesisch (Brasilianisch)" @@ -4248,17 +4406,17 @@ msgstr "Portugiesisch (Brasilianisch)" msgid "Post-Processing Effect:" msgstr "Post-Processing Shader:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4271,7 +4429,7 @@ msgstr "" msgid "Prev Page" msgstr "Vorh. Seite" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "Vorherige Seite" @@ -4322,7 +4480,7 @@ msgstr "R-Analog" msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "RUSSLAND" @@ -4335,7 +4493,7 @@ msgstr "Weite" msgid "Read-only mode" msgstr "Nur-Lese-Modus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "Echt" @@ -4414,6 +4572,7 @@ msgstr "Liste aktualisieren" msgid "Refresh game list" msgstr "Spieleliste aktualisieren" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4432,6 +4591,12 @@ msgstr "Spieleliste aktualisieren" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Entfernen" @@ -4484,11 +4649,11 @@ msgstr "Stick rechts" msgid "Rumble" msgstr "Rumble" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Führt DSP LLE in einem eigenen Thread aus (nicht empfohlen)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Russisch" @@ -4496,10 +4661,11 @@ msgstr "Russisch" msgid "Sa&ve State" msgstr "S&tatus speichern" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "Sicher" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4509,6 +4675,9 @@ msgstr "Sicher" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Abtastrate:" @@ -4566,12 +4735,12 @@ msgstr "Status in Slot 8 speichern" msgid "Save State..." msgstr "Status speichern..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Speichern unter..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Komprimierte GCM/ISO speichern" @@ -4579,11 +4748,11 @@ msgstr "Komprimierte GCM/ISO speichern" msgid "Save current perspective" msgstr "Aktuelle Perspektive speichern" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "Dekomprimierte GCM/ISO speichern" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Film-Status %s ist fehlerhaft, breche die Filmaufnahme ab..." @@ -4593,6 +4762,7 @@ msgstr "Film-Status %s ist fehlerhaft, breche die Filmaufnahme ab..." msgid "Scaled EFB Copy" msgstr "EFB Scaled Copy" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4602,15 +4772,18 @@ msgstr "EFB Scaled Copy" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "Suche..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "Suche nach ISOs" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "Suche..." @@ -4626,12 +4799,12 @@ msgstr "Rollen Feststell" msgid "Search Filter" msgstr "Suchfilter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Unterordner durchsuchen" -#: 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:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "Ausgewähltes %s nicht gefunden in SYSCONF" @@ -4641,6 +4814,7 @@ msgstr "Ausgewähltes %s nicht gefunden in SYSCONF" msgid "Select" msgstr "Auswählen" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4665,6 +4839,14 @@ msgstr "Aufnahmedatei auswählen" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Aufnahmedatei auswählen" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Speicherdatei zum Importieren auswählen" @@ -4691,16 +4873,21 @@ msgstr "Wähle unverankerte Fenster" msgid "Select the file to load" msgstr "Datei zum Laden auswählen" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Wii-Spielstand auswählen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Status zum Laden auswählen" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 @@ -4720,6 +4907,9 @@ msgstr "Status zum Laden auswählen" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Status zum Speichern auswählen" @@ -4740,7 +4930,7 @@ msgstr "" "Erzwinge 4:3: Bild auf das Verhältnis 4:3 strecken.\n" "An Fenster anpassen: Bild auf Fenstergröße strecken." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Ausgewählte Schriftart" @@ -4776,11 +4966,11 @@ msgstr "Position der Sensorleiste:" msgid "Separator" msgstr "Trennzeichen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4791,11 +4981,11 @@ msgstr "" msgid "Set" msgstr "Zuweisen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "Als &Standard-ISO festlegen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "Als Standard-Speicherkarte %c auswählen" @@ -4806,7 +4996,7 @@ msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" "SetARCode_IsActive: Der Index ist größer als die AR-Code-Listengröße %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "Einstellungen..." @@ -4818,7 +5008,7 @@ msgstr "SetupWiiMem: Kann die Einstellungsdatei nicht finden" msgid "Shake" msgstr "Schütteln" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "Kurzer Name:" @@ -4847,7 +5037,7 @@ msgstr "&Werkzeugleiste anzeigen" msgid "Show Drives" msgstr "Laufwerke anzeigen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 #, fuzzy msgid "Show EFB Copy Regions" msgstr "EFB Kopie-Regionen" @@ -4864,7 +5054,7 @@ msgstr "Frankreich anzeigen" msgid "Show GameCube" msgstr "GameCube anzeigen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 #, fuzzy msgid "Show Input Display" msgstr "Italien anzeigen" @@ -4881,7 +5071,7 @@ msgstr "JAP anzeigen" msgid "Show Korea" msgstr "Korea anzeigen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "Sprache anzeigen:" @@ -4902,7 +5092,7 @@ msgstr "Plattformen anzeigen" msgid "Show Regions" msgstr "Regionen anzeigen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 #, fuzzy msgid "Show Statistics" msgstr "Statistiken" @@ -4923,11 +5113,11 @@ msgstr "Wad anzeigen" msgid "Show Wii" msgstr "Wii anzeigen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "Hinweisfenster anzeigen, bevor die Emulation beendet wird." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 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 " @@ -4939,23 +5129,23 @@ msgstr "" "aber es kann dann vorkommen, dass Dolphin plötzlich ohne eine Warnung " "abstürzt." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "Ersten Block anzeigen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "Blöcke anzeigen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "Kommentar anzeigen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "Symbol anzeigen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "Namen anzeigen" @@ -4987,7 +5177,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "_Seitwärts_ Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Vereinfachtes Chinesisch" @@ -4995,12 +5185,12 @@ msgstr "Vereinfachtes Chinesisch" msgid "Size" msgstr "Größe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 #, fuzzy msgid "Skip BIOS" msgstr "GC-BIOS überspringen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 #, fuzzy msgid "Skip Dest. Alpha Pass" msgstr "Dest. Alpha Pass ausschalten" @@ -5033,11 +5223,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Slot B" @@ -5057,7 +5247,7 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "Sound Einstelungen" @@ -5075,6 +5265,7 @@ msgstr "Erstellen des Sound-Buffer fehlgeschlagen: %s" msgid "Space" msgstr "Leertaste" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5090,6 +5281,11 @@ msgstr "Leertaste" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Spanisch" @@ -5113,7 +5309,7 @@ msgstr "" msgid "Specify a video backend" msgstr "Wähle ein Video-Backend" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Disc-Übertragungsrate beschleunigen" @@ -5121,7 +5317,7 @@ msgstr "Disc-Übertragungsrate beschleunigen" msgid "Square Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "Standard-Controller" @@ -5214,12 +5410,12 @@ msgstr "Die gespeicherte Datei wurde erfolgreich importiert" msgid "Swing" msgstr "Schwenken" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Systemsprache:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "TAIWAN" @@ -5259,7 +5455,7 @@ msgstr "" msgid "Take Screenshot" msgstr "Screenshot erstellen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -5276,7 +5472,7 @@ msgstr "Textur" msgid "Texture Cache" msgstr "Cache löschen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 #, fuzzy msgid "Texture Format Overlay" msgstr "Texturformat" @@ -5293,13 +5489,13 @@ msgstr "Die Adresse ist ungültig" msgid "The checksum was successfully fixed" msgstr "Die Prüfsumme wurde erfolgreich korrigiert" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "Der ausgewählte Ordner befindet sich bereits in der Liste" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5324,7 +5520,7 @@ msgstr "" "Die Datei %s wurde bereits geöffnet, der Header für die Datei wird nicht " "geschrieben." -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Die angegebene Datei (%s) existiert nicht" @@ -5346,7 +5542,7 @@ msgid "" "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." +"If unsure, use the rightmost value." msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 @@ -5389,7 +5585,7 @@ msgstr "Die ausgewählte Datei \"%s\" existiert nicht" msgid "The value is invalid" msgstr "Dieser Wert ist ungültig" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Theme" @@ -5397,7 +5593,7 @@ msgstr "Theme" msgid "Theme selection went wrong" msgstr "Theme-Auswahl schiefgelaufen" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5405,7 +5601,7 @@ msgstr "" "Es müsste ein Ticket für 00000001/00000002 vorhanden sein. Ihr NAND-Dump ist " "wahrscheinlich unvollständig." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5422,7 +5618,7 @@ msgstr "" "Dieser Action-Replay-Simulator unterstützt keine Codes, die sich selber " "verändern können." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "Dies könnte zu Verlangsamung im Wii-Menü und einigen Spielen führen." @@ -5438,26 +5634,10 @@ msgid "" msgstr "" #: 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" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" -"Wird verwendet, um die Spielgeschwindigkeit anhand der Audio-Drossel zu " -"steuern.\n" -"Deaktivieren kann zu unnormaler (z.B. zu schneller) Spielgeschwindigkeit " -"führen. \n" -"Aber manchmal kann das Aktivieren dauerhafte Störgeräusche verursachen.\n" -"\n" -"Tastaturkürzel : Zur Deaktivierung der Drossel gedrückt halten." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "Wird zur Wiedergabe von Musik (z.B. Hintergrundmusik) benutzt" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5470,7 +5650,7 @@ msgstr "" "als einem Kern,\n" "kann aber gelegentlich Abstürze/Fehler verursachen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "Erlaubt manuelles editieren der INI Konfigurationsdatei" @@ -5494,7 +5674,7 @@ msgstr "Titel" msgid "To" msgstr "Oben" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 #, fuzzy msgid "Toggle All Log Types" msgstr "Alle umschalten" @@ -5515,6 +5695,7 @@ msgstr "Vollbildmodus wechseln" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5522,14 +5703,17 @@ msgstr "Vollbildmodus wechseln" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Oben" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Traditionelles Chinesisch" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "Versuche gerade einen unbekannten Dateityp zu Laden." @@ -5537,7 +5721,7 @@ msgstr "Versuche gerade einen unbekannten Dateityp zu Laden." msgid "Triggers" msgstr "Schultertasten" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Versuche gerade eine ungültige SYSCONF zu Lesen" @@ -5549,7 +5733,7 @@ msgstr "" "Versuche gerade eine ungültige SYSCONF zu Lesen\n" "Wiimote BT-IDs sind nicht verfügbar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Türkisch" @@ -5570,11 +5754,11 @@ msgstr "UDP Port:" msgid "UDP Wiimote" msgstr "UDP Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "UNBEKANNT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "USA" @@ -5655,7 +5839,7 @@ msgstr "Update" msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 Modus (PAL60) verwenden" @@ -5668,7 +5852,7 @@ msgstr "&Vollbild" msgid "Use Hex" msgstr "Hex verwenden" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Warnmeldungen anzeigen" @@ -5689,7 +5873,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "Hilfsmittel" @@ -5713,25 +5897,29 @@ msgstr "Wert: " msgid "Verbosity" msgstr "Ausführung" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Video" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Virtuell" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Lautstärke" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, fuzzy, c-format msgid "WAD installation failed: error creating %s" msgstr "WAD-Installation fehlgeschlagen: _Fehler erstellt_ %S" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "WAD-Installation fehlgeschlagen: _Fehler erstellt_ %S" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5746,15 +5934,15 @@ msgstr "" msgid "Warning" msgstr "Warnungen" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "Warnung - Starte DOL im falschen Consolen-Modus!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Warnung - Starte ELF im falschen Consolen-Modus!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Warnung - Starte ISO im falschen Consolen-Modus!" @@ -5782,7 +5970,7 @@ msgstr "" "und hat den gleichen Namen wie die Datei auf Ihrer Memory-Card\n" "Fortfahren?" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5790,7 +5978,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5798,7 +5986,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5826,7 +6014,7 @@ msgstr "WaveFileWriter - Konnte Datei nicht öffnen." msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "Breitbild Hack" @@ -5834,15 +6022,15 @@ msgstr "Breitbild Hack" msgid "Width" msgstr "Weite" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Wii Konsole" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #, fuzzy msgid "Wii NAND Root:" msgstr "DVD Laufwerk:" @@ -5851,6 +6039,7 @@ msgstr "DVD Laufwerk:" msgid "Wii Save Import" msgstr "Wii Spielstand importieren" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5860,6 +6049,9 @@ msgstr "Wii Spielstand importieren" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii Speicherdateien (*.bin)|*.bin" @@ -5927,10 +6119,11 @@ msgstr "Windows Menü" msgid "Windows Right" msgstr "Windows Rechts" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "Zeilenumbruch" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -5946,6 +6139,11 @@ msgstr "Zeilenumbruch" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Arbeite..." @@ -5953,6 +6151,11 @@ msgstr "Arbeite..." msgid "Write to Console" msgstr "In Konsole ausgeben" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "In Datei ausgeben" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "In Datei ausgeben" @@ -6008,7 +6211,7 @@ msgstr "Sie müssen eine gültige Dezimalzahl oder gültigen Hex-Wert eingeben!" msgid "You must enter a valid profile name." msgstr "Sie müssen einen gültigen Profilamen eingeben!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Sie müssen Dolphin neu starten, damit die Änderungen wirksam werden." @@ -6029,7 +6232,7 @@ msgid "" msgstr "" "Ihre SYSCONF-Datei hat eine falsche Größe - Sollte 0x%04x (Aber ist 0x%04llx)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "ZTP Hack" @@ -6083,7 +6286,7 @@ msgstr "" msgid "^ ADD" msgstr "^ HINZUF." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "Apploader (.img)" @@ -6114,12 +6317,12 @@ msgstr "Dies ist kein Wii-Spielstand oder Lesefehler in Datei-Header-Größe %x" msgid "s" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "Unbekanter CMD 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute meldet -1 beim Start der Anwendung!" @@ -6405,6 +6608,9 @@ msgstr "| ODER" #~ msgid "Emulator Display Settings" #~ msgstr "Anzeige Einstellungen" +#~ msgid "Enable Audio Throttle" +#~ msgstr "Audio-Throttle aktivieren" + #~ msgid "Enable CPU Access" #~ msgstr "CPU-Zugriff aktivieren" @@ -6788,6 +6994,21 @@ msgstr "| ODER" #~ msgid "The file " #~ msgstr "Die Datei " +#~ msgid "" +#~ "This is used to control game speed by sound throttle.\n" +#~ "Disabling this could cause abnormal game speed, such as too fast.\n" +#~ "But sometimes enabling this could cause constant noise.\n" +#~ "\n" +#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." +#~ msgstr "" +#~ "Wird verwendet, um die Spielgeschwindigkeit anhand der Audio-Drossel zu " +#~ "steuern.\n" +#~ "Deaktivieren kann zu unnormaler (z.B. zu schneller) Spielgeschwindigkeit " +#~ "führen. \n" +#~ "Aber manchmal kann das Aktivieren dauerhafte Störgeräusche verursachen.\n" +#~ "\n" +#~ "Tastaturkürzel : Zur Deaktivierung der Drossel gedrückt halten." + #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "Wird zur Wiedergabe für Sprach- und Soundeffekten verwendet" diff --git a/Languages/po/dolphin-emu.pot b/Languages/po/dolphin-emu.pot index 271f6d526b..0f5636c238 100644 --- a/Languages/po/dolphin-emu.pot +++ b/Languages/po/dolphin-emu.pot @@ -10,6 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -17,6 +18,9 @@ msgstr "" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Update from master branch. +======= +"POT-Creation-Date: 2012-03-09 16:56-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -56,9 +60,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "" @@ -143,7 +147,7 @@ msgstr "" msgid "%sImport GCI%s" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "" @@ -176,11 +180,11 @@ msgstr "" msgid "&DSP Settings" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "" @@ -244,7 +248,7 @@ msgstr "" msgid "&Play" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "" @@ -288,7 +292,7 @@ msgstr "" msgid "&Wiimote Settings" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "" @@ -332,7 +336,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -341,7 +345,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -380,13 +384,13 @@ msgid "" "You must forward TCP port to host!!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "" @@ -398,11 +402,11 @@ msgstr "" msgid "Acceleration" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "" @@ -502,11 +506,11 @@ msgstr "" msgid "Add" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "" @@ -514,6 +518,7 @@ msgstr "" msgid "Add new pane" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -529,6 +534,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "" @@ -562,11 +572,11 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "" @@ -574,14 +584,15 @@ msgstr "" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -594,18 +605,22 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "" @@ -617,7 +632,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Alternate Wiimote Timing" msgstr "" @@ -637,7 +652,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "" @@ -652,7 +667,7 @@ msgid "" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "" @@ -661,16 +676,17 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -680,6 +696,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -688,18 +707,20 @@ msgstr "" msgid "At least one pane must remain open." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -709,6 +730,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "" @@ -744,7 +768,7 @@ msgstr "" msgid "Back" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "" @@ -771,11 +795,11 @@ msgstr "" msgid "Banner" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "" @@ -787,7 +811,7 @@ msgstr "" msgid "Basic" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "" @@ -818,6 +842,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -825,6 +850,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "" @@ -833,7 +861,7 @@ msgstr "" msgid "Bound Controls: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "" @@ -849,7 +877,7 @@ msgstr "" msgid "Browse for an ISO directory..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "" @@ -879,11 +907,11 @@ msgstr "" msgid "C-Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "" @@ -922,7 +950,7 @@ msgstr "" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -930,7 +958,7 @@ msgid "" "is not a valid gamecube memory card file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -946,8 +974,6 @@ msgstr "" msgid "Cant find WiiMote by connection handle %02x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -957,7 +983,7 @@ msgstr "" msgid "Caps Lock" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "" @@ -982,7 +1008,7 @@ msgstr "" msgid "Change Game" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -996,8 +1022,8 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "" @@ -1017,31 +1043,31 @@ msgstr "" msgid "Cheats Manager" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "" @@ -1049,14 +1075,14 @@ msgstr "" msgid "Choose a memory card:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 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 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "" @@ -1068,14 +1094,14 @@ msgstr "" msgid "Classic" msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "" @@ -1089,6 +1115,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 @@ -1097,6 +1124,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "" @@ -1120,20 +1151,20 @@ msgstr "" msgid "Comment" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "" @@ -1160,13 +1191,13 @@ msgstr "" msgid "Configure..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "" @@ -1175,7 +1206,7 @@ msgstr "" msgid "Connect" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "" @@ -1232,12 +1263,12 @@ msgstr "" msgid "Copy failed" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "" @@ -1264,7 +1295,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "" @@ -1275,7 +1306,7 @@ msgid "" "(setting pads while the game is running is not yet supported)" msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1284,7 +1315,7 @@ msgid "" "protected?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "" @@ -1299,7 +1330,7 @@ msgstr "" msgid "Count:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "" @@ -1313,24 +1344,24 @@ msgstr "" msgid "Create new perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "" @@ -1338,7 +1369,7 @@ msgstr "" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "" @@ -1358,7 +1389,7 @@ msgstr "" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "" @@ -1366,11 +1397,11 @@ msgstr "" msgid "Custom Projection Hack Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "" @@ -1382,10 +1413,11 @@ msgstr "" msgid "DSP" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1396,18 +1428,22 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "" @@ -1415,15 +1451,23 @@ msgstr "" msgid "DSP settings" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "" @@ -1444,7 +1488,7 @@ msgstr "" msgid "Debug" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "" @@ -1452,16 +1496,16 @@ msgstr "" msgid "Decimal" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "" @@ -1469,11 +1513,11 @@ msgstr "" msgid "Default" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "" @@ -1482,7 +1526,7 @@ msgstr "" msgid "Delete" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "" @@ -1491,7 +1535,7 @@ msgstr "" msgid "Delete the existing file '%s'?" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "" @@ -1499,8 +1543,8 @@ msgstr "" msgid "Detect" 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 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." @@ -1511,8 +1555,8 @@ msgstr "" msgid "Device" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "" @@ -1535,23 +1579,23 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "" @@ -1581,7 +1625,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "" @@ -1605,6 +1649,7 @@ msgstr "" msgid "Divide" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1614,10 +1659,13 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "" @@ -1642,6 +1690,7 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1666,6 +1715,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1694,11 +1751,11 @@ msgstr "" msgid "Down" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "" @@ -1707,23 +1764,23 @@ msgstr "" msgid "Drums" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "" @@ -1748,6 +1805,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1763,6 +1821,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "" @@ -1783,7 +1846,7 @@ msgid "" "driver." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "" @@ -1799,7 +1862,7 @@ msgstr "" msgid "Edit ActionReplay Code" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "" @@ -1811,8 +1874,8 @@ msgstr "" msgid "Edit current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "" @@ -1851,7 +1914,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "" @@ -1873,23 +1936,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -1902,6 +1965,7 @@ msgstr "" msgid "Enable Cache" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -1911,51 +1975,54 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "" @@ -1968,13 +2035,13 @@ msgid "" "If unsure, select 1x." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "" @@ -1994,20 +2061,20 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 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 "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "" @@ -2019,7 +2086,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2036,6 +2103,7 @@ msgstr "" msgid "End" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2051,6 +2119,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "" @@ -2081,6 +2154,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "" @@ -2111,18 +2185,24 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: 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 +#: Source/Core/Common/Src/ChunkFile.h:194 #, 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 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2154,7 +2234,7 @@ msgstr "" msgid "Export Failed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "" @@ -2167,15 +2247,15 @@ msgstr "" msgid "Export Recording..." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "" @@ -2191,7 +2271,7 @@ msgstr "" msgid "Extension" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "" @@ -2203,44 +2283,44 @@ msgstr "" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "" @@ -2252,11 +2332,11 @@ msgstr "" msgid "FIFO Player" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "" @@ -2268,11 +2348,11 @@ msgstr "" msgid "Failed to Listen!!" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "" @@ -2368,18 +2448,28 @@ msgstr "" msgid "Failed to write header for file %d" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "" +#: Source/Core/Core/Src/Movie.cpp:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "" @@ -2388,7 +2478,7 @@ msgstr "" msgid "File Info" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "" @@ -2417,16 +2507,16 @@ msgstr "" msgid "File not compressed" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" @@ -2434,7 +2524,7 @@ msgstr "" msgid "First Block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "" @@ -2446,7 +2536,7 @@ msgstr "" msgid "Force 4:3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "" @@ -2470,7 +2560,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2501,7 +2591,7 @@ msgstr "" msgid "Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "" @@ -2513,7 +2603,7 @@ msgstr "" msgid "Frame S&kipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "" @@ -2521,10 +2611,11 @@ msgstr "" msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2540,6 +2631,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "" @@ -2572,7 +2668,7 @@ msgstr "" msgid "GCPad" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "" @@ -2588,15 +2684,15 @@ msgstr "" msgid "Game not found!!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "" @@ -2607,6 +2703,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2614,6 +2711,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2622,21 +2722,24 @@ msgid "Gamecube Pad settings" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "" -#: Source/Core/Core/Src/GeckoCode.cpp:139 +#: Source/Core/Core/Src/GeckoCode.cpp:222 #, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 @@ -2645,6 +2748,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2653,6 +2759,7 @@ msgstr "" msgid "General Settings" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2668,6 +2775,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "" @@ -2699,7 +2811,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "" @@ -2731,7 +2843,7 @@ msgstr "" msgid "Header checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "" @@ -2791,12 +2903,16 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "" @@ -2804,12 +2920,12 @@ msgstr "" msgid "Hybrid Wiimote" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2818,11 +2934,11 @@ msgid "" " Dolphin will likely hang now" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "" @@ -2838,15 +2954,15 @@ msgstr "" msgid "IR Sensitivity:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "" @@ -2854,21 +2970,22 @@ msgstr "" msgid "Icon" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 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." +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " +"Audio to throttle using the DSP (might fix audio clicks but can also cause " +"constant noise depending on the game)." msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 @@ -2893,7 +3010,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "" @@ -2932,7 +3049,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "" @@ -2941,7 +3058,7 @@ msgid "In-Game" msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "" @@ -2961,7 +3078,7 @@ msgstr "" msgid "Insert Encrypted or Decrypted code here..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "" @@ -2973,7 +3090,7 @@ msgstr "" msgid "Install WAD" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "" @@ -2982,6 +3099,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -2991,14 +3109,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "" @@ -3021,11 +3142,11 @@ msgstr "" msgid "Internal Resolution:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "" @@ -3042,7 +3163,7 @@ msgstr "" msgid "Invalid bat.map or dir entry" msgstr "" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "" @@ -3059,14 +3180,15 @@ msgid "" " You may need to redump this game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3082,27 +3204,32 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "" @@ -3111,8 +3238,8 @@ msgstr "" msgid "Key" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "" @@ -3130,7 +3257,7 @@ msgstr "" msgid "L-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "" @@ -3176,7 +3303,7 @@ msgstr "" msgid "Less Than" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "" @@ -3184,7 +3311,7 @@ msgstr "" msgid "Load" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "" @@ -3232,6 +3359,7 @@ msgstr "" msgid "Load State..." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3253,6 +3381,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -3276,7 +3411,7 @@ msgstr "" msgid "Local" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "" @@ -3288,11 +3423,11 @@ msgstr "" msgid "Log Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "" @@ -3320,7 +3455,7 @@ msgid "" " %016llx%016llx != %016llx%016llx" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "" @@ -3342,11 +3477,11 @@ msgstr "" msgid "Main Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "" @@ -3370,6 +3505,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3377,6 +3513,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "" @@ -3405,7 +3544,7 @@ msgstr "" msgid "Menu" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "" @@ -3414,11 +3553,11 @@ msgstr "" msgid "Min" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "" @@ -3435,7 +3574,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "" @@ -3448,7 +3587,7 @@ msgstr "" msgid "Motor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3463,7 +3602,7 @@ msgstr "" msgid "Multiply" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3553,6 +3692,7 @@ msgstr "" msgid "NP Up" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3562,6 +3702,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3570,7 +3713,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "" @@ -3584,7 +3727,7 @@ msgid "New Scan" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "" @@ -3596,7 +3739,7 @@ msgstr "" msgid "Nickname :" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "" @@ -3635,7 +3778,7 @@ msgstr "" msgid "None" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "" @@ -3643,8 +3786,8 @@ msgstr "" msgid "Not Equal" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "" @@ -3664,7 +3807,7 @@ msgstr "" msgid "Notes" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "" @@ -3702,7 +3845,7 @@ msgstr "" msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "" @@ -3728,11 +3871,11 @@ msgstr "" msgid "Open" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "" @@ -3754,11 +3897,11 @@ msgstr "" msgid "OpenAL: can't open device %s" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "" @@ -3787,7 +3930,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "" @@ -3837,19 +3980,20 @@ msgstr "" msgid "Parameters" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -3862,6 +4006,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "" @@ -3870,7 +4018,7 @@ msgstr "" msgid "Per-Pixel Lighting" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "" @@ -3883,6 +4031,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -3893,6 +4042,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "" @@ -3906,7 +4059,7 @@ msgstr "" msgid "Play/Pause" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "" @@ -3918,6 +4071,7 @@ msgstr "" msgid "Players" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -3927,6 +4081,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "" @@ -3938,23 +4095,23 @@ msgstr "" msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "" @@ -3963,11 +4120,11 @@ msgstr "" msgid "Port :" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "" @@ -3975,17 +4132,17 @@ msgstr "" msgid "Post-Processing Effect:" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -3998,7 +4155,7 @@ msgstr "" msgid "Prev Page" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "" @@ -4049,7 +4206,7 @@ msgstr "" msgid "RAM" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "" @@ -4062,7 +4219,7 @@ msgstr "" msgid "Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "" @@ -4132,6 +4289,7 @@ msgstr "" msgid "Refresh game list" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4150,6 +4308,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "" @@ -4199,11 +4363,11 @@ msgstr "" msgid "Rumble" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "" @@ -4211,10 +4375,11 @@ msgstr "" msgid "Sa&ve State" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4224,6 +4389,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "" @@ -4281,12 +4449,12 @@ msgstr "" msgid "Save State..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "" @@ -4294,11 +4462,11 @@ msgstr "" msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -4307,6 +4475,7 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4316,15 +4485,18 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "" @@ -4340,12 +4512,12 @@ msgstr "" msgid "Search Filter" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 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:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "" @@ -4355,6 +4527,7 @@ msgstr "" msgid "Select" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4379,6 +4552,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "" @@ -4401,6 +4582,7 @@ msgstr "" msgid "Select the file to load" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 @@ -4417,19 +4599,26 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "" +<<<<<<< HEAD <<<<<<< 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. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "" @@ -4444,7 +4633,7 @@ msgid "" "If unsure, select Auto." msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "" @@ -4480,11 +4669,11 @@ msgstr "" msgid "Separator" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4493,11 +4682,11 @@ msgstr "" msgid "Set" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "" @@ -4507,7 +4696,7 @@ msgstr "" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "" @@ -4519,7 +4708,7 @@ msgstr "" msgid "Shake" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "" @@ -4547,7 +4736,7 @@ msgstr "" msgid "Show Drives" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "" @@ -4563,7 +4752,7 @@ msgstr "" msgid "Show GameCube" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "" @@ -4579,7 +4768,7 @@ msgstr "" msgid "Show Korea" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "" @@ -4599,7 +4788,7 @@ msgstr "" msgid "Show Regions" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "" @@ -4619,34 +4808,34 @@ msgstr "" msgid "Show Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 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." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "" @@ -4677,7 +4866,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "" @@ -4685,11 +4874,11 @@ msgstr "" msgid "Size" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "" @@ -4721,11 +4910,11 @@ msgstr "" msgid "Slot %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "" @@ -4745,7 +4934,7 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "" @@ -4763,6 +4952,7 @@ msgstr "" msgid "Space" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -4778,6 +4968,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "" @@ -4801,7 +4996,7 @@ msgstr "" msgid "Specify a video backend" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "" @@ -4809,7 +5004,7 @@ msgstr "" msgid "Square Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "" @@ -4902,12 +5097,12 @@ msgstr "" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "" @@ -4946,7 +5141,7 @@ msgstr "" msgid "Take Screenshot" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -4962,7 +5157,7 @@ msgstr "" msgid "Texture Cache" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "" @@ -4978,13 +5173,13 @@ msgstr "" msgid "The checksum was successfully fixed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5003,7 +5198,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "" @@ -5025,7 +5220,7 @@ msgid "" "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." +"If unsure, use the rightmost value." msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 @@ -5063,7 +5258,7 @@ msgstr "" msgid "The value is invalid" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "" @@ -5071,13 +5266,13 @@ msgstr "" msgid "Theme selection went wrong" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5089,7 +5284,7 @@ msgid "" "Replay itself." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "" @@ -5105,19 +5300,10 @@ msgid "" msgstr "" #: 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" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5125,7 +5311,7 @@ msgid "" "cause occasional crashes/glitches." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "" @@ -5148,7 +5334,7 @@ msgstr "" msgid "To" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "" @@ -5168,6 +5354,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5175,14 +5362,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "" @@ -5190,7 +5380,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:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "" @@ -5200,7 +5390,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "" @@ -5221,11 +5411,11 @@ msgstr "" msgid "UDP Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "" @@ -5303,7 +5493,7 @@ msgstr "" msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "" @@ -5315,7 +5505,7 @@ msgstr "" msgid "Use Hex" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "" @@ -5336,7 +5526,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "" @@ -5360,25 +5550,28 @@ msgstr "" msgid "Verbosity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +msgid "WAD installation failed: error creating ticket" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5393,15 +5586,15 @@ msgstr "" msgid "Warning" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "" @@ -5422,7 +5615,7 @@ msgid "" "Continue?" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5430,7 +5623,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5438,7 +5631,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5466,7 +5659,7 @@ msgstr "" msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "" @@ -5474,15 +5667,15 @@ msgstr "" msgid "Width" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "" @@ -5490,6 +5683,7 @@ msgstr "" msgid "Wii Save Import" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5499,6 +5693,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5561,10 +5758,11 @@ msgstr "" msgid "Windows Right" msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -5580,6 +5778,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "" @@ -5587,6 +5790,10 @@ msgstr "" msgid "Write to Console" msgstr "" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +msgid "Write to Debugger" +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "" @@ -5640,7 +5847,7 @@ msgstr "" msgid "You must enter a valid profile name." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" @@ -5658,7 +5865,7 @@ msgid "" "Do you want to generate a new one?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "" @@ -5712,7 +5919,7 @@ msgstr "" msgid "^ ADD" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "" @@ -5743,12 +5950,12 @@ msgstr "" msgid "s" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "" diff --git a/Languages/po/el.po b/Languages/po/el.po index f5da4c8403..74d89374e1 100644 --- a/Languages/po/el.po +++ b/Languages/po/el.po @@ -11,7 +11,11 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -71,9 +75,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sΑντιγραφή%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -171,7 +175,7 @@ msgstr "%sΕξαγωγή GCI%s" msgid "%sImport GCI%s" msgstr "%sΕισαγωγή GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u Ελεύθερα μπλοκ; %u Ελεύθερες Θέσεις Φακέλων" @@ -204,11 +208,11 @@ msgstr "&Διαχειριστής Cheat" msgid "&DSP Settings" msgstr "&Ρυθμίσεις DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&Διαγραφή ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&Διαγραφή επιλεγμένων ISO..." @@ -272,7 +276,7 @@ msgstr "&Παύση" msgid "&Play" msgstr "&Αναπαραγωγή" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&Ιδιότητες" @@ -316,7 +320,7 @@ msgstr "&Προβολή" msgid "&Wiimote Settings" msgstr "&Ρυθμίσεις Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "&Wiki" @@ -360,7 +364,7 @@ msgstr "<Εισάγετε όνομα εδώ>" msgid "" msgstr "<Δε βρέθηκαν αναλύσεις>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "<Τίποτα>" @@ -369,7 +373,7 @@ msgstr "<Τίποτα>" msgid "" msgstr "<Πατήστε Πλήκτρο>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "<Συστήματος>" @@ -425,13 +429,13 @@ msgstr "" "\n" "Θα πρέπει να έχετε κάνει προώθηση της πόρτας TCP στον host!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "Κωδικοί AR" @@ -443,6 +447,7 @@ msgstr "Σχετικά με το Dolphin" msgid "Acceleration" msgstr "Επιτάχυνση" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 @@ -462,6 +467,13 @@ msgstr "Ακρίβεια:" >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 +msgid "Accuracy:" +msgstr "Ακρίβεια:" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Accurate VBeam emulation" msgstr "Ακριβής VBeam εξομοίωση" @@ -593,11 +605,11 @@ msgstr "Προσαρμογέας:" msgid "Add" msgstr "Προσθήκη" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "Προσθήκη Κωδικού ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "Προσθήκη Patch" @@ -609,6 +621,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 @@ -632,6 +645,11 @@ msgstr "Προσθήκη νέου pane" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Προσθήκη..." @@ -667,11 +685,11 @@ msgstr "" "Ρύθμιση της απαιτούμενης πίεσης του αναλογικού χειριστηρίου για την " "ενεργοποίηση των κουμπιών." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "Για προχωρημένους" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Ρυθμίσεις για Προχωρημένους" @@ -679,11 +697,11 @@ msgstr "Ρυθμίσεις για Προχωρημένους" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Όλα τα αρχεία GC/Wii (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Όλες οι εικόνες GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "Όλα τα αρχεία Gamecube GCM (gcm)" @@ -691,6 +709,7 @@ msgstr "Όλα τα αρχεία Gamecube GCM (gcm)" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ======= @@ -709,18 +728,22 @@ msgstr "Όλα τα αρχεία Gamecube GCM (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Όλα τα Σημεία Αποθήκευσης(sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "Όλα τα αρχεία Wii ISO (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Όλα τα συμπιεσμένα αρχεία GC/Wii ISO (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "Όλα τα αρχεία (*.*)|*.*" @@ -736,6 +759,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 @@ -754,6 +778,9 @@ msgstr "Εξομοιωμένο Wiimote" >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Alternate Wiimote Timing" msgstr "Εναλλακτικός Χρονισμός Wiimote" @@ -774,7 +801,7 @@ msgstr "Ο Apploader έχει λάθος μέγεθος... είναι πράγμ msgid "Apploader unable to load from file" msgstr "Ο Apploader απέτυχε να φορτωθεί από αρχείο" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Apploader:" @@ -792,7 +819,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, επιλέξτε (ανενεργό)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Αραβικά" @@ -801,7 +828,7 @@ msgstr "Αραβικά" msgid "Are you sure you want to delete \"%s\"?" msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε το \"%s\";" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -809,12 +836,13 @@ msgstr "" "Είστε σίγουροι ότι θέλετε να διαγράψετε αυτά τα αρχεία;\n" "Θα εξαφανιστούν για πάντα!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το αρχείο; Θα εξαφανιστεί για " "πάντα!" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -823,6 +851,9 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 ======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280 @@ -840,18 +871,20 @@ msgstr "Αναλογία Οθόνης:" msgid "At least one pane must remain open." msgstr "Τουλάχιστον ένα pane πρέπει να μένει ανοιχτό." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Ήχος" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Backend Ήχου:" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Σφάλμα ανοίγματος AO συσκευής.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -860,6 +893,9 @@ msgstr "AudioCommon: Σφάλμα ανοίγματος AO συσκευής.\n" <<<<<<< HEAD <<<<<<< HEAD >>>>>>> Update translation files for recent changes in the code. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 ======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 @@ -931,7 +967,7 @@ msgstr "" msgid "Back" msgstr "Πίσω" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Backend Ρυθμίσεις" @@ -958,11 +994,11 @@ msgstr "Μη Έγκυρη Κεφαλίδα Αρχείου" msgid "Banner" msgstr "Εικονίδιο" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "Λεπτομέρειες Εικονιδίου:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "Εικονίδιο:" @@ -974,7 +1010,7 @@ msgstr "Bar" msgid "Basic" msgstr "Βασικές" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Βασικές Ρυθμίσεις" @@ -1006,6 +1042,7 @@ msgstr "Δεξί Μπλε" <<<<<<< HEAD #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -1022,6 +1059,9 @@ msgstr "Δεξί Μπλε" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Βάση" @@ -1030,7 +1070,7 @@ msgstr "Βάση" msgid "Bound Controls: %lu" msgstr "Δεσμευμένοι Χειρισμοί: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Χαλασμένο" @@ -1046,7 +1086,7 @@ msgstr "Εύρεση φακέλου για προσθήκη" msgid "Browse for an ISO directory..." msgstr "Εύρεση φακέλου ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "Εύρεση φακέλου προορισμού" @@ -1086,11 +1126,11 @@ msgstr "Stick Κάμερας " msgid "C-Stick" msgstr "Stick Κάμερας" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "Μηχανή Εξομοίωσης CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "Cache Display Lists" @@ -1141,7 +1181,7 @@ msgstr "Αποτυχία ανοίγματος %s" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1152,7 +1192,7 @@ msgstr "" "%s\n" "δεν είναι έγκυρο αρχείο κάρτας μνήμης gamecube" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1170,8 +1210,6 @@ msgstr "Αποτυχία εύρεσης WiiMote με bd: %02x:%02x:%02x:%02x:%02 msgid "Cant find WiiMote by connection handle %02x" msgstr "Αδυναμία εύρεσης του WiiMote με handle σύνδεσης %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1181,7 +1219,7 @@ msgstr "Αδυναμία ανάγνωσης από το DVD_Plugin - DVD-Interfa msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "Καταλανικά" @@ -1206,7 +1244,7 @@ msgstr "Αλλαγή Δίσκου" msgid "Change Game" msgstr "Αλλαγή Παιχνιδιού" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1222,8 +1260,8 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "Αυτή η αλλαγή δε θα έχει επίπτωση όσο ο εξομοιωτής εκτελείται!" @@ -1243,31 +1281,31 @@ msgstr "Αναζήτηση Cheat" msgid "Cheats Manager" msgstr "Διαχείριση Cheat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Κινέζικα (Απλοποιημένα)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Κινέζικα (Παραδοσιακά)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "Επιλέξτε έναν φάκελο ρίζας DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "Επιλέξτε έναν φάκελο ρίζας NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Επιλέξτε ένα προεπιλεγμένο ISO:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "Επιλέξτε έναν φάκελο για προσθήκη" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Επιλέξτε ένα αρχείο για άνοιγμα" @@ -1275,6 +1313,7 @@ msgstr "Επιλέξτε ένα αρχείο για άνοιγμα" msgid "Choose a memory card:" msgstr "Επιλέξτε μια κάρτα μνήμης:" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 @@ -1285,6 +1324,9 @@ msgstr "Επιλέξτε μια κάρτα μνήμης:" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1299,8 +1341,8 @@ msgstr "Επιλέξτε ένα αρχείο για χρήση ως apploader: ( ======= >>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Επιλέξτε τον φάκελο προς αποσυμπίεση" @@ -1312,14 +1354,14 @@ msgstr "Κυκλικό Stick" msgid "Classic" msgstr "Κλασικό Χειριστήριο" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "Καθάρισ." -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "Το καθάρισμα απέτυχε." @@ -1335,6 +1377,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 @@ -1351,6 +1394,10 @@ msgstr "" >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Κλείσιμο" @@ -1374,20 +1421,20 @@ msgstr "Εντολή" msgid "Comment" msgstr "Σχόλιο" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Σχόλιο:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "Συμπίεση ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Συμπίεση επιλεγμένων ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "Συμπίεση ISO" @@ -1414,13 +1461,13 @@ msgstr "Ρυθμίσεις Χειριστηρίων" msgid "Configure..." msgstr "Γενικές Ρυθμίσεις..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "Επιβεβαίωση Αντικατάστασης Αρχείου" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "Επιβεβαίωση Διακοπής" @@ -1429,7 +1476,7 @@ msgstr "Επιβεβαίωση Διακοπής" msgid "Connect" msgstr "Σύνδεση" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "Σύνδεση Πληκτρολογίου USB" @@ -1494,12 +1541,12 @@ msgstr "Μετατροπή σε GCI" msgid "Copy failed" msgstr "Η αντιγραφή απέτυχε" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "Αντιγραφή στην κάρτα μνήμης %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "Πυρήνας" @@ -1530,7 +1577,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Αποτυχία αναγνώρισης του αρχείου ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "Αποτυχία αποθήκευσης του %s" @@ -1545,7 +1592,7 @@ msgstr "" "(ο καθορισμός των χειριστηρίων ενώ το παιχνίδι τρέχει δεν υποστηρίζεται προς " "το παρόν)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1558,7 +1605,7 @@ msgstr "" "Μήπως εκτελείτε το Dolphin από CD/DVD, ή το αποθηκευόμενο αρχείο έχει " "προστασία εγγραφής;" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "Αδυναμία εύρεσης εντολής ανοίγματος για την επέκταση 'ini'!" @@ -1575,7 +1622,7 @@ msgstr "" msgid "Count:" msgstr "Πλήθος:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "Χώρα:" @@ -1589,10 +1636,11 @@ msgstr "Δημιουργία Κωδικού AR" msgid "Create new perspective" msgstr "Δημιουργία νέας οπτικής" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "Δημιουργήθηκε από KDE-Look.org" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 @@ -1603,6 +1651,9 @@ msgstr "Δημιουργήθηκε από KDE-Look.org" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" @@ -1616,17 +1667,17 @@ msgstr "Δημιουργήθηκε από Milosz Wlazlo [miloszwl@miloszwl.com, ======= >>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "Δημιουργήθηκε από VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" "Δημιουργήθηκε από black_rider και δημοσιεύθηκε στο ForumW.org > Web " "Developments" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "Δημιουργός: " @@ -1634,7 +1685,7 @@ msgstr "Δημιουργός: " msgid "Critical" msgstr "Κρίσιμο" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "Κόψιμο" @@ -1657,7 +1708,7 @@ msgstr "Crossfade" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Ο τρέχων φάκελος άλλαξε από %s σε %s μετά από τον wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "Προσαρμοζόμενο Projection Hack" @@ -1665,11 +1716,11 @@ msgstr "Προσαρμοζόμενο Projection Hack" msgid "Custom Projection Hack Settings" msgstr "Ρυθμίσεις Προσαρμοζόμενου Projection Hack" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Τσέχικα" @@ -1681,10 +1732,11 @@ msgstr "Ψηφιακό Pad" msgid "DSP" msgstr "Ήχος (DSP)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "Μηχανή Εξομοίωσης DSP" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 @@ -1705,18 +1757,22 @@ msgstr "Μηχανή Εξομοίωσης DSP" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE εξομοίωση (γρήγορη)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE interpreter (αργή)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "DSP LLE σε Ξεχωριστό Νήμα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP LLE recompiler" @@ -1724,15 +1780,23 @@ msgstr "DSP LLE recompiler" msgid "DSP settings" msgstr "Ρυθμίσεις ήχου (DSP)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "Ρίζα DVD:" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "Μέγεθος Δεδομένων" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "Ημερομηνία:" @@ -1753,7 +1817,7 @@ msgstr "Νεκρή Ζώνη" msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "Debugging" @@ -1761,16 +1825,16 @@ msgstr "Debugging" msgid "Decimal" msgstr "Δεκαδικός" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "Αποσυμπίεση ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "Αποσυμπίεση επιλεγμένων ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "Γίνεται αποσυμπίεση ISO" @@ -1778,11 +1842,11 @@ msgstr "Γίνεται αποσυμπίεση ISO" msgid "Default" msgstr "Προεπιλ." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "Προεπιλεγμένο ISO:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "Προεπιλεγμένη γραμματοσειρά" @@ -1791,7 +1855,7 @@ msgstr "Προεπιλεγμένη γραμματοσειρά" msgid "Delete" msgstr "Διαγραφή" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "Διαγραφή Αποθήκευσης" @@ -1800,7 +1864,7 @@ msgstr "Διαγραφή Αποθήκευσης" msgid "Delete the existing file '%s'?" msgstr "Διαγραφή του υπάρχοντος αρχείου '%s';" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "Περιγραφή" @@ -1808,8 +1872,8 @@ msgstr "Περιγραφή" msgid "Detect" 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 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." @@ -1822,8 +1886,8 @@ msgstr "" msgid "Device" msgstr "Συσκευή" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Ρυθμίσεις Συσκευής" @@ -1848,23 +1912,23 @@ msgstr "" " καθώς και το checksum του εφεδρικού Καταλόγου απέτυχε" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "Απενεργοποίηση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "Απενεργοποίηση Ομίχλης" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "Απενεργοποίηση Φωτισμού" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "Απενεργοποίηση Βάθους ανά Pixel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "Απενεργοποίηση Υφών" @@ -1908,7 +1972,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Δίσκος" @@ -1939,6 +2003,7 @@ msgstr "Divide" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 @@ -1952,10 +2017,13 @@ msgstr "Divide" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Θέλετε να σταματήσετε την τρέχουσα εξομοίωση;" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1984,6 +2052,7 @@ msgstr "Dolphin FIFO" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Ρυθμίσεις Dolphin GCPad" @@ -2020,6 +2089,14 @@ msgstr "Ρυθμίσεις Dolphin GCPad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Ρυθμίσεις Dolphin GCPad" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Ταινίες (*.dtm)" @@ -2082,11 +2159,11 @@ msgstr "Το Dolphin είναι ρυθμισμένο να αποκρύπτει msgid "Down" msgstr "Κάτω" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "Μεταφόρτωση Κωδικών (WiiRD Database)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Μεταφορτώθηκαν %lu κωδικοί. (προστέθηκαν %lu)" @@ -2095,23 +2172,23 @@ msgstr "Μεταφορτώθηκαν %lu κωδικοί. (προστέθηκαν msgid "Drums" msgstr "Τύμπανα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "Dummy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "Εξαγωγή Ήχου" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "Εξαγωγή EFB Target" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "Εξαγωγή Καρέ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "Εξαγωγή Υφών" @@ -2151,6 +2228,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 @@ -2174,6 +2252,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Ολλανδικά" @@ -2198,7 +2281,7 @@ msgstr "" "Dolphin σας, μία επανεκκίνηση απαιτείται για να κάνει τα Windows να δούνε " "τους νέους οδηγούς." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "ΕΥΡΩΠΗ" @@ -2214,7 +2297,7 @@ msgstr "Επεξεργασία" msgid "Edit ActionReplay Code" msgstr "Επεξεργασία Κωδικού ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Επεξεργασία Ρυθμίσεων" @@ -2226,8 +2309,8 @@ msgstr "Επεξεργασία Patch" msgid "Edit current perspective" msgstr "Επεξεργασία τρέχουσας οπτικής" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "Επεξεργασία..." @@ -2278,7 +2361,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Εξομοιωμένο Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "Κατάσταση Λειτουργίας:" @@ -2306,15 +2389,11 @@ msgstr "" msgid "Enable AR Logging" msgstr "Ενεργοποίηση Καταγραφής AR" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "Ενεργοποίηση Throttle Ήχου" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "Ενεργοποίηση BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Ενεργοποίηση Block Merging" @@ -2322,9 +2401,13 @@ msgstr "Ενεργοποίηση Block Merging" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -2337,6 +2420,7 @@ msgstr "" msgid "Enable Cache" msgstr "Ενεργοποίηση Cache" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2355,51 +2439,54 @@ msgstr "Ενεργοποίηση Cheat" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Ενεργοποίηση Cheat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "Ενεργοποίηση Μουσικής DTK" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Ενεργοποίηση Διπλού Πυρήνα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Ενεργοποίηση Διπλού Πυρήνα (επιτάχυνση)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "Ενεργοποίηση Συντομεύσεων" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Ενεργοποίηση Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Ενεργοποίηση Idle Skipping (επιτάχυνση)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Ενεργοποίηση MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "Ενεργοποίηση Προοδευτικής Σάρωσης" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "Ενεργοποίηση Προφύλαξης Οθόνης" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "Ενεργοποίηση Ευρείας Οθόνης" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "Ενεργοποίηση Wireframe" @@ -2418,7 +2505,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, επιλέξτε 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2426,7 +2513,7 @@ msgstr "" "Ενεργοποιεί τη γρήγορη πρόσβαση δίσκου. Απαραίτητο για μερικά παιχνίδια. " "(ΕΝΕΡΓΟ = Γρήγορο, ΑΝΕΝΕΡΓΟ = Συμβατό)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "Ενεργοποίηση σελίδων" @@ -2455,6 +2542,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 @@ -2465,6 +2553,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2479,7 +2570,7 @@ msgstr "Ενεργοποιήστε το για να επιταχύνετε το ======= >>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2489,7 +2580,7 @@ msgstr "" "Διαχείρισης Μνήμης. Ακριβές ως προς το υλικό, αλλά αργό στην εξομοίωση. " "(Ενεργό = Συμβατό, Ανενεργό = Γρήγορο)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "Ενεργοποιεί το Προσαρμοζόμενο Projection Hack" @@ -2505,7 +2596,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2531,6 +2622,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 @@ -2554,6 +2646,11 @@ msgstr "Τέλος" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Αγγλικά" @@ -2585,6 +2682,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 "Σφάλμα" @@ -2646,21 +2744,31 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "Σφάλμα" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "Αποτυχία φόρτωσης της επιλεγμένης γλώσσας. Επαναφορά στην προεπιλογή " "συστήματος." +<<<<<<< HEAD #: Source/Core/Common/Src/ChunkFile.h:180 >>>>>>> Update from master branch. +======= +#: Source/Core/Common/Src/ChunkFile.h:194 +>>>>>>> Update the pot file to reflect recent changes in the code. #, 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 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2696,7 +2804,7 @@ msgstr "Έξοδος από το Dolphin με τον εξομοιωτή" msgid "Export Failed" msgstr "Αποτυχία Εξαγωγής" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "Εξαγωγή Αρχείου" @@ -2709,15 +2817,15 @@ msgstr "Εξαγωγή Εγγραφής" msgid "Export Recording..." msgstr "Εξαγωγή Εγγραφής..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "Εξαγωγή Αποθήκευσης" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "Εξαγωγή Αποθήκευσης Wii (Πειραματικό)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "Εξαγωγή όλων των αποθηκεύσεων" @@ -2733,7 +2841,7 @@ msgstr "Εξαγωγή αποθήκευσης ως..." msgid "Extension" msgstr "Επέκταση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "Εξωτερικό Frame Buffer" @@ -2745,44 +2853,44 @@ msgstr "Επιπλέον Παράμετρος" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Η Επιπλέον Παράμετρος είναι χρήσιμη μόνο στο ''Metroid: Other M''." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "Εξαγωγή όλων των αρχείων..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "Εξαγωγή Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "Εξαγωγή DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "Εξαγωγή Φακέλου..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "Εξαγωγή Αρχείου..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "Εξαγωγή Κατάτμησης..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "Γίνεται εξαγωγή %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "Γίνεται εξαγωγή όλων των αρχείων" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "Γίνεται εξαγωγή φακέλου" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "Γίνεται εξαγωγή..." @@ -2794,11 +2902,11 @@ msgstr "FIFO Byte" msgid "FIFO Player" msgstr "Αναπαραγωγή FIFO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "ΓΑΛΛΙΑ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "Μέγεθος FST:" @@ -2810,11 +2918,11 @@ msgstr "Αποτυχία σύνδεσης!" msgid "Failed to Listen!!" msgstr "Αποτυχία ακρόασης!!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "Αποτυχία μεταφόρτωσης κωδικών." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Αποτυχία εξαγωγής στο %s!" @@ -2930,6 +3038,7 @@ msgstr "Αποτυχία εγγραφής της κεφαλίδας για το msgid "Failed to write header for file %d" msgstr "Αποτυχία εγγραφής της κεφαλίδας για το αρχείο %d" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 @@ -2937,17 +3046,25 @@ msgid "Fast" <<<<<<< HEAD ======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Fast" >>>>>>> The actual update of the Greek and Czech translations. The last commit msgstr "Γρήγορη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "Γρήγορα Mipmaps" <<<<<<< HEAD ======= msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Fast Mipmaps" msgstr "" @@ -2959,9 +3076,18 @@ msgstr "" >>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Fast version of the MMU. Does not work for every game." msgstr "Γρήγορη έκδοση του MMU. Δε δουλεύει για όλα τα παιχνίδια." +#: Source/Core/Core/Src/Movie.cpp:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "Αναπαραγωγή Fifo" @@ -2970,7 +3096,7 @@ msgstr "Αναπαραγωγή Fifo" msgid "File Info" msgstr "Πληροφορίες Αρχείου" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "Το αρχείο δεν περιείχε κωδικούς." @@ -3003,16 +3129,16 @@ msgstr "Το αρχείο δεν αναγνωρίζεται σαν κάρτα μ msgid "File not compressed" msgstr "Το αρχείο δεν είναι συμπιεσμένο" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Άγνωστη λειτουργία ανοίγματος : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "Αρχεία δίσκου" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Ο τύπος αρχείου 'ini' είναι άγνωστος! Δε θα γίνει άνοιγμα!" @@ -3020,7 +3146,7 @@ msgstr "Ο τύπος αρχείου 'ini' είναι άγνωστος! Δε θ msgid "First Block" msgstr "Πρώτο Μπλοκ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "Επιδιόρθωση Checksum" @@ -3032,7 +3158,7 @@ msgstr "Επιβολή 16:9" msgid "Force 4:3" msgstr "Επιβολή 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "Επιβολή της Κονσόλας ως NTSC-J" @@ -3065,7 +3191,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -3102,7 +3228,7 @@ msgstr "Καρέ" msgid "Frame Advance" msgstr "Προώθηση ανά Καρέ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "FFV1 Για Τα Εξαγώμενα Καρέ" @@ -3114,7 +3240,7 @@ msgstr "Εύρος Καρέ" msgid "Frame S&kipping" msgstr "Παράλειψη Κ&αρέ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Περιορισμός Καρέ:" @@ -3122,7 +3248,7 @@ msgstr "Περιορισμός Καρέ:" msgid "Frames To Record" msgstr "Καρέ Προς Εγγραφή" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "Ελεύθερη Ματιά" @@ -3130,6 +3256,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 @@ -3153,6 +3280,11 @@ msgstr "Ελεύθερη Ματιά" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Γαλλικά" @@ -3186,7 +3318,7 @@ msgstr "Ρυθμίσεις Καταγραφής" msgid "GCPad" msgstr "GCPad" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "ID Παιχνιδιού:" @@ -3202,15 +3334,15 @@ msgstr "Το παιχνίδι δεν εκτελείται!" msgid "Game not found!!" msgstr "Το παιχνίδι δε βρέθηκε!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "Ρυθμίσεις Συγκεκριμένου Παιχνιδιού" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Ρυθμίσεις Παιχνιδιού" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" @@ -3230,6 +3362,7 @@ msgstr "Ρυθμίσεις Gamecube &Pad" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 +<<<<<<< HEAD >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 @@ -3238,6 +3371,9 @@ msgstr "Ρυθμίσεις Gamecube &Pad" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Κάρτες Μνήμης Gamecube (*.raw,*.gcp)" @@ -3246,15 +3382,17 @@ msgid "Gamecube Pad settings" msgstr "Ρυθμίσεις Χειριστηρίου Gamecube" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Κωδικοί Gecko" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" "Ο Κωδικός Gecko απέτυχε να εκτελεστεί (CT%i CST%i) (%s)\n" "(ή είναι ένας κακός κωδικός ή ο τύπος του κωδικού δεν υποστηρίζεται.)" @@ -3264,10 +3402,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: 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/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 @@ -3291,6 +3433,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 @@ -3314,6 +3457,11 @@ msgstr "Γενικές Ρυθμίσεις" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Γερμανικά" @@ -3366,7 +3514,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το επιλεγμένο." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Ελληνικά" @@ -3398,7 +3546,7 @@ msgstr "Hacks" msgid "Header checksum failed" msgstr "Αποτυχία ελέγχου κεφαλίδας" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Εβραϊκά" @@ -3478,12 +3626,16 @@ msgstr "Ρυθμίσεις Πλήκτρων Συντόμευσης" >>>>>>> The actual update of the Greek and Czech translations. The last commit ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Πλήκτρα Συντόμευσης" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Ουγγρικά" @@ -3491,14 +3643,14 @@ msgstr "Ουγγρικά" msgid "Hybrid Wiimote" msgstr "Υβριδικό Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS: Απόπειρα ανάγνωσης δεδομένων από ένα άγνωστο εισιτήριο: " "%08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -3511,11 +3663,11 @@ msgstr "" "TitleID %016llx.\n" "Το Dolphin πιθανότατα θα κολλήσει τώρα." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - μη έγκυρος προορισμός" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "Ρυθμίσεις IPL" @@ -3531,15 +3683,15 @@ msgstr "Δείκτης IR" msgid "IR Sensitivity:" msgstr "Ευαισθησία IR:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "Λεπτομέρειες ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "Φάκελοι ISO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "ΙΤΑΛΙΑ" @@ -3547,19 +3699,20 @@ msgstr "ΙΤΑΛΙΑ" msgid "Icon" msgstr "Εικονίδιο" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "Αν τα FPS διακυμαίνονται, αυτή η επιλογή μπορείο να βοηθήσει. (Ενεργό = " "Συμβατό, Ανενεργό = Γρήγορο)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 @@ -3579,6 +3732,14 @@ 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. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy +msgid "" +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " +"Audio to throttle using the DSP (might fix audio clicks but can also cause " +"constant noise depending on the game)." +>>>>>>> Update the pot file to reflect recent changes in the code. msgstr "" "Αν θέσετε τιμή υψηλότερη από την πλήρη ταχύτητα του παιχνιδιού (NTSC:60, " "PAL:50),\n" @@ -3618,7 +3779,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "Εισαγωγή Αποθήκευσης" @@ -3669,7 +3830,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "Εντός Παιχνιδιού" @@ -3678,7 +3839,7 @@ msgid "In-Game" msgstr "Εντός Παιχνιδιού" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Πληροφορίες" @@ -3698,7 +3859,7 @@ msgstr "Εισάγετε" msgid "Insert Encrypted or Decrypted code here..." msgstr "Εισάγετε Κωδικοποιημένο ή μη Κωδικό εδώ..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Εισαγωγή Κάρτας SD" @@ -3710,7 +3871,7 @@ msgstr "Εισάγετε όνομα εδώ..." msgid "Install WAD" msgstr "Εγκατάσταση WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Εγκατάσταση στο Μενού Wii" @@ -3725,6 +3886,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 @@ -3738,14 +3900,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Γίνεται εγκατάσταση WAD..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "Διεπαφή" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "Ρυθμίσεις Διεπαφής" @@ -3770,11 +3935,11 @@ msgstr "Εσωτερικό Σφάλμα LZO - αποτυχία lzo_init()" msgid "Internal Resolution:" msgstr "Εσωτερική Ανάλυση:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Interpreter (ΠΟΛΥ αργός)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "Εισαγωγή" @@ -3791,7 +3956,7 @@ msgstr "Μη έγκυρη τιμή!" msgid "Invalid bat.map or dir entry" msgstr "Μη έγκυρο bat.map ή εγγραφή φακέλου" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "Μη έγκυρος τύπος συμβάντος %i" @@ -3811,11 +3976,11 @@ msgstr "" "%s\n" " Ίσως χρειαστεί να ξαναεξάγετε την εικόνα αυτού του παιχνιδιού από τον δίσκο." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "Μη έγκυρο αρχείο εγγραφής" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "Μη έγκυρο κατάσταση" @@ -3823,6 +3988,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 @@ -3846,27 +4012,32 @@ msgstr "Μη έγκυρο κατάσταση" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Ιταλικά" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "ΙΑΠΩΝΙΑ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT Recompiler (προτείνεται)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL δοκιμαστικός recompiler" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Ιαπωνικά" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "ΚΟΡΕΑ" @@ -3875,8 +4046,8 @@ msgstr "ΚΟΡΕΑ" msgid "Key" msgstr "Πλήκτρο" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Κορεάτικα" @@ -3894,7 +4065,7 @@ msgstr "L Button" msgid "L-Analog" msgstr "L-Αναλογική" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "Γλώσσα:" @@ -3947,7 +4118,7 @@ msgstr "" msgid "Less Than" msgstr "Μικρότερο από" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "Περιορισμός με βάση τα Καρέ" @@ -3955,7 +4126,7 @@ msgstr "Περιορισμός με βάση τα Καρέ" msgid "Load" msgstr "Φόρτωσ." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "Φόρτωση Τροποποιημένων Υφών" @@ -4007,6 +4178,7 @@ msgstr "Φόρτωση Σημείου Αποθήκευσης..." <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Φόρτωση Μενού Συστήματος Wii" @@ -4040,6 +4212,13 @@ msgstr "Φόρτωση Μενού Συστήματος Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "Φόρτωση Μενού Συστήματος Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Φόρτωση Μενού Συστήματος Wii %d%c" @@ -4066,7 +4245,7 @@ msgstr "Φορτώνει το καθορισμένο αρχείο (DOL,ELF,GCM,I msgid "Local" msgstr "Τοπικό" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Κλείδωμα Νημάτων στους Πυρήνες " @@ -4078,11 +4257,11 @@ msgstr "Καταγραφή" msgid "Log Configuration" msgstr "Ρυθμίσεις Καταγραφής" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Τύποι Καταγραφής" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Έξοδοι Καταγραφής" @@ -4112,7 +4291,7 @@ msgstr "" "Ασυμφωνία MD5\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU Speed Hack" @@ -4142,11 +4321,11 @@ msgstr "Αρχεία MadCatz Gameshark (*.gcs)" msgid "Main Stick" msgstr "Κύριο Stick" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "ID Δημιουργού:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "Δημιουργός:" @@ -4182,11 +4361,15 @@ msgstr "Memory Byte" ======= #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD +<<<<<<< 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. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Κάρτα Μνήμης" @@ -4225,7 +4408,7 @@ msgstr "" msgid "Menu" msgstr "Μενού" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "Μικρόφωνο" @@ -4234,11 +4417,11 @@ msgstr "Μικρόφωνο" msgid "Min" msgstr "Ελάχιστη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "Διάφορα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Διάφορες Ρυθμίσεις" @@ -4260,7 +4443,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "Ισοπλατής γραμματοσειρά" @@ -4273,7 +4456,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Μοτέρ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -4294,7 +4477,7 @@ msgstr "" msgid "Multiply" msgstr "Multiply" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -4390,6 +4573,7 @@ msgstr "NP Up" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 @@ -4402,6 +4586,9 @@ msgstr "NP Up" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4410,7 +4597,7 @@ msgstr "Όνομα:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Όνομα: " @@ -4424,7 +4611,7 @@ msgid "New Scan" msgstr "Νέα Ανίχνευση" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "Επόμενη Σελίδα" @@ -4436,7 +4623,7 @@ msgstr "Επόμενη Ανίχνευση" msgid "Nickname :" msgstr "Ψευδώνυμο :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "Καμία Χώρα (SDK)" @@ -4475,7 +4662,7 @@ msgstr "Δε βρέθηκε φάκελος αποθήκευσης για τον msgid "None" msgstr "Καμία" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Νορβηγικά Bokmaal" @@ -4483,8 +4670,8 @@ msgstr "Νορβηγικά Bokmaal" msgid "Not Equal" msgstr "Όχι ίσο" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "Μη Ορισμένο" @@ -4512,7 +4699,7 @@ msgstr "Μη Συνδεδεμένο" msgid "Notes" msgstr "Σημειώσεις" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "Σημειώσεις: " @@ -4550,7 +4737,7 @@ msgstr "Αντικείμενο" msgid "Object Range" msgstr "Εύρος Αντικειμένου" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Ανενεργός" @@ -4584,11 +4771,11 @@ msgstr "Διαθέσιμα μόνο %d μπλοκ" msgid "Open" msgstr "Άνοιγμα" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "Άνοιγμα &τοποθεσίας αρχείου" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "Άνοιγμα φακέλου αποθήκευσης Wii" @@ -4610,11 +4797,11 @@ msgstr "OpenAL: αδυναμία εύρεσης συσκευών ήχου" msgid "OpenAL: can't open device %s" msgstr "OpenAL: αδυναμία ανοίγματος της συσκευής %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "OpenCL Αποκωδικοποιητής Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "OpenMP Αποκωδικοποιητής Υφών" @@ -4647,7 +4834,7 @@ msgstr "" "και εισάγετέ τα σε μία νέα κάρτα μνήμης.\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "Άλλα" @@ -4699,16 +4886,16 @@ msgstr "Παράγραφος" msgid "Parameters" msgstr "Παράμετροι" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Κατάτμηση %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Patches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Φάκελοι" @@ -4716,6 +4903,7 @@ msgstr "Φάκελοι" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ======= @@ -4732,6 +4920,10 @@ msgstr "Φάκελοι" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Παύση" @@ -4740,7 +4932,7 @@ msgstr "Παύση" msgid "Per-Pixel Lighting" msgstr "Φωτισμός ανά Pixel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Τέλειο" @@ -4768,6 +4960,7 @@ msgstr "Οπτική %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD +<<<<<<< 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 @@ -4775,6 +4968,10 @@ msgstr "Οπτική %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Αναπαραγωγή" @@ -4788,7 +4985,7 @@ msgstr "Αναπαραγωγή Εγγραφής" msgid "Play/Pause" msgstr "Αναπαραγωγή/Παύση" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "Παίζεται" @@ -4804,6 +5001,7 @@ msgstr "Παίχτες" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 @@ -4817,6 +5015,9 @@ msgstr "Παίχτες" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Παρακαλώ επιβεβαιώστε..." @@ -4828,23 +5029,23 @@ msgstr "Παρακαλώ δημιουργήστε μια οπτική πριν msgid "Plus-Minus" msgstr "Plus-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Πολωνέζικα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Θύρα 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Θύρα 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Θύρα 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Θύρα 4" @@ -4853,11 +5054,11 @@ msgstr "Θύρα 4" msgid "Port :" msgstr "Θύρα :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Πορτογαλικά" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Πορτογαλικά (Βραζιλιάνικα)" @@ -4865,17 +5066,17 @@ msgstr "Πορτογαλικά (Βραζιλιάνικα)" msgid "Post-Processing Effect:" msgstr "Post-Processing Εφέ:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4888,7 +5089,7 @@ msgstr "Προεπιλογές: " msgid "Prev Page" msgstr "Προηγούμενη Σελίδα" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "Προηγούμενη Σελίδα" @@ -4939,7 +5140,7 @@ msgstr "R-Αναλογική" msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "ΡΩΣΙΑ" @@ -4952,7 +5153,7 @@ msgstr "Εύρος" msgid "Read-only mode" msgstr "Μόνο Για Ανάγνωση (Εγγραφής)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "Πραγματικό" @@ -5031,6 +5232,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 @@ -5059,6 +5261,12 @@ msgstr "Ανανέωση λίστας παιχνιδιών" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Αφαίρεση" @@ -5116,11 +5324,11 @@ msgstr "Δεξί Stick" msgid "Rumble" msgstr "Δόνηση" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Εκτέλεση DSP LLE σε ξεχωριστό νήμα (δεν προτείνεται)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Ρώσικα" @@ -5128,13 +5336,18 @@ msgstr "Ρώσικα" msgid "Sa&ve State" msgstr "Απ&οθήκευση Σημείου Αποθήκευσης" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Safe" <<<<<<< HEAD msgstr "Ασφαλής" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 <<<<<<< HEAD ======= @@ -5152,6 +5365,9 @@ msgstr "Ασφαλής" >>>>>>> Update translation files for recent changes in the code. ======= >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Ρυθμός Δειγματοληψίας:" @@ -5209,12 +5425,12 @@ msgstr "Αποθήκευση Σημείου Αποθήκευσης 8" msgid "Save State..." msgstr "Αποθήκευση Σημείου..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Αποθήκευση ως..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Αποθήκευση συμπιεσμένου GCM/ISO" @@ -5222,11 +5438,11 @@ msgstr "Αποθήκευση συμπιεσμένου GCM/ISO" msgid "Save current perspective" msgstr "Αποθήκευση τρέχουσας οπτικής" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "Αποθήκευση αποσυμπιεσμένου GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -5237,6 +5453,7 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "Κλιμακούμενα EFB Αντίγραφα" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 @@ -5254,15 +5471,18 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Ανίχνευση %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "Αναζήτηση για ISOs" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "Ανίχνευση..." @@ -5278,12 +5498,12 @@ msgstr "Scroll Lock" msgid "Search Filter" msgstr "Φίλτρο Αναζήτησης" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 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:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "Η ενότητα %s δε βρέθηκε στο SYSCONF" @@ -5293,6 +5513,7 @@ msgstr "Η ενότητα %s δε βρέθηκε στο SYSCONF" msgid "Select" msgstr "Επιλογή" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -5325,6 +5546,14 @@ msgstr "Επιλέξτε το Αρχείο Εγγραφής" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Επιλέξτε το Αρχείο Εγγραφής" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Επιλέξτε ένα Wii WAD αρχείο για εγκατάσταση" @@ -5354,14 +5583,19 @@ msgstr "Επιλέξτε το αρχείο για φόρτωση" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Επιλέξτε αρχείο αποθήκευσης" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Επιλέξτε το σημείο φόρτωσης" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 @@ -5395,6 +5629,9 @@ msgstr "Επιλέξτε το σημείο φόρτωσης" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Επιλέξτε το σημείο αποθήκευσης" @@ -5417,7 +5654,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι επιλέξτε Αυτόματα." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Επιλεγμένη γραμματοσειρά" @@ -5466,10 +5703,11 @@ msgstr "Θέση Sensor Bar:" msgid "Separator" msgstr "Διαχωριστής" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Σερβικά" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 @@ -5480,6 +5718,9 @@ msgstr "Σερβικά" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -5497,11 +5738,11 @@ msgstr "Σειριακή Θύρα 1 - Αυτή είναι η θύρα που χ msgid "Set" msgstr "Ορισμός" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "Ορισμός ως προεπιλεγμένο &ISO" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "Ορισμός ως προεπιλεγμένη Κάρτα Μνήμης %c" @@ -5513,7 +5754,7 @@ msgstr "" "SetARCode_IsActive: Ο δείκτης είναι μεγαλύτερος από το μέγεθος λίστας των " "κωδικών ar %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "Ρυθμίσεις..." @@ -5525,7 +5766,7 @@ msgstr "SetupWiiMem:Αδυναμία εύρεσης αρχείου ρυθμίσ msgid "Shake" msgstr "Κούνημα" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "Σύντομο Όνομα:" @@ -5553,7 +5794,7 @@ msgstr "Εμφάνιση Γραμμής &Εργαλείων" msgid "Show Drives" msgstr "Εμφάνιση Οδηγών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "Εμφάνιση Περιοχών EFB Αντιγραφών" @@ -5569,7 +5810,7 @@ msgstr "Εμφάνιση Γαλλίας" msgid "Show GameCube" msgstr "Εμφάνιση GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "Εμφάνιση Προβολής Χειρισμών" @@ -5585,7 +5826,7 @@ msgstr "Εμφάνιση JAP" msgid "Show Korea" msgstr "Εμφάνιση Κορέας" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "Εμφάνιση Γλώσσας:" @@ -5605,7 +5846,7 @@ msgstr "Εμφάνιση Πλατφόρμας" msgid "Show Regions" msgstr "Εμφάνιση Περιοχών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "Εμφάνιση Στατιστικών" @@ -5625,11 +5866,11 @@ msgstr "Εμφάνιση Wad" msgid "Show Wii" msgstr "Εμφάνιση Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "Εμφάνιση επιβεβαίωσης πριν τη διακοπή ενός παιχνιδιού." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 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 " @@ -5640,23 +5881,23 @@ msgstr "" "κρίσιμα σφάλματα, αλλά \n" "το Dolphin μπορεί να κρασάρει ξαφνικά χωρίς καμία εξήγηση. " -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "Εμφάνιση πρώτου μπλοκ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "Εμφάνιση μπλοκ αποθήκευσης" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "Εμφάνιση αποθηκευμένου σχολίου" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "Εμφάνιση αποθηκευμένου εικονιδίου" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "Εμφάνιση αποθηκευμένου τίτλου" @@ -5694,7 +5935,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Οριζόντια Θέση Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Κινέζικα Απλοποιημένα" @@ -5702,11 +5943,11 @@ msgstr "Κινέζικα Απλοποιημένα" msgid "Size" msgstr "Μέγεθος" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "Παράλειψη BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "Παράλειψη Dest. Alpha Pass" @@ -5798,11 +6039,11 @@ msgstr "" msgid "Slot %i" msgstr "Θέση %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Θέση Α" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Θέση Β" @@ -5827,7 +6068,7 @@ msgstr "" "Θέλετε όντως να χρησιμοποιήσετε την απεικόνιση λογισμικού; Αν δεν είστε " "σίγουροι, επιλέξτε 'Όχι'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "Ρυθμίσεις Ήχου" @@ -5849,6 +6090,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 @@ -5872,6 +6114,11 @@ msgstr "Space" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Ισπανικά" @@ -5904,7 +6151,7 @@ msgstr "" msgid "Specify a video backend" msgstr "Επιλέξτε ένα backend βίντεο" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Επιτάχυνση του Ρυθμού Μεταφοράς από τον Δίσκο" @@ -5912,7 +6159,7 @@ msgstr "Επιτάχυνση του Ρυθμού Μεταφοράς από το msgid "Square Stick" msgstr "Τετράγωνο Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "Τυπικός Controller" @@ -6051,12 +6298,12 @@ msgstr "Επιτυχής εισαγωγή σημείων αποθήκευσης" msgid "Swing" msgstr "Swing" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Γλώσσα Συστήματος:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "ΤΑΪΒΑΝ" @@ -6102,7 +6349,7 @@ msgstr "Δεξί Table" msgid "Take Screenshot" msgstr "Δημιουργία Στιγμιότυπου" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -6135,6 +6382,7 @@ msgid "Texture Cache" msgstr "Καθαρισμός Cache" >>>>>>> Update translation files for recent changes in the code. +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 ======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 @@ -6143,6 +6391,9 @@ msgstr "Καθαρισμός Cache" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 >>>>>>> The actual update of the Greek and Czech translations. The last commit +======= +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Texture Format Overlay" msgstr "Επικάλυψη Του Format Υφών" @@ -6158,13 +6409,13 @@ msgstr "Η διεύθυνση είναι άκυρη" msgid "The checksum was successfully fixed" msgstr "Το checksum διορθώθηκε με επιτυχία" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "Ο επιλεγμένος φάκελος βρίσκεται ήδη στη λίστα" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -6187,7 +6438,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "Το αρχείο %s ήταν ήδη ανοιχτό, η κεφαλίδα του αρχείου δε θα γραφεί." -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Το αρχείο που επιλέξατε (%s) δεν υπάρχει" @@ -6206,11 +6457,12 @@ msgstr "" "Το αποτέλεσμα αποκρυπτογράφησης του κωδικού AR δεν περιέχει καθόλου γραμμές." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#, fuzzy msgid "" "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." +"If unsure, use the rightmost value." msgstr "" "Όσο πιο ασφαλής είναι αυτή η ρύθμιση, τόσο λιγότερο πιθανό ο εξομοιωτής να " "χάσει ανανεώσεις των υφών από την RAM.\n" @@ -6273,7 +6525,7 @@ msgstr "Το επιλεγμένο αρχείο \"%s\" δεν υπάρχει" msgid "The value is invalid" msgstr "Η τιμή είναι άκυρη" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Θέμα" @@ -6281,7 +6533,7 @@ msgstr "Θέμα" msgid "Theme selection went wrong" msgstr "Η επιλογή θέματος απέτυχε" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -6289,7 +6541,7 @@ msgstr "" "Πρέπει να υπάρχει εισητήριο για 00000001/00000002. Το NAND dump σας είναι " "πιθανότατα ημιτελές." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -6306,7 +6558,7 @@ msgstr "" "Αυτός ο προσομοιωτής action replay δεν υποστηρίζει κωδικούς που αλλάζουν το " "ίδιο το Action Replay." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "" "Αυτό μπορεί να προκαλέσει καθυστερήσεις στο Μενού Wii και σε μερικά " @@ -6333,27 +6585,10 @@ msgstr "" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." #: 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" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" -"Χρησιμοποιείται για τον έλεγχο της ταχύτητας του παιχνιδιού με throttle " -"ήχου.\n" -"Απενεργοποιώντας το μπορεί να προκλήθει αφύσικη ταχύτητα σε παιχνίδια, π.χ. " -"πολύ γρήγορη.\n" -"Όμως ορισμένες φορές η ενεργοποίησή της μπορεί να προκαλέσει μόνιμο θόρυβο.\n" -"\n" -"Συντόμευση πληκτρολογίου : Κρατήστε το πατημένο για να απενεργοποιηθεί " -"η λειτουργία Throttle." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "Χρησιμοποιείται για την αναπαραγωγή μουσικών κομματιών, όπως BGM." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -6365,7 +6600,7 @@ msgstr "" "Προκαλεί μεγάλη επιτάχυνση σε PC με περισσότερους από έναν πυρήνες,\n" "αλλά μπορεί να προκαλέσει κρασαρίσματα ή άλλα προβλήματα. " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "" "Αυτό σας επιτρέπει την χειροκίνητη επεξεργασία του αρχείου ρυθμίσεων INI" @@ -6389,7 +6624,7 @@ msgstr "Τίτλος" msgid "To" msgstr "Εώς" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "Εναλλαγή Όλων Τύπων Καταγραφής " @@ -6421,6 +6656,7 @@ msgstr "Εναλλαγή Πλήρους Οθόνης" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> Update Greek and Czech translations ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -6428,14 +6664,17 @@ msgstr "Εναλλαγή Πλήρους Οθόνης" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Κορυφή" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Κινέζικα Παραδοσιακά " -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "Προσπάθεια φόρτωσης ενός άγνωστου τύπου αρχείο." @@ -6443,7 +6682,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:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Προσπάθεια ανάγνωσης από ένα μη έγκυρο SYSCONF" @@ -6455,7 +6694,7 @@ msgstr "" "Προσπάθεια ανάγνωσης από ένα μη έγκυρο SYSCONF\n" "Τα Wiimote bt ids δεν είναι διαθέσιμα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Τουρκικά" @@ -6476,11 +6715,11 @@ msgstr "Πόρτα UDP:" msgid "UDP Wiimote" msgstr "UDP Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "ΑΓΝΩΣΤΟ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "ΗΠΑ" @@ -6574,7 +6813,7 @@ msgstr "Ενημέρωση" msgid "Upright Wiimote" msgstr "Κάθετη Θέση Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Χρήση Λειτουργίας EuRGB60 (PAL60)" @@ -6586,7 +6825,7 @@ msgstr "Χρήση Πλήρους Οθόνης" msgid "Use Hex" msgstr "Χρήση Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Χρήση Οθονών Πανικού" @@ -6618,7 +6857,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "Εργαλεία" @@ -6642,25 +6881,29 @@ msgstr "Τιμή: " msgid "Verbosity" msgstr "Αναλυτικότητα" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Βίντεο" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Εικονικό" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Ένταση" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "Αποτυχία εγκατάστασης WAD: σφάλμα κατά τη δημιουργία του %s" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "Αποτυχία εγκατάστασης WAD: σφάλμα κατά τη δημιουργία του %s" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -6680,15 +6923,15 @@ msgstr "" msgid "Warning" msgstr "Προειδοποίηση" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "Προειδοποίηση - εκκίνηση DOL σε λάθος λειτουργία κονσόλας!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Προειδοποίηση - εκκίνηση ELF σε λάθος λειτουργία κονσόλας!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Προειδοποίηση - εκκίνηση ISO σε λάθος λειτουργία κονσόλας!" @@ -6718,7 +6961,7 @@ msgstr "" "και έχουν το ίδιο όνομα με αρχεία στη memcard\n" "Συνέχεια;" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -6726,7 +6969,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -6734,7 +6977,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -6762,7 +7005,7 @@ msgstr "WaveFileWriter - το αρχείο δεν είναι ανοιχτό." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "Hack Ευρείας Οθόνης" @@ -6770,15 +7013,15 @@ msgstr "Hack Ευρείας Οθόνης" msgid "Width" msgstr "Πλάτος" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Wii Κονσόλα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Wii NAND Ρίζα:" @@ -6790,6 +7033,7 @@ msgstr "Εισαγωγή Αποθήκευσης Wii" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 @@ -6803,6 +7047,9 @@ msgstr "Εισαγωγή Αποθήκευσης Wii" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Αρχεία αποθήκευσης Wii (*.bin)|*.bin" @@ -6877,7 +7124,7 @@ msgstr "Windows Menu" msgid "Windows Right" msgstr "Windows Right" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "Αναδίπλωση Λέξεων" @@ -6885,6 +7132,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 @@ -6904,6 +7152,11 @@ msgstr "Αναδίπλωση Λέξεων" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Σε εργασία..." @@ -6911,6 +7164,11 @@ msgstr "Σε εργασία..." msgid "Write to Console" msgstr "Εγγραφή στην Κονσόλα" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "Εγγραφή σε Αρχείο" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "Εγγραφή σε Αρχείο" @@ -6966,7 +7224,7 @@ msgstr "Πρέπει να εισάγετε μία έγκυρη οκταδική msgid "You must enter a valid profile name." msgstr "Πρέπει να εισάγετε ένα έγκυρο όνομα προφίλ." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" "Πρέπει να κάνετε επανεκκίνηση του Dolphin για να έχει επίπτωση αυτή η αλλαγή." @@ -6990,7 +7248,7 @@ msgstr "" "Θα έπρεπε να είναι 0x%04x (αλλά είναι 0x%04llx)\n" "Θέλετε να δημιουργηθεί ένα καινούριο;" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "ZTP hack" @@ -7061,7 +7319,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -7094,12 +7352,12 @@ msgstr "" msgid "s" msgstr "." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "άγνωστη εντολή 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "Το wxExecute επέστρεψε -1 κατά την εκκίνηση της εφαρμογής!" @@ -7125,6 +7383,26 @@ msgstr "| OR" #~ msgstr "" #~ "Δεν μπορεί να γίνει εγγραφή ταινιών σε λειτουργία μόνο για ανάγνωση." +#~ msgid "Enable Audio Throttle" +#~ msgstr "Ενεργοποίηση Throttle Ήχου" + +#~ msgid "" +#~ "This is used to control game speed by sound throttle.\n" +#~ "Disabling this could cause abnormal game speed, such as too fast.\n" +#~ "But sometimes enabling this could cause constant noise.\n" +#~ "\n" +#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." +#~ msgstr "" +#~ "Χρησιμοποιείται για τον έλεγχο της ταχύτητας του παιχνιδιού με throttle " +#~ "ήχου.\n" +#~ "Απενεργοποιώντας το μπορεί να προκλήθει αφύσικη ταχύτητα σε παιχνίδια, π." +#~ "χ. πολύ γρήγορη.\n" +#~ "Όμως ορισμένες φορές η ενεργοποίησή της μπορεί να προκαλέσει μόνιμο " +#~ "θόρυβο.\n" +#~ "\n" +#~ "Συντόμευση πληκτρολογίου : Κρατήστε το πατημένο για να " +#~ "απενεργοποιηθεί η λειτουργία Throttle." + #~ msgid "" #~ "Unknown pointer %#08x\n" #~ "Continue?" diff --git a/Languages/po/en.po b/Languages/po/en.po index 0667cfbf71..a5b3cab7a4 100644 --- a/Languages/po/en.po +++ b/Languages/po/en.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -16,6 +17,9 @@ msgstr "" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Update from master branch. +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-01-06 14:53+0100\n" "Last-Translator: BhaaL \n" "Language-Team: \n" @@ -55,9 +59,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "" @@ -142,7 +146,7 @@ msgstr "" msgid "%sImport GCI%s" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "" @@ -175,11 +179,11 @@ msgstr "" msgid "&DSP Settings" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "" @@ -243,7 +247,7 @@ msgstr "" msgid "&Play" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "" @@ -287,7 +291,7 @@ msgstr "" msgid "&Wiimote Settings" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "" @@ -331,7 +335,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -340,7 +344,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -379,13 +383,13 @@ msgid "" "You must forward TCP port to host!!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "" @@ -397,11 +401,11 @@ msgstr "" msgid "Acceleration" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "" @@ -501,11 +505,11 @@ msgstr "" msgid "Add" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "" @@ -513,6 +517,7 @@ msgstr "" msgid "Add new pane" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -528,6 +533,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "" @@ -561,11 +571,11 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "" @@ -573,14 +583,15 @@ msgstr "" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -593,18 +604,22 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "" @@ -616,7 +631,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Alternate Wiimote Timing" msgstr "" @@ -636,7 +651,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "" @@ -651,7 +666,7 @@ msgid "" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "" @@ -660,16 +675,17 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -679,6 +695,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -687,18 +706,20 @@ msgstr "" msgid "At least one pane must remain open." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -708,6 +729,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "" @@ -743,7 +767,7 @@ msgstr "" msgid "Back" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "" @@ -770,11 +794,11 @@ msgstr "" msgid "Banner" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "" @@ -786,7 +810,7 @@ msgstr "" msgid "Basic" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "" @@ -817,6 +841,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -824,6 +849,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "" @@ -832,7 +860,7 @@ msgstr "" msgid "Bound Controls: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "" @@ -848,7 +876,7 @@ msgstr "" msgid "Browse for an ISO directory..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "" @@ -878,11 +906,11 @@ msgstr "" msgid "C-Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "" @@ -921,7 +949,7 @@ msgstr "" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -929,7 +957,7 @@ msgid "" "is not a valid gamecube memory card file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -945,8 +973,6 @@ msgstr "" msgid "Cant find WiiMote by connection handle %02x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -956,7 +982,7 @@ msgstr "" msgid "Caps Lock" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "" @@ -981,7 +1007,7 @@ msgstr "" msgid "Change Game" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -995,8 +1021,8 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "" @@ -1016,31 +1042,31 @@ msgstr "" msgid "Cheats Manager" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "" @@ -1048,14 +1074,14 @@ msgstr "" msgid "Choose a memory card:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 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 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "" @@ -1067,14 +1093,14 @@ msgstr "" msgid "Classic" msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "" @@ -1088,6 +1114,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 @@ -1096,6 +1123,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "" @@ -1119,20 +1150,20 @@ msgstr "" msgid "Comment" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "" @@ -1159,13 +1190,13 @@ msgstr "" msgid "Configure..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "" @@ -1174,7 +1205,7 @@ msgstr "" msgid "Connect" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "" @@ -1231,12 +1262,12 @@ msgstr "" msgid "Copy failed" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "" @@ -1263,7 +1294,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "" @@ -1274,7 +1305,7 @@ msgid "" "(setting pads while the game is running is not yet supported)" msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1283,7 +1314,7 @@ msgid "" "protected?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "" @@ -1298,7 +1329,7 @@ msgstr "" msgid "Count:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "" @@ -1312,24 +1343,24 @@ msgstr "" msgid "Create new perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "" @@ -1337,7 +1368,7 @@ msgstr "" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "" @@ -1357,7 +1388,7 @@ msgstr "" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "" @@ -1365,11 +1396,11 @@ msgstr "" msgid "Custom Projection Hack Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "" @@ -1381,10 +1412,11 @@ msgstr "" msgid "DSP" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1395,18 +1427,22 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "" @@ -1414,15 +1450,23 @@ msgstr "" msgid "DSP settings" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "" @@ -1443,7 +1487,7 @@ msgstr "" msgid "Debug" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "" @@ -1451,16 +1495,16 @@ msgstr "" msgid "Decimal" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "" @@ -1468,11 +1512,11 @@ msgstr "" msgid "Default" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "" @@ -1481,7 +1525,7 @@ msgstr "" msgid "Delete" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "" @@ -1490,7 +1534,7 @@ msgstr "" msgid "Delete the existing file '%s'?" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "" @@ -1498,8 +1542,8 @@ msgstr "" msgid "Detect" 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 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." @@ -1510,8 +1554,8 @@ msgstr "" msgid "Device" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "" @@ -1534,23 +1578,23 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "" @@ -1580,7 +1624,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "" @@ -1604,6 +1648,7 @@ msgstr "" msgid "Divide" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1613,10 +1658,13 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "" @@ -1641,6 +1689,7 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1665,6 +1714,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1693,11 +1750,11 @@ msgstr "" msgid "Down" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "" @@ -1706,23 +1763,23 @@ msgstr "" msgid "Drums" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "" @@ -1747,6 +1804,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1762,6 +1820,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "" @@ -1782,7 +1845,7 @@ msgid "" "driver." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "" @@ -1798,7 +1861,7 @@ msgstr "" msgid "Edit ActionReplay Code" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "" @@ -1810,8 +1873,8 @@ msgstr "" msgid "Edit current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "" @@ -1850,7 +1913,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "" @@ -1872,23 +1935,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -1901,6 +1964,7 @@ msgstr "" msgid "Enable Cache" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -1910,51 +1974,54 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "" @@ -1967,13 +2034,13 @@ msgid "" "If unsure, select 1x." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "" @@ -1993,20 +2060,20 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 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 "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "" @@ -2018,7 +2085,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2035,6 +2102,7 @@ msgstr "" msgid "End" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2050,6 +2118,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "" @@ -2080,6 +2153,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "" @@ -2110,18 +2184,24 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: 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 +#: Source/Core/Common/Src/ChunkFile.h:194 #, 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 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2153,7 +2233,7 @@ msgstr "" msgid "Export Failed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "" @@ -2166,15 +2246,15 @@ msgstr "" msgid "Export Recording..." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "" @@ -2190,7 +2270,7 @@ msgstr "" msgid "Extension" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "" @@ -2202,44 +2282,44 @@ msgstr "" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "" @@ -2251,11 +2331,11 @@ msgstr "" msgid "FIFO Player" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "" @@ -2267,11 +2347,11 @@ msgstr "" msgid "Failed to Listen!!" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "" @@ -2367,18 +2447,28 @@ msgstr "" msgid "Failed to write header for file %d" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "" +#: Source/Core/Core/Src/Movie.cpp:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "" @@ -2387,7 +2477,7 @@ msgstr "" msgid "File Info" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "" @@ -2416,16 +2506,16 @@ msgstr "" msgid "File not compressed" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" @@ -2433,7 +2523,7 @@ msgstr "" msgid "First Block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "" @@ -2445,7 +2535,7 @@ msgstr "" msgid "Force 4:3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "" @@ -2469,7 +2559,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2500,7 +2590,7 @@ msgstr "" msgid "Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "" @@ -2512,7 +2602,7 @@ msgstr "" msgid "Frame S&kipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "" @@ -2520,10 +2610,11 @@ msgstr "" msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2539,6 +2630,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "" @@ -2571,7 +2667,7 @@ msgstr "" msgid "GCPad" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "" @@ -2587,15 +2683,15 @@ msgstr "" msgid "Game not found!!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "" @@ -2606,6 +2702,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2613,6 +2710,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2621,21 +2721,24 @@ msgid "Gamecube Pad settings" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "" -#: Source/Core/Core/Src/GeckoCode.cpp:139 +#: Source/Core/Core/Src/GeckoCode.cpp:222 #, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 @@ -2644,6 +2747,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2652,6 +2758,7 @@ msgstr "" msgid "General Settings" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2667,6 +2774,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "" @@ -2698,7 +2810,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "" @@ -2730,7 +2842,7 @@ msgstr "" msgid "Header checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "" @@ -2790,12 +2902,16 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "" @@ -2803,12 +2919,12 @@ msgstr "" msgid "Hybrid Wiimote" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2817,11 +2933,11 @@ msgid "" " Dolphin will likely hang now" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "" @@ -2837,15 +2953,15 @@ msgstr "" msgid "IR Sensitivity:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "" @@ -2853,21 +2969,22 @@ msgstr "" msgid "Icon" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 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." +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " +"Audio to throttle using the DSP (might fix audio clicks but can also cause " +"constant noise depending on the game)." msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 @@ -2892,7 +3009,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "" @@ -2931,7 +3048,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "" @@ -2940,7 +3057,7 @@ msgid "In-Game" msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "" @@ -2960,7 +3077,7 @@ msgstr "" msgid "Insert Encrypted or Decrypted code here..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "" @@ -2972,7 +3089,7 @@ msgstr "" msgid "Install WAD" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "" @@ -2981,6 +3098,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -2990,14 +3108,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "" @@ -3020,11 +3141,11 @@ msgstr "" msgid "Internal Resolution:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "" @@ -3041,7 +3162,7 @@ msgstr "" msgid "Invalid bat.map or dir entry" msgstr "" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "" @@ -3058,14 +3179,15 @@ msgid "" " You may need to redump this game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3081,27 +3203,32 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "" @@ -3110,8 +3237,8 @@ msgstr "" msgid "Key" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "" @@ -3129,7 +3256,7 @@ msgstr "" msgid "L-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "" @@ -3175,7 +3302,7 @@ msgstr "" msgid "Less Than" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "" @@ -3183,7 +3310,7 @@ msgstr "" msgid "Load" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "" @@ -3231,6 +3358,7 @@ msgstr "" msgid "Load State..." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3252,6 +3380,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -3275,7 +3410,7 @@ msgstr "" msgid "Local" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "" @@ -3287,11 +3422,11 @@ msgstr "" msgid "Log Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "" @@ -3319,7 +3454,7 @@ msgid "" " %016llx%016llx != %016llx%016llx" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "" @@ -3341,11 +3476,11 @@ msgstr "" msgid "Main Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "" @@ -3369,6 +3504,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3376,6 +3512,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "" @@ -3404,7 +3543,7 @@ msgstr "" msgid "Menu" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "" @@ -3413,11 +3552,11 @@ msgstr "" msgid "Min" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "" @@ -3434,7 +3573,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "" @@ -3447,7 +3586,7 @@ msgstr "" msgid "Motor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3462,7 +3601,7 @@ msgstr "" msgid "Multiply" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3552,6 +3691,7 @@ msgstr "" msgid "NP Up" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3561,6 +3701,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3569,7 +3712,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "" @@ -3583,7 +3726,7 @@ msgid "New Scan" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "" @@ -3595,7 +3738,7 @@ msgstr "" msgid "Nickname :" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "" @@ -3634,7 +3777,7 @@ msgstr "" msgid "None" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "" @@ -3642,8 +3785,8 @@ msgstr "" msgid "Not Equal" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "" @@ -3663,7 +3806,7 @@ msgstr "" msgid "Notes" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "" @@ -3701,7 +3844,7 @@ msgstr "" msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "" @@ -3727,11 +3870,11 @@ msgstr "" msgid "Open" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "" @@ -3753,11 +3896,11 @@ msgstr "" msgid "OpenAL: can't open device %s" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "" @@ -3786,7 +3929,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "" @@ -3836,19 +3979,20 @@ msgstr "" msgid "Parameters" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -3861,6 +4005,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "" @@ -3869,7 +4017,7 @@ msgstr "" msgid "Per-Pixel Lighting" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "" @@ -3882,6 +4030,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -3892,6 +4041,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "" @@ -3905,7 +4058,7 @@ msgstr "" msgid "Play/Pause" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "" @@ -3917,6 +4070,7 @@ msgstr "" msgid "Players" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -3926,6 +4080,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "" @@ -3937,23 +4094,23 @@ msgstr "" msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "" @@ -3962,11 +4119,11 @@ msgstr "" msgid "Port :" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "" @@ -3974,17 +4131,17 @@ msgstr "" msgid "Post-Processing Effect:" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -3997,7 +4154,7 @@ msgstr "" msgid "Prev Page" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "" @@ -4048,7 +4205,7 @@ msgstr "" msgid "RAM" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "" @@ -4061,7 +4218,7 @@ msgstr "" msgid "Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "" @@ -4131,6 +4288,7 @@ msgstr "" msgid "Refresh game list" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4149,6 +4307,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "" @@ -4198,11 +4362,11 @@ msgstr "" msgid "Rumble" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "" @@ -4210,10 +4374,11 @@ msgstr "" msgid "Sa&ve State" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4223,6 +4388,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "" @@ -4280,12 +4448,12 @@ msgstr "" msgid "Save State..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "" @@ -4293,11 +4461,11 @@ msgstr "" msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -4306,6 +4474,7 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4315,15 +4484,18 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "" @@ -4339,12 +4511,12 @@ msgstr "" msgid "Search Filter" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 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:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "" @@ -4354,6 +4526,7 @@ msgstr "" msgid "Select" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4378,6 +4551,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "" @@ -4400,6 +4581,7 @@ msgstr "" msgid "Select the file to load" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 @@ -4416,19 +4598,26 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "" +<<<<<<< HEAD <<<<<<< 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. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "" @@ -4443,7 +4632,7 @@ msgid "" "If unsure, select Auto." msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "" @@ -4479,11 +4668,11 @@ msgstr "" msgid "Separator" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4492,11 +4681,11 @@ msgstr "" msgid "Set" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "" @@ -4506,7 +4695,7 @@ msgstr "" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "" @@ -4518,7 +4707,7 @@ msgstr "" msgid "Shake" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "" @@ -4546,7 +4735,7 @@ msgstr "" msgid "Show Drives" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "" @@ -4562,7 +4751,7 @@ msgstr "" msgid "Show GameCube" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "" @@ -4578,7 +4767,7 @@ msgstr "" msgid "Show Korea" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "" @@ -4598,7 +4787,7 @@ msgstr "" msgid "Show Regions" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "" @@ -4618,34 +4807,34 @@ msgstr "" msgid "Show Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 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." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "" @@ -4676,7 +4865,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "" @@ -4684,11 +4873,11 @@ msgstr "" msgid "Size" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "" @@ -4720,11 +4909,11 @@ msgstr "" msgid "Slot %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "" @@ -4744,7 +4933,7 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "" @@ -4762,6 +4951,7 @@ msgstr "" msgid "Space" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -4777,6 +4967,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "" @@ -4800,7 +4995,7 @@ msgstr "" msgid "Specify a video backend" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "" @@ -4808,7 +5003,7 @@ msgstr "" msgid "Square Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "" @@ -4901,12 +5096,12 @@ msgstr "" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "" @@ -4945,7 +5140,7 @@ msgstr "" msgid "Take Screenshot" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -4961,7 +5156,7 @@ msgstr "" msgid "Texture Cache" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "" @@ -4977,13 +5172,13 @@ msgstr "" msgid "The checksum was successfully fixed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5002,7 +5197,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "" @@ -5024,7 +5219,7 @@ msgid "" "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." +"If unsure, use the rightmost value." msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 @@ -5062,7 +5257,7 @@ msgstr "" msgid "The value is invalid" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "" @@ -5070,13 +5265,13 @@ msgstr "" msgid "Theme selection went wrong" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5088,7 +5283,7 @@ msgid "" "Replay itself." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "" @@ -5104,19 +5299,10 @@ msgid "" msgstr "" #: 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" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5124,7 +5310,7 @@ msgid "" "cause occasional crashes/glitches." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "" @@ -5147,7 +5333,7 @@ msgstr "" msgid "To" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "" @@ -5167,6 +5353,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5174,14 +5361,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "" @@ -5189,7 +5379,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:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "" @@ -5199,7 +5389,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "" @@ -5220,11 +5410,11 @@ msgstr "" msgid "UDP Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "" @@ -5302,7 +5492,7 @@ msgstr "" msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "" @@ -5314,7 +5504,7 @@ msgstr "" msgid "Use Hex" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "" @@ -5335,7 +5525,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "" @@ -5359,25 +5549,28 @@ msgstr "" msgid "Verbosity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +msgid "WAD installation failed: error creating ticket" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5392,15 +5585,15 @@ msgstr "" msgid "Warning" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "" @@ -5421,7 +5614,7 @@ msgid "" "Continue?" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5429,7 +5622,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5437,7 +5630,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5465,7 +5658,7 @@ msgstr "" msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "" @@ -5473,15 +5666,15 @@ msgstr "" msgid "Width" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "" @@ -5489,6 +5682,7 @@ msgstr "" msgid "Wii Save Import" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5498,6 +5692,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5560,10 +5757,11 @@ msgstr "" msgid "Windows Right" msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -5579,6 +5777,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "" @@ -5586,6 +5789,10 @@ msgstr "" msgid "Write to Console" msgstr "" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +msgid "Write to Debugger" +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "" @@ -5639,7 +5846,7 @@ msgstr "" msgid "You must enter a valid profile name." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" @@ -5657,7 +5864,7 @@ msgid "" "Do you want to generate a new one?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "" @@ -5711,7 +5918,7 @@ msgstr "" msgid "^ ADD" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "" @@ -5742,12 +5949,12 @@ msgstr "" msgid "s" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "" diff --git a/Languages/po/es.po b/Languages/po/es.po index 5b7d2b9a35..3e31ea03ed 100644 --- a/Languages/po/es.po +++ b/Languages/po/es.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-12-09 00:28+0100\n" ======= @@ -21,6 +22,9 @@ msgstr "" >>>>>>> Updated Spanish translation ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-12-23 16:03+0100\n" >>>>>>> Update from master branch. "Last-Translator: Petiso Carambanal \n" @@ -64,9 +68,9 @@ msgstr "\"%s\" no es un archivo GCM/ISO válido, o no es una ISO GC/Wii." msgid "%1$sCopy%1$s" msgstr "%1$sCopiar%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -163,7 +167,7 @@ msgstr "%sExportar GCI%s" msgid "%sImport GCI%s" msgstr "%sImportar GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u Bloques libres; %u entradas de dir. libres" @@ -196,11 +200,11 @@ msgstr "Administrador de &trucos" msgid "&DSP Settings" msgstr "&Configuración DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&Borrar ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&Borrar ISO seleccionadas..." @@ -264,7 +268,7 @@ msgstr "&Pausa" msgid "&Play" msgstr "&Jugar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&Propiedades" @@ -308,7 +312,7 @@ msgstr "&Vista" msgid "&Wiimote Settings" msgstr "&Configuración de wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "&Wiki" @@ -352,7 +356,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -361,7 +365,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -418,13 +422,13 @@ msgstr "" "\n" "¡¡Debe redireccionar el puerto TCP para hostear!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "Placa base AM" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "Códigos AR" @@ -436,11 +440,11 @@ msgstr "Acerca de Dolphin" msgid "Acceleration" msgstr "Aceleración" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "Exactitud:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Emulación de VBeam Precisa" @@ -568,11 +572,11 @@ msgstr "Adaptador:" msgid "Add" msgstr "Añadir" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "Añadir código ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "Añadir Parche" @@ -580,6 +584,7 @@ msgstr "Añadir Parche" msgid "Add new pane" msgstr "Añadir nueva ventana" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -595,6 +600,11 @@ msgstr "Añadir nueva ventana" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Añadir..." @@ -643,11 +653,11 @@ msgid "Adjust the analog control pressure required to activate buttons." msgstr "" "Ajusta la presión requerida del control analógico para activar los botones." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "Avanzado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Configuración avanzada" @@ -655,14 +665,15 @@ msgstr "Configuración avanzada" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Todos los archivos GC/Wii (elf, dol, gcm, iso, ciso, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Todas las imágenes GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "Todos los archivos Gamecube GCM (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -675,18 +686,22 @@ msgstr "Todos los archivos Gamecube GCM (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Todos los estados guardados (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "Todos los archivos ISO de Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Todos los archivos ISO comprimidos de GC/Wii (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "Todos los archivos (*.*)|*.*" @@ -702,6 +717,7 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 <<<<<<< HEAD <<<<<<< HEAD @@ -713,6 +729,9 @@ msgid "Alternate Wiimote Timing" msgstr "Wiimote emulado" >>>>>>> Update translation files for recent changes in the code. ======= +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Alternate Wiimote Timing" msgstr "Sincronización alternativa del Wiimote" >>>>>>> Updated Spanish translation @@ -733,7 +752,7 @@ msgstr "Apploader tiene tamaño incorrecto... ¿Es realmente un apploader?" msgid "Apploader unable to load from file" msgstr "Apploader no puede cargar desde el archivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Apploader:" @@ -751,7 +770,7 @@ msgstr "" "\n" "Si no está seguro, seleccione (off)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Árabe" @@ -760,7 +779,7 @@ msgstr "Árabe" msgid "Are you sure you want to delete \"%s\"?" msgstr "¿Estás seguro de que quieres borrar \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -768,10 +787,11 @@ msgstr "" "¿Seguro que quieres borrar estos archivos?\n" "¡Desaparecerán para siempre!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "¿Seguro que quieres borrar este archivo? ¡Desaparecerá para siempre!" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -781,6 +801,9 @@ msgstr "¿Seguro que quieres borrar este archivo? ¡Desaparecerá para siempre!" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Relación de aspecto:" @@ -789,18 +812,20 @@ msgstr "Relación de aspecto:" msgid "At least one pane must remain open." msgstr "Al menos una ventana debe permancer abierta." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Motor de Audio:" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error al abrir dispositivo AO.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -810,6 +835,9 @@ msgstr "AudioCommon: Error al abrir dispositivo AO.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automático" @@ -853,7 +881,7 @@ msgstr "" msgid "Back" msgstr "Atrás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Configuración del motor" @@ -880,11 +908,11 @@ msgstr "Cabecera de archivo incorrecta" msgid "Banner" msgstr "Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "Detalles del banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "Banner:" @@ -896,7 +924,7 @@ msgstr "Barra" msgid "Basic" msgstr "Básico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Configuración básica" @@ -927,6 +955,7 @@ msgstr "Azul derecha" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -934,6 +963,9 @@ msgstr "Azul derecha" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Inferior" @@ -942,7 +974,7 @@ msgstr "Inferior" msgid "Bound Controls: %lu" msgstr "Controles asignados: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Quebrado" @@ -958,7 +990,7 @@ msgstr "Busca un directorio para añadir" msgid "Browse for an ISO directory..." msgstr "Buscar un directorio de ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "Busca un directorio de salida" @@ -988,11 +1020,11 @@ msgstr "Stick C" msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "Emulador de CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "Caché de listas de visualización" @@ -1046,7 +1078,7 @@ msgstr "No se puede abrir %s" msgid "Cannot unregister events with events pending" msgstr "No se puede cancelar el registro de eventos con eventos pendientes" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1057,7 +1089,7 @@ msgstr "" "%s\n" "no es un fichero válido de tarjeta de memoria de Gamecube." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1075,8 +1107,6 @@ msgstr "No se puede encontrar el WiiMote por bd: %02x:%02x:%02x:%02x:%02x:%02x" msgid "Cant find WiiMote by connection handle %02x" msgstr "No se puede encontrar un WiiMote por el título de conexión %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1086,7 +1116,7 @@ msgstr "No se puede leer del DVD_Plugin - DVD-Interface: Error Fatal" msgid "Caps Lock" msgstr "Bloq Mayús" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "Catalán" @@ -1111,7 +1141,7 @@ msgstr "Cambiar disco" msgid "Change Game" msgstr "Cambiar Juego" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1127,8 +1157,8 @@ msgstr "Cambia el signo del parámetro zFar (después de la corrección)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Cambia el signo del parámetro zNear (después de la corrección)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "" "¡Cambiar esto no tendrá ningún efecto mientras el emulador esté ejecutandose!" @@ -1149,31 +1179,31 @@ msgstr "Búscar trucos" msgid "Cheats Manager" msgstr "Administrador de trucos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Chino Simplificado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Chino (Tradicional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "Escoge un directorio raíz de DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "Escoge un directorio raíz para la NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Escoge una ISO por defecto:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "Escoge un directorio para añadir" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Escoge un archivo a abrir" @@ -1181,6 +1211,7 @@ msgstr "Escoge un archivo a abrir" msgid "Choose a memory card:" msgstr "Escoge una tarjeta de memoria:" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 @@ -1190,6 +1221,9 @@ msgstr "Escoge una tarjeta de memoria:" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1197,8 +1231,8 @@ msgstr "" "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 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Escoge la carpeta de destino" @@ -1210,14 +1244,14 @@ msgstr "Circle Stick" msgid "Classic" msgstr "Clásico" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "Limpiar" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "Fallo al borrar." @@ -1233,6 +1267,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 @@ -1241,6 +1276,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Cerrar" @@ -1264,20 +1303,20 @@ msgstr "Comando" msgid "Comment" msgstr "Comentario" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Comentario:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "Comprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Comprimir ISO seleccionadas..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "Comprimiendo ISO" @@ -1304,13 +1343,13 @@ msgstr "Configurar mandos" msgid "Configure..." msgstr "Configurar..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "Confirmar sobrescritura de archivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "Confirmar al detenerse" @@ -1319,7 +1358,7 @@ msgstr "Confirmar al detenerse" msgid "Connect" msgstr "Conectar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "Conectar Teclado USB" @@ -1376,12 +1415,12 @@ msgstr "Convertir a GCI" msgid "Copy failed" msgstr "Fallo al copiar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "Copiar a tarjeta de memoria %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "Núcleo" @@ -1411,7 +1450,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "No se pudo reconocer el archivo ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "No se pudo guardar %s" @@ -1426,7 +1465,7 @@ msgstr "" "(definir los pads mientras el juego está ejecutándose no está permitido " "todavía)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1439,7 +1478,7 @@ msgstr "" "¿Está ejecutando Dolphin desde un CD/DVD, o el archivo de guardado está " "protegido contra escritura?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "No se pudo hallar el comando para abrir la extension 'ini'!" @@ -1456,7 +1495,7 @@ msgstr "" msgid "Count:" msgstr "Cuenta:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "País:" @@ -1470,10 +1509,11 @@ msgstr "Crear Código AR" msgid "Create new perspective" msgstr "Crear nueva perspectiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "Creado por KDE-Look.org" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 @@ -1483,20 +1523,23 @@ msgstr "Creado por KDE-Look.org" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Creado por Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "Creado por VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "Creado por black_rider y publicado en ForumW.org > Web Developments" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "Creador:" @@ -1504,7 +1547,7 @@ msgstr "Creador:" msgid "Critical" msgstr "Critico" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "Cortar" @@ -1527,7 +1570,7 @@ msgstr "Fundido" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "El directorio actual cambio de %s a %s luego de wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "Hack de proyección personalizado" @@ -1535,11 +1578,11 @@ msgstr "Hack de proyección personalizado" msgid "Custom Projection Hack Settings" msgstr "Configuración del hack de proyección personalizado" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "Personalizar algunos párametros de la proyección ortográfica." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Checo" @@ -1551,10 +1594,11 @@ msgstr "Pad direccional" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "Motor de emulación DSP" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1565,18 +1609,22 @@ msgstr "Motor de emulación DSP" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulación DSP HLE (rápido)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "Intérprete DSP LLE (lento)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "DSP LLE en un proceso" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "Recompilador DSP LLE" @@ -1584,15 +1632,23 @@ msgstr "Recompilador DSP LLE" msgid "DSP settings" msgstr "Configuración DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "Raíz DVD:" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "Tamaño de datos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "Fecha:" @@ -1613,7 +1669,7 @@ msgstr "Zona muerta" msgid "Debug" msgstr "Depurar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "Depurarando" @@ -1621,16 +1677,16 @@ msgstr "Depurarando" msgid "Decimal" msgstr "Decimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "Descomprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "Descomprimir ISO seleccionadas..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "Descomprimir ISO" @@ -1638,11 +1694,11 @@ msgstr "Descomprimir ISO" msgid "Default" msgstr "Defecto" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "ISO por defecto:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "Fuente por defecto" @@ -1651,7 +1707,7 @@ msgstr "Fuente por defecto" msgid "Delete" msgstr "Borrar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "Borrar guardado" @@ -1660,7 +1716,7 @@ msgstr "Borrar guardado" msgid "Delete the existing file '%s'?" msgstr "¿Borrar el archivo existente '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "Descripción" @@ -1668,8 +1724,8 @@ msgstr "Descripción" msgid "Detect" msgstr "Detectar" -#: 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 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." @@ -1682,8 +1738,8 @@ msgstr "" msgid "Device" msgstr "Dispositivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Configuración del dispositivo" @@ -1708,23 +1764,23 @@ msgstr "" " y falló la suma de verificación del directorio backup" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "Deshabilitar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "Deshabilitar niebla" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "Deshabilitar iluminación" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "Desactivar profundidad por píxel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "Deshabilitar texturas" @@ -1768,7 +1824,7 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Disco" @@ -1795,6 +1851,7 @@ msgstr "" msgid "Divide" msgstr "Dividir" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1804,10 +1861,13 @@ msgstr "Dividir" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "¿Quieres detener la emulación actual?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1832,6 +1892,7 @@ msgstr "Configuración de wiimote emulado de Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1856,6 +1917,14 @@ msgstr "Configuración de GCPad Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Configuración de GCPad Dolphin" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Películas TAS de Dolphin (*.dtm)" @@ -1904,11 +1973,11 @@ msgstr "" msgid "Down" msgstr "Abajo" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "Descargar códigos (base de datos de WiiRD)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Se descargaron %lu códigos. (%lu añadidos)" @@ -1917,23 +1986,23 @@ msgstr "Se descargaron %lu códigos. (%lu añadidos)" msgid "Drums" msgstr "Tambores" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "Dummy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "Depósito de audio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "Volcar objetivo EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "Volcar frames" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "Volcar texturas" @@ -1967,6 +2036,7 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1982,6 +2052,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Holandés" @@ -2006,7 +2081,7 @@ msgstr "" "Dolphin, puede que se necesite reiniciar para que Windows reconozca el nuevo " "controlador." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "EUROPA" @@ -2022,7 +2097,7 @@ msgstr "Editar" msgid "Edit ActionReplay Code" msgstr "Editar código ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Editar configuración" @@ -2034,8 +2109,8 @@ msgstr "Editar parche" msgid "Edit current perspective" msgstr "Editar perspectiva actual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "Editar..." @@ -2080,7 +2155,7 @@ msgstr "Emular XFB usando texturas de objetos de la GPU" msgid "Emulated Wiimote" msgstr "Wiimote emulado" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "Estado de emulación:" @@ -2108,18 +2183,15 @@ msgstr "" msgid "Enable AR Logging" msgstr "Habilitar Registro de AR" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "Habilitar aceleración de audio" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "Habilitar BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Habilitar asociación de bloques" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 @@ -2130,6 +2202,9 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "Permitir el cálculo del cuadro delimitador" @@ -2138,6 +2213,7 @@ msgstr "Permitir el cálculo del cuadro delimitador" msgid "Enable Cache" msgstr "Habilitar caché" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2147,51 +2223,54 @@ msgstr "Habilitar caché" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Habilitar trucos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "Habilitar música DTK" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Habilitar doble núcleo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Habilitar doble núcleo (mejora)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "Habilitar atajos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Habilitar salto de fotogramas inactivos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Habilitar salto de fotogramas inactivos (mejora)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Habilitar MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "Habilitar escaneado progresivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "Habilitar salvapantallas" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "Habilitar pantalla panorámica" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "Habilitar \"alambrado\" (wireframe)" @@ -2209,7 +2288,7 @@ msgstr "" "\n" "Si estás inseguro, déjalo sin marcar." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2217,7 +2296,7 @@ msgstr "" "Habilitar acceso rápido al disco. Es necesario para algunos juegos. (ON = " "Rápido, OFF=Compatible)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "Habilitar páginas" @@ -2246,6 +2325,7 @@ msgstr "" "\n" "Si no estás seguro, déjalo sin marcar." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 @@ -2255,6 +2335,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2262,7 +2345,7 @@ msgstr "" "Habilitar esto para acelerar The Legend of Zelda: Twilight Princess. " "Deshabilitar para CUALQUIER OTRO juego." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2272,7 +2355,7 @@ msgstr "" "unidad de administración de memoria (MMU). Es preciso al hardware original, " "pero es lento para emular. (ON = compatible, OFF = rápido)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "Habilta un hack de proyección personalizado" @@ -2288,7 +2371,7 @@ msgstr "" "\n" "Si no estás seguro, déjalo sin marcar." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2310,6 +2393,7 @@ msgstr "" msgid "End" msgstr "Fin" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2325,6 +2409,11 @@ msgstr "Fin" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Inglés" @@ -2355,6 +2444,7 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Error" @@ -2387,14 +2477,24 @@ msgstr "" "Disculpa, la grabación de Wii no funciona temporalmente." >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "Error" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: 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." +<<<<<<< HEAD #: Source/Core/Common/Src/ChunkFile.h:180 <<<<<<< HEAD ======= +======= +#: Source/Core/Common/Src/ChunkFile.h:194 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " @@ -2403,8 +2503,12 @@ 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..." +<<<<<<< HEAD #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 >>>>>>> Update from master branch. +======= +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "" <<<<<<< HEAD @@ -2448,7 +2552,7 @@ msgstr "Cerrar Dolphin con el emulador" msgid "Export Failed" msgstr "Fallo al exportar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "Exportar archivo" @@ -2461,15 +2565,15 @@ msgstr "Exportar grabación..." msgid "Export Recording..." msgstr "Exportar grabación..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "Exportar guardado" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "Exportar guardado de Wii (experimental)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "Exportar todos los guardados" @@ -2485,7 +2589,7 @@ msgstr "Exportar guardado como..." msgid "Extension" msgstr "Extensión" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "Buffer de frames externo" @@ -2497,44 +2601,44 @@ msgstr "Parámetro extra" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Parámetro extra solo útil en ''Metroid: Other M''." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "Extraer todos los archivos..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "Extraer Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "Extraer DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "Extraer directorio..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "Extraer archivo..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "Extraer partición" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "Extrayendo %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "Extrayendo todos los archivos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "Extraer directorio" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "Extrayendo..." @@ -2546,11 +2650,11 @@ msgstr "Byte de FIFO" msgid "FIFO Player" msgstr "Jugador FIFO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "FRANCIA" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "Tamaño del FST:" @@ -2562,11 +2666,11 @@ msgstr "¡Fallo al conectar!" msgid "Failed to Listen!!" msgstr "¡Fallo al escuchar!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "Fallo al descargar los códigos." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Falló al extraer a %s!" @@ -2683,18 +2787,28 @@ msgstr "Falló al escribir la cabecera para %s" msgid "Failed to write header for file %d" msgstr "Falló al escribir la cabecera para el archivo %d" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "Rápido" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "Mipmaps rápidos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "Versión rápida del MMU. No funciona para todos los juegos." +#: Source/Core/Core/Src/Movie.cpp:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "Jugador Fifo" @@ -2703,7 +2817,7 @@ msgstr "Jugador Fifo" msgid "File Info" msgstr "Información del fichero" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "El archivo no contenía códigos." @@ -2736,16 +2850,16 @@ msgstr "El archivo no es reconocido como una tarjeta de memoria" msgid "File not compressed" msgstr "Archivo sin comprimir" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Modo desconocido de apertura : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "Sistema de archivos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "¡Tipo de archivo INI desconocido: no se abrirá!" @@ -2753,7 +2867,7 @@ msgstr "¡Tipo de archivo INI desconocido: no se abrirá!" msgid "First Block" msgstr "Primer bloque" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "Reparar sumas de verificación" @@ -2765,7 +2879,7 @@ msgstr "Forzar 16:9" msgid "Force 4:3" msgstr "Forzar 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "Forzar consola como NTSC-J" @@ -2800,7 +2914,7 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2836,7 +2950,7 @@ msgstr "Frame " msgid "Frame Advance" msgstr "Avanzar &fotogramas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "Volcado de fotogramas usa FFV1" @@ -2848,7 +2962,7 @@ msgstr "Información de la grabación" msgid "Frame S&kipping" msgstr "Salto de &fotogramas" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Límite de fotogramas:" @@ -2856,10 +2970,11 @@ msgstr "Límite de fotogramas:" msgid "Frames To Record" msgstr "Frames a grabar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "Cámara libre" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2875,6 +2990,11 @@ msgstr "Cámara libre" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Francés" @@ -2913,7 +3033,7 @@ msgstr "Configuración del micro de GC" msgid "GCPad" msgstr "Pad GC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "ID del juego:" @@ -2929,15 +3049,15 @@ msgstr "¡El juego no está ejecutándose!" msgid "Game not found!!" msgstr "¡¡Juego no encontrado!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "Configuración específica del juego" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Configurar Juego" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" @@ -2948,6 +3068,7 @@ msgstr "&Configuración del mando 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 @@ -2955,6 +3076,9 @@ msgstr "&Configuración del mando Gamecube" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Tarjetas de memoria de Gamecube (*.raw,*.gcp)" @@ -2963,15 +3087,17 @@ msgid "Gamecube Pad settings" msgstr "Configuración del Pad de Gamecube" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Códigos Gecko" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" "GeckoCode falló al ejecutarse (CT%i CST%i) (%s)\n" "(puede ser un código incorrecto o su tipo no es soportado todavía.)" @@ -2986,8 +3112,12 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "General" @@ -2996,6 +3126,7 @@ msgstr "General" msgid "General Settings" msgstr "Ajustes generales" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -3011,6 +3142,11 @@ msgstr "Ajustes generales" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Alemán" @@ -3076,7 +3212,7 @@ msgstr "" "\n" "Si está inseguro, déjelo marcado." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Griego" @@ -3108,7 +3244,7 @@ msgstr "Hacks" msgid "Header checksum failed" msgstr "Falló la suma de verificación de cabecera" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Hebreo" @@ -3172,6 +3308,7 @@ msgstr "Configuración de atajos" <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 @@ -3180,10 +3317,13 @@ msgstr "Configuración de atajos" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Atajos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Húngaro" @@ -3191,14 +3331,14 @@ msgstr "Húngaro" msgid "Hybrid Wiimote" msgstr "Wiimote híbrido" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS: Se trató de obtener los datos de un ticket desconocido: " "%08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -3211,11 +3351,11 @@ msgstr "" "TitleID %016llx.\n" " Dolphin probablemente se bloqueará ahora" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - destino incorrecto" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "Configuración IPL" @@ -3231,15 +3371,15 @@ msgstr "Puntero IR" msgid "IR Sensitivity:" msgstr "Sensibilidad IR:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "Detalles del ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "Directorios de ISO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "ITALIA" @@ -3247,7 +3387,7 @@ msgstr "ITALIA" msgid "Icon" msgstr "Icono" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -3258,13 +3398,14 @@ msgstr "" "usado por los juegos de Paper Mario." >>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "Si los FPS son erróneos, esta opción puede ayudar. (ON = Compatible, OFF = " "Rápido)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 @@ -3274,9 +3415,14 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy +>>>>>>> Update the pot file to reflect recent changes in the code. 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." +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " +"Audio to throttle using the DSP (might fix audio clicks but can also cause " +"constant noise depending on the game)." msgstr "" "Si define un límite de fotogramas por segunda mayor que la velocidad de " "juego completa (NTSC: 60, PAL: 50), también debe deshabilitar la regulación " @@ -3314,7 +3460,7 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "Importar Guardado" @@ -3365,7 +3511,7 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "En juego" @@ -3374,7 +3520,7 @@ msgid "In-Game" msgstr "En juego" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Información" @@ -3394,7 +3540,7 @@ msgstr "Insertar" msgid "Insert Encrypted or Decrypted code here..." msgstr "Insertar código encriptado o desencriptado aquí..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Insertar tarjeta SD" @@ -3406,7 +3552,7 @@ msgstr "Insertar un nombre aquí.." msgid "Install WAD" msgstr "Instalar WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Instalar al menú de la Wii" @@ -3417,6 +3563,7 @@ msgstr "" "Se ha llamado InstallExceptionHandler, pero esta plataforma no lo soporta " "todavía." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3426,14 +3573,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Instalando WAD..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "Interfaz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "Configuración de la interfaz" @@ -3458,11 +3608,11 @@ msgstr "Error Interno de LZO - lzo_init() falló" msgid "Internal Resolution:" msgstr "Resolución interna:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Intérprete (MUY lento)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "Intro" @@ -3479,7 +3629,7 @@ msgstr "¡Valor no válido!" msgid "Invalid bat.map or dir entry" msgstr "bat.map o entrada de directorio no válido" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "Evento de tipo %i no válido" @@ -3499,14 +3649,15 @@ msgstr "" "%s\n" " Puede que necesitas volcar este juego de nuevo." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "Archivo de grabación no válido" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "Estado no válido" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3522,27 +3673,32 @@ msgstr "Estado no válido" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italiano" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "JAPÓN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "Recompilador JIT (recomendado)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "Recompilador experimental JITIL" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japonés" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "COREA" @@ -3551,8 +3707,8 @@ msgstr "COREA" msgid "Key" msgstr "Clave" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Coreano" @@ -3570,7 +3726,7 @@ msgstr "Botón L" msgid "L-Analog" msgstr "L-Analógico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "Idioma:" @@ -3623,7 +3779,7 @@ msgstr "" msgid "Less Than" msgstr "Menor que" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "Usar FPS para limitar" @@ -3631,7 +3787,7 @@ msgstr "Usar FPS para limitar" msgid "Load" msgstr "Cargar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "Cargar texturas personalizadas" @@ -3679,6 +3835,7 @@ msgstr "&Cargar estado 8" msgid "Load State..." msgstr "Cargar estado..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3700,6 +3857,13 @@ msgstr "Cargar Menú de sistema Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "Cargar Menú de sistema Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Cargar Menú de sistema Wii %d %c" @@ -3726,7 +3890,7 @@ msgstr "Carga el archivo especificado (DOL, ELF, WAD, GCM, ISO)" msgid "Local" msgstr "Local" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Fijar procesos en núcleos" @@ -3738,11 +3902,11 @@ msgstr "Registrar" msgid "Log Configuration" msgstr "Configuración de registro" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Tipos de registro" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Salida de registro" @@ -3772,7 +3936,7 @@ msgstr "" "MD5 no coinciden\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "Hack de velocidad MMU" @@ -3794,11 +3958,11 @@ msgstr "Archivos MadCatz Gameshark (*.gcs)" msgid "Main Stick" msgstr "Stick principal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "ID del fabricante:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "Fabricante:" @@ -3822,6 +3986,7 @@ msgstr "Byte de memoria" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3829,6 +3994,9 @@ msgstr "Byte de memoria" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Tarjeta de memoria" @@ -3867,7 +4035,7 @@ msgstr "" msgid "Menu" msgstr "Menú" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "Mic" @@ -3876,11 +4044,11 @@ msgstr "Mic" msgid "Min" msgstr "Mín." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "Varios" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Configuraciones varias" @@ -3901,7 +4069,7 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "Fuente monoespaciada" @@ -3914,7 +4082,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3943,7 +4111,7 @@ msgstr "" msgid "Multiply" msgstr "Multiplicar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -4035,6 +4203,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Arriba" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -4044,6 +4213,9 @@ msgstr "NP Arriba" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4052,7 +4224,7 @@ msgstr "Nombre:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Nombre:" @@ -4066,7 +4238,7 @@ msgid "New Scan" msgstr "Nuevo escaneado" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "Próxima página" @@ -4078,7 +4250,7 @@ msgstr "Próximo escaneado" msgid "Nickname :" msgstr "Apodo:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "Ningún país (SDK)" @@ -4117,7 +4289,7 @@ msgstr "No se encontró carpeta de guardado para el juego %s" msgid "None" msgstr "Ninguno" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Noruego Bokmal" @@ -4125,8 +4297,8 @@ msgstr "Noruego Bokmal" msgid "Not Equal" msgstr "No igual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "No definido" @@ -4146,7 +4318,7 @@ msgstr "Sin conectar" msgid "Notes" msgstr "Notas" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "Notas:" @@ -4184,7 +4356,7 @@ msgstr "Objeto" msgid "Object Range" msgstr "Rango de objeto" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Off" @@ -4210,11 +4382,11 @@ msgstr "Solo %d bloques disponibles" msgid "Open" msgstr "Abrir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "Abrir directorio &contenedor" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "Abrir carpeta de guardado&s de Wii" @@ -4236,11 +4408,11 @@ msgstr "OpenAL: no se encuentran dispositivos de sonido" msgid "OpenAL: can't open device %s" msgstr "OpenAL: no se puede abrir el dispositivo %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "Descodificador de texturas OpenCL" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "Descodificador de texturas OpenMP" @@ -4273,7 +4445,7 @@ msgstr "" "e impórtalos a una nueva tarjeta de memoria\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "Otros" @@ -4325,19 +4497,20 @@ msgstr "Párrafo" msgid "Parameters" msgstr "Parámetros" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partición %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Parches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Directorios" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4350,6 +4523,10 @@ msgstr "Directorios" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -4358,7 +4535,7 @@ msgstr "Pausa" msgid "Per-Pixel Lighting" msgstr "Iluminación por píxel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Perfecto" @@ -4371,6 +4548,7 @@ msgstr "Perspectiva %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 ======= @@ -4381,6 +4559,10 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Reproducir" @@ -4394,7 +4576,7 @@ msgstr "Reproducir grabación" msgid "Play/Pause" msgstr "Reproducir/pausa" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "Jugable" @@ -4406,6 +4588,7 @@ msgstr "Opciones de reproducción" msgid "Players" msgstr "Jugadores" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4415,6 +4598,9 @@ msgstr "Jugadores" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Confirma, por favor..." @@ -4426,23 +4612,23 @@ msgstr "Por favor, crea una perspectiva antes de guardar" msgid "Plus-Minus" msgstr "Más-menos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Polaco" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Puerto 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Puerto 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Puerto 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Puerto 4" @@ -4451,11 +4637,11 @@ msgstr "Puerto 4" msgid "Port :" msgstr "Puerto:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portugués" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portugués (Brasil)" @@ -4463,7 +4649,7 @@ msgstr "Portugués (Brasil)" msgid "Post-Processing Effect:" msgstr "Efecto de posprocesado:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" <<<<<<< HEAD @@ -4472,7 +4658,7 @@ msgstr "" msgstr "Final prematuro de la película en PlayController. %u + 8 > %u" >>>>>>> Update from master branch. -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" <<<<<<< HEAD @@ -4481,7 +4667,7 @@ msgstr "" msgstr "Final prematuro de la película en PlayWiimote. %u + %d > %u" >>>>>>> Update from master branch. -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" <<<<<<< HEAD @@ -4498,7 +4684,7 @@ msgstr "Predefinidos:" msgid "Prev Page" msgstr "Página previa" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "Página previa" @@ -4549,7 +4735,7 @@ msgstr "R-Analógico" msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "RUSIA" @@ -4562,7 +4748,7 @@ msgstr "Rango" msgid "Read-only mode" msgstr "Solo lectura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "Real" @@ -4637,6 +4823,7 @@ msgstr "Actualizar lista" msgid "Refresh game list" msgstr "Actualizar lista de juegos" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4655,6 +4842,12 @@ msgstr "Actualizar lista de juegos" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Eliminar" @@ -4707,11 +4900,11 @@ msgstr "Stick Derecho" msgid "Rumble" msgstr "Vibración" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Arranca DSPLLE en un proceso dedicado (no recomendado)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Ruso" @@ -4719,10 +4912,11 @@ msgstr "Ruso" msgid "Sa&ve State" msgstr "Guardar estado" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "Seguro" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4732,6 +4926,9 @@ msgstr "Seguro" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Frecuencia del sonido:" @@ -4789,12 +4986,12 @@ msgstr "Guardar estado 8" msgid "Save State..." msgstr "Guardar estado..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Guardar como..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Guardar GCM/ISO comprimido" @@ -4802,11 +4999,11 @@ msgstr "Guardar GCM/ISO comprimido" msgid "Save current perspective" msgstr "Guardar perspectiva actual" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "Guardar GCM/ISO descomprimido" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -4817,16 +5014,16 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "EFB Copia a escala" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 #, c-format msgid "Scanning %s" msgstr "Escaneando %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "Buscando ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "Escaneando..." @@ -4842,12 +5039,12 @@ msgstr "Bloq. desplazamiento" msgid "Search Filter" msgstr "Filtro de búsqueda" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Buscar en subcarpetas" -#: 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:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "No se ha encontrado la sección %s en SYSCONF" @@ -4857,6 +5054,7 @@ msgstr "No se ha encontrado la sección %s en SYSCONF" msgid "Select" msgstr "Seleccionar" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4881,6 +5079,14 @@ msgstr "Seleccionar archivo de grabación" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Seleccionar archivo de grabación" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Elige un WAD de Wii para instalar" @@ -4906,16 +5112,21 @@ msgstr "Selecciona las ventanas flotantes" msgid "Select the file to load" msgstr "Selecciona el archivo para cargar" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Selecciona el archivo de guardado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Selecciona el estado para cargar" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 @@ -4935,6 +5146,9 @@ msgstr "Selecciona el estado para cargar" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Selecciona el estado para guardar" @@ -4956,7 +5170,7 @@ msgstr "" "\n" "Si está inseguro, elija Automático." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Fuente seleccionada" @@ -5005,10 +5219,11 @@ msgstr "Posición de la barra sensora:" msgid "Separator" msgstr "Separador" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Serbio" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 @@ -5018,6 +5233,9 @@ msgstr "Serbio" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -5028,11 +5246,11 @@ msgstr "" msgid "Set" msgstr "Definir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "Definir como ISO por &defecto" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "Definir como Memory Card por defecto %c" @@ -5044,7 +5262,7 @@ msgstr "" "SetARCode_IsActive: El índice es mayor que el tamaño de la lista de códigos " "AR %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "Configuración..." @@ -5056,7 +5274,7 @@ msgstr "SetupWiiMem: No se puede encontrar el archivo de configuración" msgid "Shake" msgstr "Sacudir" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "Nombre corto:" @@ -5084,7 +5302,7 @@ msgstr "Mostrar barra de herramien&tas" msgid "Show Drives" msgstr "Mostrar unidades" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "Mostrar regiones de copiado de EFB" @@ -5100,7 +5318,7 @@ msgstr "Mostrar Francia" msgid "Show GameCube" msgstr "Mostrar Gamecube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "Mostrar entrada" @@ -5116,7 +5334,7 @@ msgstr "Mostrar JAP" msgid "Show Korea" msgstr "Mostrar Corea" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "Mostrar idioma:" @@ -5136,7 +5354,7 @@ msgstr "Mostrar plataformas" msgid "Show Regions" msgstr "Mostrar regiones" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "Mostar estadísticas" @@ -5156,11 +5374,11 @@ msgstr "Mostrar WAD" msgid "Show Wii" msgstr "Mostrar Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "Mostrar una ventana de confirmación antes de detener un juego." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 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 " @@ -5171,23 +5389,23 @@ msgstr "" "pero también significa que Dolphin puede cerrarse ante un error sin ninguna " "explicación." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "Mostrar primer bloque" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "Mostrar bloques de guardado" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "Mostrar comentario del guardado" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "Mostrar icono del guardado" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "Mostrar título del guardado" @@ -5225,7 +5443,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Wiimote de costado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Chino simplificado" @@ -5233,11 +5451,11 @@ msgstr "Chino simplificado" msgid "Size" msgstr "Tamaño" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "Saltar BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "Saltar pase de alpha en dest." @@ -5303,11 +5521,11 @@ msgstr "" msgid "Slot %i" msgstr "Ranura %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Ranura A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Ranura B" @@ -5331,7 +5549,7 @@ msgstr "" "¿Realmente quieres activar renderizado por software? Si está inseguro, " "escoja No." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "Configuración de sonido" @@ -5349,6 +5567,7 @@ msgstr "Falló la creación del búfer de sonido: %s" msgid "Space" msgstr "Espacio" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5364,6 +5583,11 @@ msgstr "Espacio" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Español" @@ -5395,7 +5619,7 @@ msgstr "" msgid "Specify a video backend" msgstr "Especifica un motor de vídeo" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Acelerar la transferencia de disco" @@ -5403,7 +5627,7 @@ msgstr "Acelerar la transferencia de disco" msgid "Square Stick" msgstr "Stick cuadrado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "Control estándar" @@ -5504,12 +5728,12 @@ msgstr "Los archivos de guardado se han importado con éxito." msgid "Swing" msgstr "Oscilar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Idioma del sistema:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "TAIWÁN" @@ -5548,7 +5772,7 @@ msgstr "Tabla derecha" msgid "Take Screenshot" msgstr "Captura de pantalla" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" <<<<<<< HEAD msgstr "" @@ -5568,7 +5792,7 @@ msgstr "Textura" msgid "Texture Cache" msgstr "Caché de texturas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "Superposición del formato de la textura" @@ -5584,13 +5808,13 @@ msgstr "La dirección no es válida" msgid "The checksum was successfully fixed" msgstr "La suma de verificación fue reparada con éxito." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "El directorio escogido ya se encuentra en la lista" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5614,7 +5838,7 @@ msgid "The file %s was already open, the file header will not be written." msgstr "" "El archivo %s ya estaba abierto, la cabecera de archivo no será escrita." -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "El archivo especificado (%s) no existe" @@ -5632,11 +5856,12 @@ msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "El código AR descifrado que se ha obtenido no contiene ninguna línea." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#, fuzzy msgid "" "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." +"If unsure, use the rightmost value." msgstr "" "Cuanto más seguro ajuste esto, es menos probable que el emulador se pierda " "las actualizaciones de la textura de la memoria RAM.\n" @@ -5681,7 +5906,7 @@ msgstr "El archivo especificado \"%s\" no existe" msgid "The value is invalid" msgstr "El valor no es válido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Tema visual" @@ -5689,7 +5914,7 @@ msgstr "Tema visual" msgid "Theme selection went wrong" msgstr "Hubo un error al seleccionar el tema" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5697,7 +5922,7 @@ msgstr "" "Debe haber un ticket para 00000001/00000002. Probablemente su volcado de " "NAND esté incompleto." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5713,7 +5938,7 @@ msgstr "" "El simulador de Action Replay no soporta códigos que modifiquen al Action " "Replay." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "" "Esto podría provocar peor rendimiento en el Menú de Wii y algunos juegos." @@ -5739,26 +5964,11 @@ msgstr "" "Si no está seguro, deje esta casilla sin marcar." #: 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" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" -"Esto es utilizado para controlar la velocidad del juego por la del audio.\n" -"Deshabilitar esto puede causar velocidad de juego anormal, como muy rápido.\n" -"Pero a veces puede provocar ruido constante.\n" -"\n" -"Atajo de Teclado : Mantén la tecla presionada para desabilitar la " -"regulación instantáneamente." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "" "Esto es usado para reproducir pistas de música, como música de fondo (BGM)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5770,7 +5980,7 @@ msgstr "" "Provoca mejoras de velocidad muy grandes en PC con mas de un núcleo, pero " "puede ocasionar errores gráficos o del programa." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "Esto te permitirá editar manualmente el archivo de configuración INI" @@ -5793,7 +6003,7 @@ msgstr "Título" msgid "To" msgstr "A" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "Alternar todos los tipos de registro" @@ -5813,6 +6023,7 @@ msgstr "Cambiar a pantalla completa" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5820,14 +6031,17 @@ msgstr "Cambiar a pantalla completa" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Superior" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Chino tradicional" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "Se trató de cargar un archivo de tipo desconocido." @@ -5835,7 +6049,7 @@ msgstr "Se trató de cargar un archivo de tipo desconocido." msgid "Triggers" msgstr "Gatillos" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Intentando leer de un SYSCONF no válido" @@ -5847,7 +6061,7 @@ msgstr "" "Intentando leer de un SYSCONF no válido\n" "bt ids del Wiimote no están disponibles" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Turco" @@ -5868,11 +6082,11 @@ msgstr "Puerto UDP:" msgid "UDP Wiimote" msgstr "UDP Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "DESCONOCIDO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "EUA" @@ -5957,7 +6171,7 @@ msgstr "Actualizar" msgid "Upright Wiimote" msgstr "Wiimote parado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Usar Modo EuRGB60 (PAL60)" @@ -5969,7 +6183,7 @@ msgstr "Usar pantalla completa" msgid "Use Hex" msgstr "Usar hexadecimal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Usar advertencias" @@ -6001,7 +6215,7 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "Utilidad" @@ -6025,25 +6239,29 @@ msgstr "Valor:" msgid "Verbosity" msgstr "Verbosidad" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Vídeo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Virtual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Volumen" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "La instalación del WAD falló: error al crear %s" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "La instalación del WAD falló: error al crear %s" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -6063,15 +6281,15 @@ msgstr "" msgid "Warning" msgstr "Advertencia" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "Advertencia - arrancando un DOL en un modo de consola incorrecto!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Advertencia - arrancando un ELF en un modo de consola incorrecto!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Advertencia - arrancando un ISO en un modo de consola incorrecto!" @@ -6101,7 +6319,7 @@ msgstr "" "y tienen el mismo nombre que el archivo en tu memcard\n" "Continuar?" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -6115,7 +6333,7 @@ msgstr "" "de continuar, o cargar éste sin el modo de solo lectura." >>>>>>> Update from master branch. -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -6130,7 +6348,7 @@ msgstr "" "obtenga una desincronización." >>>>>>> Update from master branch. -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -6176,7 +6394,7 @@ msgstr "WaveFileWriter - el archivo no está abierto." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "Hack de pantalla ancha (widescreen)" @@ -6184,15 +6402,15 @@ msgstr "Hack de pantalla ancha (widescreen)" msgid "Width" msgstr "Ancho" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Consola Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Raíz de la NAND de Wii:" @@ -6200,6 +6418,7 @@ msgstr "Raíz de la NAND de Wii:" msgid "Wii Save Import" msgstr "Importar guardado de Wii" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -6209,6 +6428,9 @@ msgstr "Importar guardado de Wii" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Archivos de guardado Wii (*.bin)|*.bin" @@ -6275,10 +6497,11 @@ msgstr "Windows Menú" msgid "Windows Right" msgstr "Windows Derecha" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "Word Wrap" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -6294,6 +6517,11 @@ msgstr "Word Wrap" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Trabajando..." @@ -6301,6 +6529,11 @@ msgstr "Trabajando..." msgid "Write to Console" msgstr "Escribir a la consola" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "Escribir a archivo" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "Escribir a archivo" @@ -6356,7 +6589,7 @@ msgstr "Debes introducir un valor decimal o hexadecimal válido." msgid "You must enter a valid profile name." msgstr "Debes introducir un nombre de perfil válido." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Debes reiniciar Dolphin para que el cambio tenga efecto." @@ -6379,7 +6612,7 @@ msgstr "" "Debería ser 0x%04x (pero es 0x%04llx)\n" "¿Quiere crear uno nuevo?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "Zelda TP hack" @@ -6450,7 +6683,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -6483,12 +6716,12 @@ msgstr "" msgid "s" msgstr "s" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "cmd 0x%08x desconocido" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute dio un -1 al arrancar la aplicación!" @@ -6697,6 +6930,9 @@ msgstr "| OR" #~ msgid "Emulator Display Settings" #~ msgstr "Configuración de la visualización del Emulador" +#~ msgid "Enable Audio Throttle" +#~ msgstr "Habilitar aceleración de audio" + #~ msgid "Enable CPU Access" #~ msgstr "Habilitar acceso a la CPU" @@ -6754,6 +6990,13 @@ msgstr "| OR" #~ msgid "Error allocating buffer" #~ msgstr "Error al asignar el búfer" +#~ 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." + #~ msgid "Error loading %s: can't read info" #~ msgstr "Error al cargar %s: no se puede leer la información" @@ -7035,6 +7278,22 @@ msgstr "| OR" #~ msgid "The file " #~ msgstr "El archivo " +#~ msgid "" +#~ "This is used to control game speed by sound throttle.\n" +#~ "Disabling this could cause abnormal game speed, such as too fast.\n" +#~ "But sometimes enabling this could cause constant noise.\n" +#~ "\n" +#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." +#~ msgstr "" +#~ "Esto es utilizado para controlar la velocidad del juego por la del " +#~ "audio.\n" +#~ "Deshabilitar esto puede causar velocidad de juego anormal, como muy " +#~ "rápido.\n" +#~ "Pero a veces puede provocar ruido constante.\n" +#~ "\n" +#~ "Atajo de Teclado : Mantén la tecla presionada para desabilitar la " +#~ "regulación instantáneamente." + #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "Esto es usado comunmente para reproducir voces y efectos de sonido." diff --git a/Languages/po/fa.po b/Languages/po/fa.po index e73a5c95ba..f643a327a3 100644 --- a/Languages/po/fa.po +++ b/Languages/po/fa.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-18 13:39-0600\n" +"POT-Creation-Date: 2012-03-09 16:54-0600\n" "PO-Revision-Date: 2011-12-18 14:00-0600\n" "Last-Translator: Hamed Khakbiz \n" "Language-Team: Hamed Khakbiz \n" @@ -49,9 +49,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "" @@ -136,7 +136,7 @@ msgstr "%sصادر کردن GCI%s" msgid "%sImport GCI%s" msgstr "%sوارد کردن GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "" @@ -169,11 +169,11 @@ msgstr "&مدریت کدهای تقلب" msgid "&DSP Settings" msgstr "&تنظیمات صدا DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&پاک کردن فایل ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&پاک کردن فایل ISO انطخاب شده" @@ -237,7 +237,7 @@ msgstr "مکث" msgid "&Play" msgstr "&شروع بازی" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "خواص" @@ -281,7 +281,7 @@ msgstr "&دیدن" msgid "&Wiimote Settings" msgstr "&تنظیمات Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "&ویکی" @@ -325,7 +325,7 @@ msgstr "<اسم را اینجا وارد کنید>" msgid "" msgstr "<سایز تصویر پیدا نشد>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "<هیچ>" @@ -334,7 +334,7 @@ msgstr "<هیچ>" msgid "" msgstr "<فشار کلید>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "<سیستم>" @@ -373,13 +373,13 @@ msgid "" "You must forward TCP port to host!!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "کدهای اکشن ریپلی" @@ -391,11 +391,11 @@ msgstr "درباره دلفین" msgid "Acceleration" msgstr "شتاب دهنده" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "دقت" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "" @@ -495,11 +495,11 @@ msgstr "آداپتور" msgid "Add" msgstr "اضافه کردن" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "اضافه کردن کد اکشن ریپلی" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "اضافه کردن وصله" @@ -507,9 +507,9 @@ msgstr "اضافه کردن وصله" msgid "Add new pane" msgstr "اضافه کردن تکه جدید" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 msgid "Add..." msgstr "اضافه کردن..." @@ -543,11 +543,11 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "پیشرفته" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "تنظیمات پیشرفته" @@ -555,28 +555,28 @@ msgstr "تنظیمات پیشرفته" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 msgid "All Save States (sav, s##)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "تمام اسناد Wii ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "تمام اسناد فشرده شده GC/Wii ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "تمام اسناد (*.*)|*.*" @@ -588,7 +588,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Alternate Wiimote Timing" msgstr "" @@ -608,7 +608,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "" @@ -623,7 +623,7 @@ msgid "" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "عربی" @@ -632,17 +632,17 @@ msgstr "عربی" msgid "Are you sure you want to delete \"%s\"?" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "نصبت طول به عرض تصویر:" @@ -651,19 +651,20 @@ msgstr "نصبت طول به عرض تصویر:" msgid "At least one pane must remain open." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "صدا" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "پشتوانه صدا" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "اتوماتیک" @@ -699,7 +700,7 @@ msgstr "" msgid "Back" msgstr "برگشت" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "تنضیمات پشتوانه" @@ -726,11 +727,11 @@ msgstr "" msgid "Banner" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "" @@ -742,7 +743,7 @@ msgstr "نوار" msgid "Basic" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "" @@ -771,7 +772,7 @@ msgid "Blue Right" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 msgid "Bottom" msgstr "پائین" @@ -780,7 +781,7 @@ msgstr "پائین" msgid "Bound Controls: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "خراب" @@ -796,7 +797,7 @@ msgstr "جوستجو پوشه برای اضافه کردن" msgid "Browse for an ISO directory..." msgstr "جوستجو برای پوشه ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "جوستجو برای پوشه خروجی" @@ -818,11 +819,11 @@ msgstr "" msgid "C-Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "موتور جوستجو پردازشگر" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "" @@ -861,7 +862,7 @@ msgstr "" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -869,7 +870,7 @@ msgid "" "is not a valid gamecube memory card file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -885,8 +886,6 @@ msgstr "" msgid "Cant find WiiMote by connection handle %02x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -896,7 +895,7 @@ msgstr "" msgid "Caps Lock" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "" @@ -921,7 +920,7 @@ msgstr "تغییر دیسک" msgid "Change Game" msgstr "تغییر بازی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -937,8 +936,8 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "این تغییر در زمانی که شبیه ساز در حال کار می باشد اثری نخواهد داشت!" @@ -958,31 +957,31 @@ msgstr "جوستجو برای کد تقلب" msgid "Cheats Manager" msgstr "مدریت کدهای تقلب" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "چینی (ساده شده)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "چینی (سنتی)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "انتخاب پوشه برای DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "انتخاب پوشه برای NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "انتخاب ISO پیش فرز:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "انتخاب پوشه برای اضافه کردن" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "انتخاب سند برای باز کردن" @@ -990,14 +989,14 @@ msgstr "انتخاب سند برای باز کردن" msgid "Choose a memory card:" msgstr "انتخاب کارت حافظه:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 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 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "انتخاب پوشه برای استخراج در آن" @@ -1009,14 +1008,14 @@ msgstr "" msgid "Classic" msgstr "کلاسیک" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "پاک کردن" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "پاک کردن با شکست مواجه شد." @@ -1028,8 +1027,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 msgid "Close" msgstr "بستن" @@ -1053,20 +1052,20 @@ msgstr "دستور" msgid "Comment" msgstr "توضیح" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "توضیح:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "فشرده کردن ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "فشرده کردن ISO انتخاب شده..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "در حال فشرده کردن ISO" @@ -1093,13 +1092,13 @@ msgstr "پیکربندی گیم پدها" msgid "Configure..." msgstr "پیکربندی..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "تائید بازنویسی سند" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "تائید برای توقف" @@ -1108,7 +1107,7 @@ msgstr "تائید برای توقف" msgid "Connect" msgstr "اتصال" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "اتصال کیبورد USB" @@ -1157,12 +1156,12 @@ msgstr "تبدیل به GCI" msgid "Copy failed" msgstr "کپی با شکست مواجه شد" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "کپی به کارت حافظه %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "هسته" @@ -1189,7 +1188,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "" @@ -1200,7 +1199,7 @@ msgid "" "(setting pads while the game is running is not yet supported)" msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1209,7 +1208,7 @@ msgid "" "protected?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "" @@ -1224,7 +1223,7 @@ msgstr "" msgid "Count:" msgstr "شماردن:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "کشور:" @@ -1238,24 +1237,24 @@ msgstr "ساخت کد اکشن ریپلی" msgid "Create new perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "سازنده:" @@ -1263,7 +1262,7 @@ msgstr "سازنده:" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "حذف قسمتى تصوير" @@ -1283,7 +1282,7 @@ msgstr "ضرب دری" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "" @@ -1291,11 +1290,11 @@ msgstr "" msgid "Custom Projection Hack Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "چکوسلواکی" @@ -1307,24 +1306,24 @@ msgstr "" msgid "DSP" msgstr "صدا DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "موتور شبیه ساز صدا DSP" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP HLE emulation (fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "" @@ -1332,15 +1331,23 @@ msgstr "" msgid "DSP settings" msgstr "تنظیمات صدا DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "ریشه DVD:" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "سایزه داده" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "تاریخ:" @@ -1361,7 +1368,7 @@ msgstr "" msgid "Debug" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "" @@ -1369,16 +1376,16 @@ msgstr "" msgid "Decimal" msgstr "دسیمال" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "ناهمفشرده کردن ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "ناهمفشرده کردن ISO انتخاب شده..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "در حال ناهمفشرده کردن ISO" @@ -1386,11 +1393,11 @@ msgstr "در حال ناهمفشرده کردن ISO" msgid "Default" msgstr "پیش فرز" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr ":ISO پیش فرز" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "دست خط پیش فرز" @@ -1399,7 +1406,7 @@ msgstr "دست خط پیش فرز" msgid "Delete" msgstr "پاک کردن" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "پاک کردن Save" @@ -1408,7 +1415,7 @@ msgstr "پاک کردن Save" msgid "Delete the existing file '%s'?" msgstr "آیا سند موجود پاک شود '%s'؟" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "شرح" @@ -1416,8 +1423,8 @@ msgstr "شرح" msgid "Detect" 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 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." @@ -1428,8 +1435,8 @@ msgstr "" msgid "Device" msgstr "دستگاه" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "تنظیمات دستگاه" @@ -1452,23 +1459,23 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "غیر فعال" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "" @@ -1498,7 +1505,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "دیسک" @@ -1522,11 +1529,11 @@ msgstr "" msgid "Divide" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 msgid "Do you want to stop the current emulation?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "دلفین" @@ -1551,12 +1558,12 @@ msgstr "پیکربندی Wiimote شبیه سازی شده دلفین" msgid "Dolphin FIFO" msgstr "دلفین FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "پیکربندی GCPad دلفین" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 msgid "Dolphin TAS Movies (*.dtm)" msgstr "دلفین TAS Movies (*.dtm)" @@ -1589,11 +1596,11 @@ msgstr "" msgid "Down" msgstr "پائین" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "دانلود کدها (WiiRD Database)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "کدهای %lu دانلود شده. (added %lu)" @@ -1602,23 +1609,23 @@ msgstr "کدهای %lu دانلود شده. (added %lu)" msgid "Drums" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "نسخه بردارى صدا" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "نسخه بردارى فریم" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "" @@ -1643,9 +1650,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Dutch" msgstr "هلندی" @@ -1666,7 +1673,7 @@ msgid "" "driver." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "اوروپا" @@ -1682,7 +1689,7 @@ msgstr "ویرایش" msgid "Edit ActionReplay Code" msgstr "ویریش کدهای اکشن ریپلی" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "ویرایش پيکربندى" @@ -1694,8 +1701,8 @@ msgstr "ویرایش وصله" msgid "Edit current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "ویرایش..." @@ -1734,7 +1741,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "" @@ -1756,19 +1763,15 @@ msgstr "" msgid "Enable AR Logging" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "Enable Bounding Box Calculation" msgstr "" @@ -1776,52 +1779,52 @@ msgstr "" msgid "Enable Cache" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Enable Cheats" msgstr "فعال کردن کدهای تقلب" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "فعال کردن موزیک DTK" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "فعال کردن پردانده با دو هسته یا بیشتر" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "فعال کردن پردانده با دو هسته یا بیشتر (بالا بردن سرعت)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "فعال کردن شرت کاتها" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "" @@ -1834,13 +1837,13 @@ msgid "" "If unsure, select 1x." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "" @@ -1860,20 +1863,20 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 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 "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "" @@ -1885,7 +1888,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -1902,9 +1905,9 @@ msgstr "" msgid "End" msgstr "پایان" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "English" msgstr "انگلیسی" @@ -1933,29 +1936,22 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 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 "" - #: 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 +#: Source/Core/Common/Src/ChunkFile.h:194 #, 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 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -1987,7 +1983,7 @@ msgstr "خروج دلفین با شبیه ساز" msgid "Export Failed" msgstr "صادر کردن با شکست مواجه شد" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "صادر کردن سند" @@ -2000,15 +1996,15 @@ msgstr "صادر کردن ضبط" msgid "Export Recording..." msgstr "صادر کردن ضبط..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "صادر کردن Save" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "صادر کردن Wii save (آزمایشی)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "صادر کردن تمام Save ها" @@ -2024,7 +2020,7 @@ msgstr "صادر کردن Save با عنوان..." msgid "Extension" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "" @@ -2036,44 +2032,44 @@ msgstr "" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "استخراج کردن تمامی اسناد..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "استخراج کردن Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "استخراج کردن DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "استخراج کردن پوشه..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "استخراج کردن سند..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "استخراج کردن پارتیشن..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "استخراج کردن %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "استخراج کردن تمامی اسناد" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "استخراج کردن پوشه" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "استخراج کردن..." @@ -2085,11 +2081,11 @@ msgstr "" msgid "FIFO Player" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "فرانسه" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "" @@ -2101,11 +2097,11 @@ msgstr "اتصال با شکست مواجه شد!" msgid "Failed to Listen!!" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "دانلود کدها با شکست مواجه شد." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "" @@ -2201,18 +2197,28 @@ msgstr "" msgid "Failed to write header for file %d" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "سریع" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "" +#: Source/Core/Core/Src/Movie.cpp:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "" @@ -2221,7 +2227,7 @@ msgstr "" msgid "File Info" msgstr "مشخصات سند" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "" @@ -2250,16 +2256,16 @@ msgstr "" msgid "File not compressed" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" @@ -2267,7 +2273,7 @@ msgstr "" msgid "First Block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "" @@ -2279,7 +2285,7 @@ msgstr "" msgid "Force 4:3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "" @@ -2303,7 +2309,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2334,7 +2340,7 @@ msgstr "" msgid "Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "" @@ -2346,7 +2352,7 @@ msgstr "" msgid "Frame S&kipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "" @@ -2354,13 +2360,13 @@ msgstr "" msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "French" msgstr "فرانسوی" @@ -2394,7 +2400,7 @@ msgstr "تنضیمات ثبت وقايع" msgid "GCPad" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "" @@ -2410,15 +2416,15 @@ msgstr "" msgid "Game not found!!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "" @@ -2427,7 +2433,7 @@ msgid "Gamecube &Pad Settings" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2436,20 +2442,22 @@ msgid "Gamecube Pad settings" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "" -#: Source/Core/Core/Src/GeckoCode.cpp:139 +#: Source/Core/Core/Src/GeckoCode.cpp:222 #, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "کلی" @@ -2458,9 +2466,9 @@ msgstr "کلی" msgid "General Settings" msgstr "تنظیمات کلی" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "German" msgstr "" @@ -2492,7 +2500,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "یونانی" @@ -2524,7 +2532,7 @@ msgstr "" msgid "Header checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "" @@ -2576,11 +2584,11 @@ msgstr "پیگربندی شرت کات" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 msgid "Hotkeys" msgstr "کاتها" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "مجارستانی" @@ -2588,12 +2596,12 @@ msgstr "مجارستانی" msgid "Hybrid Wiimote" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2602,11 +2610,11 @@ msgid "" " Dolphin will likely hang now" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "" @@ -2622,15 +2630,15 @@ msgstr "" msgid "IR Sensitivity:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "جزئیات ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "پوشه های ISO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "ايتاليا" @@ -2638,21 +2646,22 @@ msgstr "ايتاليا" msgid "Icon" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 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." +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " +"Audio to throttle using the DSP (might fix audio clicks but can also cause " +"constant noise depending on the game)." msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 @@ -2677,7 +2686,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr " وارد کردن Save" @@ -2716,7 +2725,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "در بازی" @@ -2725,7 +2734,7 @@ msgid "In-Game" msgstr "در-بازی" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "مشخصات" @@ -2745,7 +2754,7 @@ msgstr "درج" msgid "Insert Encrypted or Decrypted code here..." msgstr "درج کد رمز شده و یا کشف رمز..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "درج کارت SD" @@ -2757,7 +2766,7 @@ msgstr "درج اسم..." msgid "Install WAD" msgstr "نصب WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "نصب به منوی Wii" @@ -2766,15 +2775,15 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 msgid "Installing WAD..." msgstr "در حال نصب WAD..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "" @@ -2797,11 +2806,11 @@ msgstr "" msgid "Internal Resolution:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "" @@ -2818,7 +2827,7 @@ msgstr "مقدار نا معتبر" msgid "Invalid bat.map or dir entry" msgstr "bat.map نا معتبر یا ورودی پوشه" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "واقعه نا معتبر %i" @@ -2835,38 +2844,38 @@ msgid "" " You may need to redump this game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "سند ضبط نا معتبر" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "وضیعت نا معتبر" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Italian" msgstr "ایتالیائی" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "ژاپن" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "ژاپنی" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "کره" @@ -2875,8 +2884,8 @@ msgstr "کره" msgid "Key" msgstr "کلید" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "کره ای" @@ -2894,7 +2903,7 @@ msgstr "" msgid "L-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "زبان:" @@ -2940,7 +2949,7 @@ msgstr "" msgid "Less Than" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "" @@ -2948,7 +2957,7 @@ msgstr "" msgid "Load" msgstr "بارگیری" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "بارگیری Texture دلخواه" @@ -2996,11 +3005,11 @@ msgstr "بارگیری State شکاف ۸" msgid "Load State..." msgstr "بارگیری State..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -3024,7 +3033,7 @@ msgstr "" msgid "Local" msgstr "محلی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "" @@ -3036,11 +3045,11 @@ msgstr "ثبت وقايع" msgid "Log Configuration" msgstr "تنضیمات ثبت وقايع" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "نوع ثبت وقايع" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "خروجی ثبت وقايع" @@ -3068,7 +3077,7 @@ msgid "" " %016llx%016llx != %016llx%016llx" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "" @@ -3082,11 +3091,11 @@ msgstr "" msgid "Main Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "" @@ -3108,7 +3117,7 @@ msgid "Memory Byte" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 msgid "Memory Card" msgstr "کارت حافظه" @@ -3137,7 +3146,7 @@ msgstr "" msgid "Menu" msgstr "فهرست انتخاب" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "میکروفن" @@ -3146,11 +3155,11 @@ msgstr "میکروفن" msgid "Min" msgstr "حداقل" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "متفرقه" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "تنظیمات متفرقه" @@ -3167,7 +3176,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "" @@ -3180,7 +3189,7 @@ msgstr "" msgid "Motor" msgstr "موتور" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3195,7 +3204,7 @@ msgstr "" msgid "Multiply" msgstr "ضریب" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3285,7 +3294,7 @@ msgstr "" msgid "NP Up" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3294,7 +3303,7 @@ msgstr "اسم:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "اسم:" @@ -3308,7 +3317,7 @@ msgid "New Scan" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "صفحه بعد" @@ -3320,7 +3329,7 @@ msgstr "" msgid "Nickname :" msgstr "اسم مستعار" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "" @@ -3359,7 +3368,7 @@ msgstr "" msgid "None" msgstr "هیچکدام" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "" @@ -3367,8 +3376,8 @@ msgstr "" msgid "Not Equal" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "" @@ -3380,7 +3389,7 @@ msgstr "" msgid "Notes" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "" @@ -3418,7 +3427,7 @@ msgstr "شیی" msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "خاموش" @@ -3437,11 +3446,11 @@ msgstr "" msgid "Open" msgstr "گشودن" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "" @@ -3463,11 +3472,11 @@ msgstr "" msgid "OpenAL: can't open device %s" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "" @@ -3496,7 +3505,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "غیره" @@ -3546,21 +3555,21 @@ msgstr "" msgid "Parameters" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "وصله ها" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "مسیرها" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "مکث" @@ -3569,7 +3578,7 @@ msgstr "مکث" msgid "Per-Pixel Lighting" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "کامل" @@ -3580,8 +3589,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 msgid "Play" msgstr "شروع بازی" @@ -3595,7 +3604,7 @@ msgstr "شروع ضبط" msgid "Play/Pause" msgstr "شروع بازی/مکث" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "قابل بازی" @@ -3607,7 +3616,7 @@ msgstr "" msgid "Players" msgstr "بازی کنان" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 msgid "Please confirm..." msgstr "لطفا تایید کنید..." @@ -3619,23 +3628,23 @@ msgstr "" msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "لهستانی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "درگاه ۱" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "درگاه ۲" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "درگاه ۳" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "درگاه ۴" @@ -3644,11 +3653,11 @@ msgstr "درگاه ۴" msgid "Port :" msgstr "درگاه :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "پرتقال" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "پرتقال" @@ -3656,17 +3665,17 @@ msgstr "پرتقال" msgid "Post-Processing Effect:" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -3679,7 +3688,7 @@ msgstr "حالت های از پيش تنظيم شده" msgid "Prev Page" msgstr "صفحه قبلی" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "صفحه قبلی" @@ -3730,7 +3739,7 @@ msgstr "" msgid "RAM" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "روسیه" @@ -3743,7 +3752,7 @@ msgstr "محدوده" msgid "Read-only mode" msgstr "حالت فقط خواندنی" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "واقعی" @@ -3814,10 +3823,10 @@ msgstr "به روز کردن لیست" msgid "Refresh game list" msgstr "به روز کردن لیست بازی" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Remove" msgstr "پاک کردن" @@ -3860,11 +3869,11 @@ msgstr "" msgid "Rumble" msgstr "شوک" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "روسی" @@ -3872,11 +3881,11 @@ msgstr "روسی" msgid "Sa&ve State" msgstr "ذخ&یره State" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "بی خطر" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Sample Rate:" msgstr "نرخ نمونه برداری صدا" @@ -3934,12 +3943,12 @@ msgstr "ذخیره State شکاف ۸" msgid "Save State..." msgstr "ذخیره State..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "ذخیره با عنوان" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "ذخیره GCM/ISO فشرده" @@ -3947,11 +3956,11 @@ msgstr "ذخیره GCM/ISO فشرده" msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "ذخیره GCM/ISO ناهمفشرده" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -3960,16 +3969,16 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 #, c-format msgid "Scanning %s" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "" @@ -3985,12 +3994,12 @@ msgstr "" msgid "Search Filter" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 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:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "" @@ -4000,12 +4009,12 @@ msgstr "" msgid "Select" msgstr "انتخاب" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "انتخاب سند ضبط شده" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 msgid "Select a Wii WAD file to install" msgstr "انتخاب سند Wii WAD برای نصب" @@ -4028,15 +4037,15 @@ msgstr "انتخاب پنجره شناور" msgid "Select the file to load" msgstr "انتخاب سند برای بارگیری" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 msgid "Select the save file" msgstr "انتخاب سند Save" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "انتخاب State برای بارگیری" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 msgid "Select the state to save" msgstr "انتخاب State برای ذخیره" @@ -4051,7 +4060,7 @@ msgid "" "If unsure, select Auto." msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "دست خط انتخاب شده" @@ -4087,11 +4096,11 @@ msgstr "" msgid "Separator" msgstr "جدا کننده" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "صربستانی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4100,11 +4109,11 @@ msgstr "" msgid "Set" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "" @@ -4114,7 +4123,7 @@ msgstr "" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "تنظیمات" @@ -4126,7 +4135,7 @@ msgstr "" msgid "Shake" msgstr "لرزش" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "اسم کوتاه:" @@ -4155,7 +4164,7 @@ msgstr "نمایش &نوار ابزار" msgid "Show Drives" msgstr "نمایش درایوها" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "نمایش منطقه کپی EFB" @@ -4171,7 +4180,7 @@ msgstr "نمایش فرانسه" msgid "Show GameCube" msgstr "نمایش GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "نمایش ورودی تصویر" @@ -4187,7 +4196,7 @@ msgstr "نمایش ژاپن" msgid "Show Korea" msgstr "نمایش کره" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "نمایش زبان:" @@ -4207,7 +4216,7 @@ msgstr "نمایش پایگاه" msgid "Show Regions" msgstr "نمایش منطقه" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "نمایش آمار" @@ -4227,34 +4236,34 @@ msgstr "نمایش Wad" msgid "Show Wii" msgstr "نمایش Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "نمایش پنجره تعید قبل از متوقف کردن بازی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 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." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "" @@ -4285,7 +4294,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "چینی ساده شده" @@ -4293,11 +4302,11 @@ msgstr "چینی ساده شده" msgid "Size" msgstr "سایز" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "" @@ -4329,11 +4338,11 @@ msgstr "" msgid "Slot %i" msgstr "شکاف %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "شکاف A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "شکاف B" @@ -4353,7 +4362,7 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "تنضیمات صدا" @@ -4371,9 +4380,9 @@ msgstr "" msgid "Space" msgstr "فضا" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Spanish" msgstr "اسپانیائی" @@ -4397,7 +4406,7 @@ msgstr "" msgid "Specify a video backend" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "" @@ -4405,7 +4414,7 @@ msgstr "" msgid "Square Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "" @@ -4483,12 +4492,12 @@ msgstr "" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "" @@ -4521,7 +4530,7 @@ msgstr "" msgid "Take Screenshot" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -4537,7 +4546,7 @@ msgstr "" msgid "Texture Cache" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "" @@ -4553,13 +4562,13 @@ msgstr "آدرس بی اعتبار است" msgid "The checksum was successfully fixed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -4578,7 +4587,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "" @@ -4600,7 +4609,7 @@ msgid "" "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." +"If unsure, use the rightmost value." msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 @@ -4638,7 +4647,7 @@ msgstr "" msgid "The value is invalid" msgstr "مقدار بی اعتبار است" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "" @@ -4646,13 +4655,13 @@ msgstr "" msgid "Theme selection went wrong" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -4664,7 +4673,7 @@ msgid "" "Replay itself." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "" @@ -4680,19 +4689,10 @@ msgid "" msgstr "" #: 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" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -4700,7 +4700,7 @@ msgid "" "cause occasional crashes/glitches." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "" @@ -4723,7 +4723,7 @@ msgstr "عنوان" msgid "To" msgstr "به" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "" @@ -4734,15 +4734,15 @@ msgid "Toggle Fullscreen" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 msgid "Top" msgstr "اوج" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "چینی سنتی" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "" @@ -4750,7 +4750,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:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "" @@ -4760,7 +4760,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "ترکی" @@ -4781,11 +4781,11 @@ msgstr "" msgid "UDP Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "ناشناخته" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "آمریکا" @@ -4850,7 +4850,7 @@ msgstr "به روز کردن" msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "" @@ -4862,7 +4862,7 @@ msgstr "" msgid "Use Hex" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "" @@ -4883,7 +4883,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "کاربردی" @@ -4907,25 +4907,28 @@ msgstr "مقدار:" msgid "Verbosity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "ویدیو" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "مجازی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "حجم صدا" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +msgid "WAD installation failed: error creating ticket" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -4940,15 +4943,15 @@ msgstr "" msgid "Warning" msgstr "اختار" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "" @@ -4969,7 +4972,7 @@ msgid "" "Continue?" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -4977,7 +4980,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -4985,7 +4988,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5013,7 +5016,7 @@ msgstr "" msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "" @@ -5021,15 +5024,15 @@ msgstr "" msgid "Width" msgstr "عرض" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "ميز فرمان Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "ریشه Wii NAND:" @@ -5037,7 +5040,7 @@ msgstr "ریشه Wii NAND:" msgid "Wii Save Import" msgstr "وارد کردن Wii Save" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 msgid "Wii save files (*.bin)|*.bin" msgstr "سند Wii save (*.bin)|*.bin" @@ -5093,13 +5096,13 @@ msgstr "" msgid "Windows Right" msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 msgid "Working..." msgstr "در حال کار کردن..." @@ -5107,6 +5110,10 @@ msgstr "در حال کار کردن..." msgid "Write to Console" msgstr "" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +msgid "Write to Debugger" +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "" @@ -5160,7 +5167,7 @@ msgstr "" msgid "You must enter a valid profile name." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" @@ -5178,7 +5185,7 @@ msgid "" "Do you want to generate a new one?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "" @@ -5232,7 +5239,7 @@ msgstr "" msgid "^ ADD" msgstr "^ اضافه کردن" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "" @@ -5263,12 +5270,12 @@ msgstr "" msgid "s" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "" diff --git a/Languages/po/fr.po b/Languages/po/fr.po index d5f462ae2c..f50163bd39 100644 --- a/Languages/po/fr.po +++ b/Languages/po/fr.po @@ -10,7 +10,11 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-10-28 23:40+0100\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -69,9 +73,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sCopie%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -166,7 +170,7 @@ msgstr "%sExporter GCI%s" msgid "%sImport GCI%s" msgstr "%sImporter GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u blocs libres, %u entrées de rép. libres" @@ -199,11 +203,11 @@ msgstr "Gestionnaire de &cheats" msgid "&DSP Settings" msgstr "Paramètres &DSP (audio)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&Supprimer l'ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&Supprimer les ISO sélectionnés" @@ -267,7 +271,7 @@ msgstr "&Pause" msgid "&Play" msgstr "&Démarrer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&Propriétés" @@ -311,7 +315,7 @@ msgstr "&Affichage" msgid "&Wiimote Settings" msgstr "Paramètres de la &Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "&Wiki" @@ -355,7 +359,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -364,7 +368,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -421,13 +425,13 @@ msgstr "" "\n" "Vous devez indiquer le port TCP à l'hôte !!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "Codes AR" @@ -439,11 +443,11 @@ msgstr "A propos de Dolphin" msgid "Acceleration" msgstr "Accéleration" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "Précision :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Emulation fidèle VBeam" @@ -570,11 +574,11 @@ msgstr "Carte :" msgid "Add" msgstr "Ajouter" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "Ajouter un code ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "Ajouter un patch" @@ -585,6 +589,7 @@ msgstr "Ajouter un nouveau panneau" <<<<<<< 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 @@ -603,6 +608,11 @@ msgstr "Ajouter un nouveau panneau" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Ajouter..." @@ -651,11 +661,11 @@ msgid "Adjust the analog control pressure required to activate buttons." msgstr "" "Ajuste le contrôle analogique de pression requise pour activer les boutons." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "Avancé" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Paramètres avancés" @@ -663,17 +673,18 @@ 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:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 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:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "Tous les fichiers GameCube GCM (gcm)" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 ======= @@ -688,18 +699,22 @@ msgstr "Tous les fichiers GameCube GCM (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Tous les états sauvegardés (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "Tous les fichiers ISO Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Tous les fichiers ISO compressés GC/Wii (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "Tous les fichiers (*.*)|*.*" @@ -715,6 +730,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 <<<<<<< HEAD <<<<<<< HEAD @@ -726,6 +742,9 @@ msgid "Alternate Wiimote Timing" msgstr "Wiimote émulée" >>>>>>> Update translation files for recent changes in the code. ======= +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Alternate Wiimote Timing" msgstr "Délai alternatif de communication avec la Wiimote" >>>>>>> Update french translation. @@ -746,7 +765,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:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Apploader :" @@ -765,7 +784,7 @@ msgstr "" "\n" "Dans le doute, sélectionnez (aucun)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Arabe" @@ -774,7 +793,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:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -782,7 +801,7 @@ msgstr "" "Êtes-vous sûr de vouloir supprimer ces fichiers ?\n" "Ils seront définitivement supprimés !" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 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é " @@ -791,6 +810,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 @@ -801,6 +821,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Format d'écran :" @@ -809,21 +832,23 @@ 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:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Moteur audio :" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon : impossible d'ouvrir le périphérique AO.\n" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 @@ -834,6 +859,9 @@ msgstr "AudioCommon : impossible d'ouvrir le périphérique AO.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -878,7 +906,7 @@ msgstr "" msgid "Back" msgstr "Retour" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Paramètres de l'interface audio" @@ -905,11 +933,11 @@ msgstr "Mauvaise entête de fichier" msgid "Banner" msgstr "Bannière" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "Détails de la bannière" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "Bannière :" @@ -921,7 +949,7 @@ msgstr "Barre" msgid "Basic" msgstr "Paramètres de base" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Paramètres de base" @@ -955,6 +983,7 @@ msgstr "Bleu Droite" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -965,6 +994,9 @@ msgstr "Bleu Droite" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Bas" @@ -973,7 +1005,7 @@ msgstr "Bas" msgid "Bound Controls: %lu" msgstr "Contrôles liés : %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Corrompu" @@ -989,7 +1021,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:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "Parcourir un dossier de destination" @@ -1023,11 +1055,11 @@ msgstr "Stick-C" msgid "C-Stick" msgstr "Stick-C" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "Moteur d'émulation du CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "Cache des listes d'affichage" @@ -1081,7 +1113,7 @@ 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:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1092,7 +1124,7 @@ msgstr "" "%s\n" "n'est pas un fichier de carte mémoire GameCube valide." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1111,8 +1143,6 @@ msgstr "" msgid "Cant find WiiMote by connection handle %02x" msgstr "Impossible de trouver la Wiimote par le gestionnaire de connexion %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1123,7 +1153,7 @@ msgstr "" msgid "Caps Lock" msgstr "Verr Maj" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "Catalan" @@ -1148,7 +1178,7 @@ msgstr "Changer de disque" msgid "Change Game" msgstr "Changer de Jeu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1164,8 +1194,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:506 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "Changer ceci n'aura aucun effet durant l'émulation !" @@ -1185,31 +1215,31 @@ msgstr "Rechercher un cheat" msgid "Cheats Manager" msgstr "Gestionnaire de Cheats" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Chinois (simplifié)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Chinois (traditionnel)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "Choisir un dossier racine pour le DVD :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "Choisir un dossier racine pour la NAND :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Choisir un ISO par défaut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "Choisir un dossier à ajouter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Choisir un fichier à ouvrir" @@ -1220,6 +1250,7 @@ msgstr "Choisir une carte mémoire :" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 @@ -1231,6 +1262,9 @@ msgstr "Choisir une carte mémoire :" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1245,8 +1279,8 @@ msgstr "Choisir un fichier comme apploader : (uniquement pour les disques créé ======= >>>>>>> Update Hungarian and Turkish translations. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Choisir le dossier de destination de l'extraction" @@ -1258,14 +1292,14 @@ msgstr "Stick circulaire" msgid "Classic" msgstr "Classique" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "Effacer" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "Echec de l'éffacement" @@ -1282,6 +1316,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1293,6 +1328,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Fermer" @@ -1316,20 +1355,20 @@ msgstr "Commande" msgid "Comment" msgstr "Commentaire" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Commentaire :" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "Compresser l'ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Compresser les ISO sélectionnés..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "Compression de l'ISO" @@ -1356,13 +1395,13 @@ msgstr "Configurer les manettes" msgid "Configure..." msgstr "Configurer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "Confirmer l'écrasement du fichier" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "Confirmer l'arrêt de l'émulation" @@ -1371,7 +1410,7 @@ msgstr "Confirmer l'arrêt de l'émulation" msgid "Connect" msgstr "Connecter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "Connecter le clavier USB" @@ -1432,12 +1471,12 @@ msgstr "Convertir en GCI" msgid "Copy failed" msgstr "Echec de la copie" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "Copier vers la carte mémoire %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "Core" @@ -1468,7 +1507,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Impossible de reconnaître le fichier ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "Impossible de sauvegarder %s" @@ -1483,7 +1522,7 @@ msgstr "" "(le paramétrage des manettes pendant l'émulation du jeu n'est pas encore " "pris en charge)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1496,7 +1535,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:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "Impossible de trouver la commande d'ouverture pour l'extension 'ini' !" @@ -1513,7 +1552,7 @@ msgstr "" msgid "Count:" msgstr "Nombre :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "Pays :" @@ -1527,13 +1566,14 @@ msgstr "Créer un code AR" msgid "Create new perspective" msgstr "Créer une nouvelle perspective" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "Créé par KDE-Look.org" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 @@ -1545,6 +1585,9 @@ msgstr "Créé par KDE-Look.org" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" @@ -1557,15 +1600,15 @@ msgstr "Créé par Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com ======= >>>>>>> Update Hungarian and Turkish translations. -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "Créé par VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "Créé par black_rider et publié sur ForumW.org > Web Developments" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "Créateur :" @@ -1573,7 +1616,7 @@ msgstr "Créateur :" msgid "Critical" msgstr "Critique" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "Couper" @@ -1596,7 +1639,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:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "Hack de projection personnalisé" @@ -1604,11 +1647,11 @@ msgstr "Hack de projection personnalisé" msgid "Custom Projection Hack Settings" msgstr "Paramètres du hack de projection personnalisé" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "Personnalise certains paramètres de projection orthographique." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Tchèque" @@ -1620,10 +1663,11 @@ msgstr "Pad numérique" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "Moteur d'émulation du DSP (Audio)" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1638,18 +1682,22 @@ msgstr "Moteur d'émulation du DSP (Audio)" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulation du DSP en HLE (rapide)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "Interpréteur du DSP en LLE (lent)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "DSP LLE sur thread" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "Recompilateur du DSP en LLE" @@ -1657,15 +1705,23 @@ msgstr "Recompilateur du DSP en LLE" msgid "DSP settings" msgstr "Paramètres DSP (audio)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "Racine du DVD :" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "Taille des données" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "Date :" @@ -1686,7 +1742,7 @@ msgstr "Zone morte" msgid "Debug" msgstr "Débug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "Débug" @@ -1694,16 +1750,16 @@ msgstr "Débug" msgid "Decimal" msgstr "Décimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "Décompresser l'ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "Décompresser les ISO sélectionnés..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "Décompression de l'ISO" @@ -1711,11 +1767,11 @@ msgstr "Décompression de l'ISO" msgid "Default" msgstr "Par défaut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "ISO par défaut :" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "Police par défaut" @@ -1724,7 +1780,7 @@ msgstr "Police par défaut" msgid "Delete" msgstr "Supprimer" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "Supprimer la sauvegarde" @@ -1733,7 +1789,7 @@ msgstr "Supprimer la sauvegarde" msgid "Delete the existing file '%s'?" msgstr "Supprimer le fichier '%s' ?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "Description" @@ -1741,8 +1797,8 @@ msgstr "Description" msgid "Detect" msgstr "Détecter" -#: 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 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." @@ -1755,8 +1811,8 @@ msgstr "" msgid "Device" msgstr "Appareil" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Paramètres de la console virtuelle" @@ -1781,23 +1837,23 @@ msgstr "" " et la vérification de la somme de contrôle du dossier de sauvegarde a échoué" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "Désactiver" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "Désactiver la fumée" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "Désactiver l'éclairage" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "Désactiver la profondeur / pixel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "Désactiver les textures" @@ -1841,7 +1897,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Disque" @@ -1871,6 +1927,7 @@ msgstr "Diviser" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1052 @@ -1881,10 +1938,13 @@ msgstr "Diviser" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Voulez-vous arrêter l'émulation en cours ?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1912,6 +1972,7 @@ msgstr "Dolphin FIFO" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 msgid "Dolphin GCPad Configuration" msgstr "Configuration de la manette GC pour Dolphin" @@ -1942,6 +2003,14 @@ 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. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Configuration de la manette GC pour Dolphin" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Films TAS Dolphin (*.dtm)" @@ -2012,11 +2081,11 @@ msgstr "Dolphin est paramétré pour cacher tous les jeux. Double-cliquez ici po msgid "Down" msgstr "Bas" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "Télécharger des codes (base de données WiiRD)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "%lu codes ont été téléchargés. (%lu ajoutés)" @@ -2025,23 +2094,23 @@ msgstr "%lu codes ont été téléchargés. (%lu ajoutés)" msgid "Drums" msgstr "Percussions" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "Factice" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "Enregistrer le son" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "Copier l'EFB cible" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "Copier les images" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "Copier les textures" @@ -2079,6 +2148,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 @@ -2097,6 +2167,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Néerlandais" @@ -2121,7 +2196,7 @@ msgstr "" "distribution de Dolphin, un redémarrage est probablement nécessaire pour que " "Windows charge le nouveau pilote." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "Europe" @@ -2137,7 +2212,7 @@ msgstr "Editer" msgid "Edit ActionReplay Code" msgstr "Editer le code ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Editer la configuration" @@ -2149,8 +2224,8 @@ msgstr "Editer le patch" msgid "Edit current perspective" msgstr "Modifier la perspective actuelle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "Editer..." @@ -2200,7 +2275,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Wiimote émulée" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "Etat de l'émulation :" @@ -2228,24 +2303,24 @@ msgstr "" msgid "Enable AR Logging" msgstr "Activer la journalisation AR" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "Activer le contrôle audio" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "Activer BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Activer l'assemblage de blocs" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -2263,6 +2338,7 @@ msgstr "Activer le cache" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 @@ -2273,51 +2349,54 @@ msgstr "Activer le cache" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Activer les Cheats" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "Activer la musique DTK" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Activer le Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Activer le Dual Core (plus rapide)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "Activer les touches de raccourci" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Activer le saut d'inactivité" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Activer le saut d'inactivité (plus rapide)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Activer le MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "Activer le Progressive Scan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "Activer l'économiseur d'écran" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "Activer l'écran large (16/9è)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "Activer le rendu en fil de fer" @@ -2336,7 +2415,7 @@ msgstr "" "\n" "Dans le doute, sélectionnez 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2344,7 +2423,7 @@ msgstr "" "Activer l'accès disque rapide. Requis pour certains jeux. (MARCHE = Rapide, " "ARRÊT = Compatible)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "Activer les appels" @@ -2376,6 +2455,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 @@ -2387,6 +2467,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2401,7 +2484,7 @@ msgstr "Activer ceci pour accélérer La légende de Zelda : Twilight Princess. ======= >>>>>>> Update Hungarian and Turkish translations. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2411,7 +2494,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:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "Active un hack de projection personnalisé" @@ -2427,7 +2510,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2452,6 +2535,7 @@ msgstr "Fin" <<<<<<< 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 @@ -2470,6 +2554,11 @@ msgstr "Fin" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Anglais" @@ -2501,6 +2590,7 @@ msgstr "Egal" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Erreur" @@ -2544,6 +2634,12 @@ msgid "" "Sorry, Wii recording is temporarily broken." msgstr "" +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "Erreur" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2551,14 +2647,14 @@ msgstr "" "défaut du système." >>>>>>> Update Hungarian and Turkish translations. -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, 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 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format <<<<<<< HEAD <<<<<<< HEAD @@ -2607,7 +2703,7 @@ msgstr "Quitter Dolphin avec l'émulateur" msgid "Export Failed" msgstr "Echec de l'exportation" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "Exporter un fichier" @@ -2620,15 +2716,15 @@ msgstr "Exporter l'enregistrement..." msgid "Export Recording..." msgstr "Exporter l'enregistrement..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "Exporter une sauvegarde" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "Exporter une sauvegarde Wii (expérimental)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "Exporter toutes les sauvegardes" @@ -2644,7 +2740,7 @@ msgstr "Exporter l'enregistrement sous..." msgid "Extension" msgstr "Extension" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "Buffer d'image externe" @@ -2656,44 +2752,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:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "Extraire tous les fichiers..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "Extraire l'Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "Extraire le DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "Extraire un dossier..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "Extraire un fichier..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "Extraire une partition..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "Extraction de %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "Extraction de tous les fichiers" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "Extraction du dossier" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "Extraction..." @@ -2705,11 +2801,11 @@ msgstr "Octet FIFO" msgid "FIFO Player" msgstr "Lecteur FIFO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "France" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "Taille FST :" @@ -2721,11 +2817,11 @@ msgstr "Connexion impossible !" msgid "Failed to Listen!!" msgstr "Ecoute impossible !" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "Impossible de télécharger les codes." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Impossible d'extraire vers %s !" @@ -2844,18 +2940,28 @@ msgstr "Impossible d'écrire l'entête de %s" msgid "Failed to write header for file %d" msgstr "Impossible d'écire l'entête du fichier %d" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "Rapide" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "Mipmaps rapides" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "Version rapide de la MMU. Ne fonctionne pas avec tous les jeux." +#: Source/Core/Core/Src/Movie.cpp:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "Lecteur FIFO" @@ -2864,7 +2970,7 @@ msgstr "Lecteur FIFO" msgid "File Info" msgstr "Infos du fichier" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "Le fichier ne contient pas de code." @@ -2897,16 +3003,16 @@ msgstr "Le fichier n'est pas reconnu comme une carte mémoire" msgid "File not compressed" msgstr "Fichier non compressé" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO : mode d'ouverture inconnu : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "Système de fichiers" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Type de fichier 'ini' est inconnu ! Ne sera pas ouvert !" @@ -2914,7 +3020,7 @@ msgstr "Type de fichier 'ini' est inconnu ! Ne sera pas ouvert !" msgid "First Block" msgstr "Premier bloc" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "Corriger les sommes de contôle" @@ -2926,7 +3032,7 @@ msgstr "Forcer 16/9è" msgid "Force 4:3" msgstr "Forcer 4/3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "Forcer la console comme NTSC-J" @@ -2960,7 +3066,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2996,7 +3102,7 @@ msgstr "Image " msgid "Frame Advance" msgstr "Avancement d'image" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "L'enregistrement d'images utilise FFV1" @@ -3008,7 +3114,7 @@ msgstr "Plage d'images :" msgid "Frame S&kipping" msgstr "Saut d'&image :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Image/s max :" @@ -3016,13 +3122,14 @@ msgstr "Image/s max :" msgid "Frames To Record" msgstr "Images à enregistrer :" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "Vue libre" <<<<<<< 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 @@ -3041,6 +3148,11 @@ msgstr "Vue libre" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Français" @@ -3083,7 +3195,7 @@ msgstr "Configuration de la journalisation" msgid "GCPad" msgstr "Manette GC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "ID du jeu :" @@ -3099,15 +3211,15 @@ msgstr "Le jeu n'est pas en cours d'émulation !" msgid "Game not found!!" msgstr "Jeu non trouvé !!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "Paramètres spécifiques au jeu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Config du Jeu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "GameCube" @@ -3119,6 +3231,7 @@ msgstr "Paramètres de la &manette GameCube" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -3129,6 +3242,9 @@ msgstr "Paramètres de la &manette GameCube" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Carte mémoires de GameCube (*.raw,*.gcp)" @@ -3137,15 +3253,17 @@ msgid "Gamecube Pad settings" msgstr "Paramètres de la manette GameCube" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Codes Gecko" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" "Echec de l'exécution dy GeckoCode (CT%i CST%i) (%s)\n" "(ou c'est un mauvais code, ou il n'est pas encore pris en charge.)" @@ -3164,8 +3282,12 @@ msgstr "" >>>>>>> Update Hungarian and Turkish translations. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Général" @@ -3177,6 +3299,7 @@ msgstr "Paramètres généraux" <<<<<<< 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 @@ -3195,6 +3318,11 @@ msgstr "Paramètres généraux" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Allemand" @@ -3259,7 +3387,7 @@ msgstr "" "\n" "Dans le doute, cochez cette case." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Grèque" @@ -3291,7 +3419,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:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Hébreu" @@ -3358,6 +3486,7 @@ msgstr "Configuration des raccourcis clavier" <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 @@ -3369,10 +3498,13 @@ msgstr "Configuration des raccourcis clavier" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Raccourcis clavier" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Hongrois" @@ -3380,14 +3512,14 @@ msgstr "Hongrois" msgid "Hybrid Wiimote" msgstr "Wiimote hybride" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS : Impossible d'obtenir des données à partir d'un ticket " "inconnu : %08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -3400,11 +3532,11 @@ msgstr "" "ID du titre : %016llx.\n" " Dolphin va probablement figer maintenant" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - mauvaise destination" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "Paramètres IPL" @@ -3420,15 +3552,15 @@ msgstr "Pointeur IR" msgid "IR Sensitivity:" msgstr "Sensibilité de l'IR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "Détails de l'ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "Dossiers des ISO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "Italie" @@ -3436,22 +3568,30 @@ msgstr "Italie" msgid "Icon" msgstr "Icône" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update Hungarian and Turkish translations. ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" @@ -3461,6 +3601,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 @@ -3472,9 +3613,14 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy +>>>>>>> Update the pot file to reflect recent changes in the code. 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." +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " +"Audio to throttle using the DSP (might fix audio clicks but can also cause " +"constant noise depending on the game)." msgstr "" "Si vous définissez le limitateur de vitesse (Image /s max) à une valeur plus " "élevée que la vitesse du jeu (NTSC:60, PAL:50), vous devez aussi désactiver " @@ -3519,7 +3665,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "Importer une sauvegarde" @@ -3570,7 +3716,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "Dans le jeu" @@ -3579,7 +3725,7 @@ msgid "In-Game" msgstr "Dans le jeu" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info" @@ -3599,7 +3745,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:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Insérer une carte SD" @@ -3611,7 +3757,7 @@ msgstr "Indiquer un nom ici..." msgid "Install WAD" msgstr "Installer un WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Installer dans le menu Wii" @@ -3625,6 +3771,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1363 @@ -3635,14 +3782,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Installation du WAD..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "Interface" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "Paramètres de l'interface" @@ -3667,11 +3817,11 @@ msgstr "Erreur interne LZO - échec de lzo_init()" msgid "Internal Resolution:" msgstr "Résolution interne :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Interpréteur (TRES lent)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "Intro" @@ -3688,7 +3838,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:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "Type d'évènement non valide : %i" @@ -3708,17 +3858,18 @@ msgstr "" "%s\n" "Vous devriez copier à nouveau ce jeu." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "Fichier d'enregitrement non valide" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "Etat non valide" <<<<<<< 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 @@ -3737,27 +3888,32 @@ msgstr "Etat non valide" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italien" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "Japon" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "Recompilateur JIT (recommandé) " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "Recompilateur expérimental JIT" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japonais" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "Corée" @@ -3766,8 +3922,8 @@ msgstr "Corée" msgid "Key" msgstr "Touche" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Coréen" @@ -3785,7 +3941,7 @@ msgstr "Bouton L" msgid "L-Analog" msgstr "L Analog." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "Langue :" @@ -3838,7 +3994,7 @@ msgstr "" msgid "Less Than" msgstr "Plus petit que" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "Nb de FPS comme limite" @@ -3846,7 +4002,7 @@ msgstr "Nb de FPS comme limite" msgid "Load" msgstr "Charger" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "Charger textures personnalisées" @@ -3897,6 +4053,7 @@ msgstr "Charger un état..." <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 msgid "Load Wii System Menu" msgstr "Charger le Menu Système Wii" @@ -3923,6 +4080,13 @@ msgstr "Charger le Menu Système Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "Charger le Menu Système Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Charger le Menu Système Wii %d%c" @@ -3951,7 +4115,7 @@ msgstr "Charge le fichier spécifié (DOL, ELF, GCM, ISO, WAD)" msgid "Local" msgstr "Local" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Verrouiller les threads aux coeurs" @@ -3963,11 +4127,11 @@ msgstr "Journal" msgid "Log Configuration" msgstr "Configuration de la journalisation" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Types de journaux" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Sorties des journalisations" @@ -3997,7 +4161,7 @@ msgstr "" "MD5 non concordant\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "Hack de vitesse pour le MMU" @@ -4023,11 +4187,11 @@ msgstr "Fichiers MadCatz Gameshark (*.gcs)" msgid "Main Stick" msgstr "Stick principal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "ID concepteur :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "Concepteur :" @@ -4052,6 +4216,7 @@ msgstr "Octet mémoire" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -4062,6 +4227,9 @@ msgstr "Octet mémoire" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Carte mémoire" @@ -4100,7 +4268,7 @@ msgstr "" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "Micro" @@ -4109,11 +4277,11 @@ msgstr "Micro" msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "Divers" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Paramètres divers" @@ -4135,7 +4303,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "Police mono-espacée." @@ -4148,7 +4316,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Vibreur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -4170,7 +4338,7 @@ msgstr "" msgid "Multiply" msgstr "Multiplier" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -4265,6 +4433,7 @@ msgstr "NP Haut" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:451 @@ -4275,6 +4444,9 @@ msgstr "NP Haut" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4283,7 +4455,7 @@ msgstr "Nom :" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Nom :" @@ -4297,7 +4469,7 @@ msgid "New Scan" msgstr "Nouvelle recherche" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "Page suivante" @@ -4309,7 +4481,7 @@ msgstr "Recherche suivante" msgid "Nickname :" msgstr "Pseudo :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "Pas de pays (SDK)" @@ -4348,7 +4520,7 @@ msgstr "Aucun dossier de sauvegarde trouvé pour le titre %s" msgid "None" msgstr "Aucune" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Norvégien Bokmål" @@ -4356,8 +4528,8 @@ msgstr "Norvégien Bokmål" msgid "Not Equal" msgstr "Différent" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "Non défini" @@ -4381,7 +4553,7 @@ msgstr "Non connectée" msgid "Notes" msgstr "Notes" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "Notes :" @@ -4419,7 +4591,7 @@ msgstr "Objet" msgid "Object Range" msgstr "Plage d'objets :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Arrêt" @@ -4448,11 +4620,11 @@ msgstr "%d blocs disponibles seulement" msgid "Open" msgstr "Ouvrir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "Ouvrir l'emplacement du fichier" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "Ouvrir le dossier de &sauvegarde Wii" @@ -4474,11 +4646,11 @@ msgstr "OpenAL : impossible de trouver des périphériques audio" msgid "OpenAL: can't open device %s" msgstr "OpenAL : impossible d'ouvrir le périphérique %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "Décodeur de texture OpenCL" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "Décodeur de texture OpenMP" @@ -4511,7 +4683,7 @@ msgstr "" "et importez les sauvegardes vers une nouvelle carte mémoire\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "Autres" @@ -4563,22 +4735,23 @@ msgstr "Paragraphe" msgid "Parameters" msgstr "Paramètres" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partition %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Patchs" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Chemins" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 ======= @@ -4593,6 +4766,10 @@ msgstr "Chemins" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -4601,7 +4778,7 @@ msgstr "Pause" msgid "Per-Pixel Lighting" msgstr "Eclairage par pixel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Parfait" @@ -4615,6 +4792,7 @@ msgstr "Perspective %d" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -4629,6 +4807,10 @@ msgstr "Perspective %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Démarrer" @@ -4642,7 +4824,7 @@ msgstr "Jouer l'enregistrement..." msgid "Play/Pause" msgstr "Démarrer/Arrêter" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "Jouable" @@ -4657,6 +4839,7 @@ msgstr "Joueurs" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1053 @@ -4667,6 +4850,9 @@ msgstr "Joueurs" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Veuillez confirmer..." @@ -4678,23 +4864,23 @@ msgstr "Merci de créer une perspective avant de sauvegarder" msgid "Plus-Minus" msgstr "Plus-Moins" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Polonais" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Port 4" @@ -4703,11 +4889,11 @@ msgstr "Port 4" msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portugais" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portugais (brésilien)" @@ -4715,21 +4901,25 @@ msgstr "Portugais (brésilien)" msgid "Post-Processing Effect:" msgstr "Effet de Post-processing :" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:735 +======= +#: Source/Core/Core/Src/Movie.cpp:759 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4747,7 +4937,7 @@ msgstr "Pré-réglages :" msgid "Prev Page" msgstr "Page préc." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "Page précédente" @@ -4798,7 +4988,7 @@ msgstr "R Analog." msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "Russie" @@ -4811,7 +5001,7 @@ msgstr "Etendue" msgid "Read-only mode" msgstr "Mode Lecture seule" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "Réel" @@ -4890,6 +5080,7 @@ msgstr "Rafraîchir la liste des jeux" <<<<<<< 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 @@ -4912,6 +5103,12 @@ msgstr "Rafraîchir la liste des jeux" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Retirer" @@ -4967,11 +5164,11 @@ msgstr "Stick Droit" msgid "Rumble" msgstr "Rumble" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 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:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Russe" @@ -4979,13 +5176,14 @@ msgstr "Russe" msgid "Sa&ve State" msgstr "Sau&vegarder l'état" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "Sûr " <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 @@ -4996,6 +5194,9 @@ msgstr "Sûr " ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Echantillonnage :" @@ -5053,12 +5254,12 @@ msgstr "Sauvegarder l'état vers le Slot 8" msgid "Save State..." msgstr "Enregistrer l'état" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Enregistrer sous..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Sauver le fichier compressé GCM/ISO" @@ -5066,11 +5267,11 @@ msgstr "Sauver le fichier compressé GCM/ISO" msgid "Save current perspective" msgstr "Sauvegarder la perspective actuelle" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "Sauvegarder le fichier GCM/ISO décompressé" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -5081,16 +5282,16 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "Copie à l'échelle de l'EFB" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 #, c-format msgid "Scanning %s" msgstr "Analyse de %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "Recherche d'ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "Recherche..." @@ -5106,12 +5307,12 @@ msgstr "Arrêt défil." msgid "Search Filter" msgstr "Fitre de recherche" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Chercher dans sous-dossiers" -#: 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:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "La section %s n'a pas été trouvée dans SYSCONF" @@ -5124,6 +5325,7 @@ msgstr "Select" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 msgid "Select The Recording File" @@ -5154,6 +5356,14 @@ msgstr "Sélectionner le fichier d'enregistrement" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Sélectionner le fichier d'enregistrement" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Sélectionner un fichier WAD de Wii à installer" @@ -5182,6 +5392,7 @@ msgstr "Sélectionner le fichier à charger" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 @@ -5200,13 +5411,17 @@ msgstr "Sélectionner l'état à charger" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Sélectionner le fichier à enregistrer" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Sélectionner l'état à charger" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. @@ -5216,6 +5431,9 @@ msgstr "Sélectionner l'état à charger" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Sélectionner l'état à enregistrer" @@ -5238,7 +5456,7 @@ msgstr "" "\n" "Dans le doute, choisissez Auto." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Police sélectionnée" @@ -5287,13 +5505,14 @@ msgstr "Position de la Sensor Bar :" msgid "Separator" msgstr "Séparateur" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Serbe" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 @@ -5305,6 +5524,9 @@ msgstr "Serbe" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -5322,11 +5544,11 @@ 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:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "Définir comme l'ISO par &défaut" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "Définir comme carte mémoire par défaut : %c" @@ -5338,7 +5560,7 @@ msgstr "" "SetARCode_IsActive : L'index est plus grand que la taille de la liste des " "codes AR %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "Configurer..." @@ -5350,7 +5572,7 @@ msgstr "SetupWiiMem: Impossible de trouver le fichier des paramètres" msgid "Shake" msgstr "Secouement" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "Nom court :" @@ -5378,7 +5600,7 @@ msgstr "Afficher la barre d'&outils" msgid "Show Drives" msgstr "Afficher les lecteurs" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "Afficher les régions copiées d'EFB" @@ -5394,7 +5616,7 @@ msgstr "Afficher France" msgid "Show GameCube" msgstr "Afficher GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "Afficher le graphisme en entrée" @@ -5410,7 +5632,7 @@ msgstr "Afficher Japon" msgid "Show Korea" msgstr "Afficher Corée" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "Afficher la langue :" @@ -5430,7 +5652,7 @@ msgstr "Afficher les plateformes" msgid "Show Regions" msgstr "Afficher les régions" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "Afficher les statistiques" @@ -5450,11 +5672,11 @@ msgstr "Afficher WAD" msgid "Show Wii" msgstr "Afficher Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "Demande confirmation avant d'arrêter le jeu." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 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 " @@ -5465,23 +5687,23 @@ msgstr "" "mais cela peut aussi signifier que Dolphin plante soudainement sans aucune " "explication." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "Afficher le premier bloc" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "Afficher les blocs de sauvegarde" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "Afficher le commentaire de sauvegarde" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "Afficher l'icône de la sauvegarde" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "Afficher le titre de sauvegarde" @@ -5519,7 +5741,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Wiimote à l'horizontale" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Chinois simplifié" @@ -5527,11 +5749,11 @@ msgstr "Chinois simplifié" msgid "Size" msgstr "Taille" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "Ne pas exécuter le BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "Ignorer Passe Alpha de dest." @@ -5606,11 +5828,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Slot B" @@ -5635,7 +5857,7 @@ msgstr "" "Êtes-vous certain d'activer le rendu logiciel ? Dans le doute, choisissez " "'Non'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "Paramètres audio" @@ -5656,6 +5878,7 @@ msgstr "Espace" <<<<<<< 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 @@ -5674,6 +5897,11 @@ msgstr "Espace" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Espagnol" @@ -5705,7 +5933,7 @@ msgstr "" msgid "Specify a video backend" msgstr "Sélectionner une interface pour les graphismes" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Accélerer le taux de transfert du disque" @@ -5713,7 +5941,7 @@ msgstr "Accélerer le taux de transfert du disque" msgid "Square Stick" msgstr "Stick carré" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "Contrôleur standard" @@ -5818,12 +6046,12 @@ msgstr "Fichiers de sauvegarde importés avec succès" msgid "Swing" msgstr "Balancement" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Langue du système :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "Taïwan" @@ -5860,7 +6088,7 @@ msgstr "Table Droite" msgid "Take Screenshot" msgstr "Capture d'écran" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -5891,7 +6119,7 @@ msgstr "Texture" msgid "Texture Cache" msgstr "Cache de texture" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "Infos de format de texture" @@ -5907,13 +6135,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:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 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:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5936,7 +6164,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "Le fichier %s a déjà été ouvert, son entête n'a pas pu être écrite." -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Le fichier que vous avez spécifié (%s) n'existe pas" @@ -5954,11 +6182,12 @@ msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "Le code AR décrypté ne contient aucune ligne." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#, fuzzy msgid "" "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." +"If unsure, use the rightmost value." msgstr "" "Plus vous allez vers Sûr, moins l'émulateur manquera les mises à jour de " "texture depuis la RAM.\n" @@ -6003,7 +6232,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:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Thème" @@ -6011,7 +6240,7 @@ msgstr "Thème" msgid "Theme selection went wrong" msgstr "La sélection du thème a rencontré un problème" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -6019,7 +6248,7 @@ msgstr "" "Il doit y avoir un ticket pour 00000001/00000002. Votre copie de la NAND est " "probablement incomplète." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -6035,7 +6264,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:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "Ceci peut ralentir le Menu Wii et quelques jeux." @@ -6059,26 +6288,10 @@ msgstr "" "Dans le doute, décochez cette case." #: 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" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" -"Ceci est utiliser pour contrôler la vitesse du jeu par la constance du son.\n" -"Désactiver cette option peut causer une vitesse anormale du jeu, par exemple " -"trop rapide.\n" -"Mais il se peut parfois qu'activer cette option produise un bruit constant.\n" -"\n" -"Raccourci clavier : Appuyer pour instantanément désactiver cette " -"option." - -#: 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:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -6091,7 +6304,7 @@ msgstr "" "qui plus d'un coeur, mais peut occasionnellement causer des petits pépins ou " "des plantages." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "" "Ceci vous permettra de modifier manuellement le fichier de configuration INI" @@ -6115,7 +6328,7 @@ msgstr "Titre" msgid "To" msgstr "A" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "Activer tous les types de journaux" @@ -6139,6 +6352,7 @@ msgstr "Activer le plein écran" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -6149,14 +6363,17 @@ msgstr "Activer le plein écran" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Haut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Chinois traditionnel" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "Echec de chargement d'un type de fichier inconnu." @@ -6164,7 +6381,7 @@ msgstr "Echec de chargement d'un type de fichier inconnu." msgid "Triggers" msgstr "Déclencheurs" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Essai de lecture d'un fichier SYSCONF non valide" @@ -6176,7 +6393,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:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Turque" @@ -6197,11 +6414,11 @@ msgstr "Port UDP :" msgid "UDP Wiimote" msgstr "Wiimote UDP :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "Inconnu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "USA" @@ -6301,7 +6518,7 @@ msgstr "Mettre à jour" msgid "Upright Wiimote" msgstr "Wiimote debout" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Utiliser le mode EuRGB60 (PAL60)" @@ -6313,7 +6530,7 @@ msgstr "&Plein écran" msgid "Use Hex" msgstr "Utiliser Hexa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Utiliser les gestionnaires de panique" @@ -6345,7 +6562,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "Utilitaires" @@ -6369,25 +6586,29 @@ msgstr "Valeur" msgid "Verbosity" msgstr "Verbosité" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Vidéo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Virtuel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Volume" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "Echec de l'installation du WAD : erreur lors de la création de %s" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "Echec de l'installation du WAD : erreur lors de la création de %s" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -6406,15 +6627,15 @@ msgstr "" msgid "Warning" msgstr "Attention" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "Attention : démarrage du DOL dans un mauvais mode de console !" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Attention : démarrage de l'ELF dans un mauvais mode de console !" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Attention : démarrage d\" l'ISO dans un mauvais mode de console !" @@ -6444,11 +6665,15 @@ msgstr "" "et vont avoir le même nom que le fichier sur votre carte mémoire\n" "Continuer ?" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:629 +======= +#: Source/Core/Core/Src/Movie.cpp:667 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -6456,7 +6681,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -6464,7 +6689,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -6497,7 +6722,7 @@ msgstr "WaveFileWriter - fichier non ouvert." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "Hack écran large (16/9è)" @@ -6505,15 +6730,15 @@ msgstr "Hack écran large (16/9è)" msgid "Width" msgstr "Largeur" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Console Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Racine de la NAND (Wii) :" @@ -6524,6 +6749,7 @@ msgstr "Importer une sauvegarde Wii" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1310 @@ -6534,6 +6760,9 @@ msgstr "Importer une sauvegarde Wii" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Fichiers de sauvegarde Wii (*.bin)|*.bin" @@ -6604,13 +6833,14 @@ msgstr "Windows Menu" msgid "Windows Right" msgstr "Windows Droit" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "Casse" <<<<<<< 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 @@ -6629,6 +6859,11 @@ msgstr "Casse" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Travail..." @@ -6636,6 +6871,11 @@ msgstr "Travail..." msgid "Write to Console" msgstr "Ecrire dans la console" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "Ecrire dans le fichier" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "Ecrire dans le fichier" @@ -6692,7 +6932,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:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 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." @@ -6715,7 +6955,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:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "ZTP hack" @@ -6786,7 +7026,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -6819,12 +7059,12 @@ msgstr "" msgid "s" msgstr "s" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "Commande inconnue 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute a retourné -1 sur l'exécution de l'application !" @@ -7038,6 +7278,9 @@ msgstr "| OR" #~ msgid "Emulator Display Settings" #~ msgstr "Paramètres graphiques de l'émulateur" +#~ msgid "Enable Audio Throttle" +#~ msgstr "Activer le contrôle audio" + #~ msgid "Enable CPU Access" #~ msgstr "Activer l'accès CPU" @@ -7385,6 +7628,23 @@ msgstr "| OR" #~ msgid "The file " #~ msgstr "Le fichier " +#~ msgid "" +#~ "This is used to control game speed by sound throttle.\n" +#~ "Disabling this could cause abnormal game speed, such as too fast.\n" +#~ "But sometimes enabling this could cause constant noise.\n" +#~ "\n" +#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." +#~ msgstr "" +#~ "Ceci est utiliser pour contrôler la vitesse du jeu par la constance du " +#~ "son.\n" +#~ "Désactiver cette option peut causer une vitesse anormale du jeu, par " +#~ "exemple trop rapide.\n" +#~ "Mais il se peut parfois qu'activer cette option produise un bruit " +#~ "constant.\n" +#~ "\n" +#~ "Raccourci clavier : Appuyer pour instantanément désactiver cette " +#~ "option." + #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "" #~ "Ceci est habituellement utilisé pour lire la voix et les effets sonores." diff --git a/Languages/po/he.po b/Languages/po/he.po index ea10f8cea4..51453ebfe0 100644 --- a/Languages/po/he.po +++ b/Languages/po/he.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -16,6 +17,9 @@ msgstr "" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Update from master branch. +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-01-08 20:50+0200\n" "Last-Translator: Ely \n" "Language-Team: \n" @@ -55,9 +59,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sהעתק%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "" @@ -142,7 +146,7 @@ msgstr "" msgid "%sImport GCI%s" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, fuzzy, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%d בלוקים חופשיים; %d רשומות תיקייה חופשיות" @@ -175,11 +179,11 @@ msgstr "" msgid "&DSP Settings" msgstr "הגדרות קול" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "" @@ -244,7 +248,7 @@ msgstr "" msgid "&Play" msgstr "&שחק" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "" @@ -288,7 +292,7 @@ msgstr "" msgid "&Wiimote Settings" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "" @@ -332,7 +336,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -341,7 +345,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -380,13 +384,13 @@ msgid "" "You must forward TCP port to host!!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "" @@ -398,11 +402,11 @@ msgstr "" msgid "Acceleration" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "" @@ -502,11 +506,11 @@ msgstr "" msgid "Add" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "" @@ -514,6 +518,7 @@ msgstr "" msgid "Add new pane" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -529,6 +534,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "" @@ -562,11 +572,11 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "" @@ -574,14 +584,15 @@ msgstr "" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -594,18 +605,22 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "" @@ -617,7 +632,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Alternate Wiimote Timing" msgstr "" @@ -637,7 +652,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "" @@ -652,7 +667,7 @@ msgid "" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "" @@ -661,16 +676,17 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -680,6 +696,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -688,18 +707,20 @@ msgstr "" msgid "At least one pane must remain open." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -709,6 +730,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "" @@ -744,7 +768,7 @@ msgstr "" msgid "Back" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 #, fuzzy msgid "Backend Settings" msgstr "הגדרות קול" @@ -772,11 +796,11 @@ msgstr "" msgid "Banner" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "" @@ -788,7 +812,7 @@ msgstr "" msgid "Basic" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "" @@ -819,6 +843,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -826,6 +851,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "" @@ -834,7 +862,7 @@ msgstr "" msgid "Bound Controls: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "" @@ -850,7 +878,7 @@ msgstr "" msgid "Browse for an ISO directory..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "" @@ -880,11 +908,11 @@ msgstr "" msgid "C-Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "" @@ -923,7 +951,7 @@ msgstr "" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -931,7 +959,7 @@ msgid "" "is not a valid gamecube memory card file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -947,8 +975,6 @@ msgstr "" msgid "Cant find WiiMote by connection handle %02x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -958,7 +984,7 @@ msgstr "" msgid "Caps Lock" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "" @@ -983,7 +1009,7 @@ msgstr "" msgid "Change Game" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -997,8 +1023,8 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "" @@ -1018,31 +1044,31 @@ msgstr "" msgid "Cheats Manager" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "" @@ -1050,14 +1076,14 @@ msgstr "" msgid "Choose a memory card:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 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 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "" @@ -1069,14 +1095,14 @@ msgstr "" msgid "Classic" msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "" @@ -1090,6 +1116,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 @@ -1098,6 +1125,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "" @@ -1121,20 +1152,20 @@ msgstr "" msgid "Comment" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "" @@ -1161,13 +1192,13 @@ msgstr "" msgid "Configure..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "" @@ -1176,7 +1207,7 @@ msgstr "" msgid "Connect" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "" @@ -1233,12 +1264,12 @@ msgstr "" msgid "Copy failed" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "" @@ -1265,7 +1296,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "" @@ -1276,7 +1307,7 @@ msgid "" "(setting pads while the game is running is not yet supported)" msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1285,7 +1316,7 @@ msgid "" "protected?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "" @@ -1300,7 +1331,7 @@ msgstr "" msgid "Count:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "" @@ -1314,24 +1345,24 @@ msgstr "" msgid "Create new perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "" @@ -1339,7 +1370,7 @@ msgstr "" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "" @@ -1359,7 +1390,7 @@ msgstr "" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "" @@ -1367,11 +1398,11 @@ msgstr "" msgid "Custom Projection Hack Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "" @@ -1383,10 +1414,11 @@ msgstr "" msgid "DSP" msgstr "קול" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1397,18 +1429,22 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "" @@ -1416,15 +1452,23 @@ msgstr "" msgid "DSP settings" msgstr "הגדרות קול" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "" @@ -1445,7 +1489,7 @@ msgstr "" msgid "Debug" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "" @@ -1453,16 +1497,16 @@ msgstr "" msgid "Decimal" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "" @@ -1470,11 +1514,11 @@ msgstr "" msgid "Default" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "" @@ -1483,7 +1527,7 @@ msgstr "" msgid "Delete" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "" @@ -1492,7 +1536,7 @@ msgstr "" msgid "Delete the existing file '%s'?" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "" @@ -1500,8 +1544,8 @@ msgstr "" msgid "Detect" 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 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." @@ -1512,8 +1556,8 @@ msgstr "" msgid "Device" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "" @@ -1536,23 +1580,23 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "" @@ -1582,7 +1626,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "" @@ -1606,6 +1650,7 @@ msgstr "" msgid "Divide" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1615,10 +1660,13 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "" @@ -1643,6 +1691,7 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1652,10 +1701,14 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Dolphin GCPad Configuration" msgstr "הגדרות גרפיקה" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 @@ -1668,6 +1721,10 @@ msgstr "הגדרות גרפיקה" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1696,11 +1753,11 @@ msgstr "" msgid "Down" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "" @@ -1709,23 +1766,23 @@ msgstr "" msgid "Drums" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "" @@ -1750,6 +1807,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1765,6 +1823,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "" @@ -1785,7 +1848,7 @@ msgid "" "driver." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "" @@ -1801,7 +1864,7 @@ msgstr "" msgid "Edit ActionReplay Code" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "" @@ -1813,8 +1876,8 @@ msgstr "" msgid "Edit current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "" @@ -1853,7 +1916,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "" @@ -1875,23 +1938,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -1904,6 +1967,7 @@ msgstr "" msgid "Enable Cache" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -1913,51 +1977,54 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "" @@ -1970,13 +2037,13 @@ msgid "" "If unsure, select 1x." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "" @@ -1996,20 +2063,20 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 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 "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "" @@ -2021,7 +2088,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2038,6 +2105,7 @@ msgstr "" msgid "End" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2053,6 +2121,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "" @@ -2083,6 +2156,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "" @@ -2113,18 +2187,24 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: 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 +#: Source/Core/Common/Src/ChunkFile.h:194 #, 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 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2156,7 +2236,7 @@ msgstr "" msgid "Export Failed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "" @@ -2169,15 +2249,15 @@ msgstr "" msgid "Export Recording..." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "" @@ -2193,7 +2273,7 @@ msgstr "" msgid "Extension" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "" @@ -2205,44 +2285,44 @@ msgstr "" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "" @@ -2254,11 +2334,11 @@ msgstr "" msgid "FIFO Player" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "" @@ -2270,11 +2350,11 @@ msgstr "" msgid "Failed to Listen!!" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "" @@ -2370,18 +2450,28 @@ msgstr "" msgid "Failed to write header for file %d" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "" +#: Source/Core/Core/Src/Movie.cpp:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "" @@ -2390,7 +2480,7 @@ msgstr "" msgid "File Info" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "" @@ -2419,16 +2509,16 @@ msgstr "" msgid "File not compressed" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" @@ -2436,7 +2526,7 @@ msgstr "" msgid "First Block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "" @@ -2448,7 +2538,7 @@ msgstr "" msgid "Force 4:3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "" @@ -2472,7 +2562,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2503,7 +2593,7 @@ msgstr "" msgid "Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "" @@ -2515,7 +2605,7 @@ msgstr "" msgid "Frame S&kipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "" @@ -2523,10 +2613,11 @@ msgstr "" msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2542,6 +2633,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "" @@ -2576,7 +2672,7 @@ msgstr "הגדרות גרפיקה" msgid "GCPad" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "" @@ -2592,15 +2688,15 @@ msgstr "" msgid "Game not found!!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "" @@ -2612,6 +2708,7 @@ msgstr "הגדרות קול" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2619,6 +2716,9 @@ msgstr "הגדרות קול" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2627,21 +2727,24 @@ msgid "Gamecube Pad settings" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "" -#: Source/Core/Core/Src/GeckoCode.cpp:139 +#: Source/Core/Core/Src/GeckoCode.cpp:222 #, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 @@ -2650,6 +2753,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2659,6 +2765,7 @@ msgstr "" msgid "General Settings" msgstr "הגדרות קול" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2674,6 +2781,11 @@ msgstr "הגדרות קול" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "" @@ -2705,7 +2817,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "" @@ -2737,7 +2849,7 @@ msgstr "" msgid "Header checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "" @@ -2791,6 +2903,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 @@ -2799,10 +2912,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "" @@ -2810,12 +2926,12 @@ msgstr "" msgid "Hybrid Wiimote" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2824,11 +2940,11 @@ msgid "" " Dolphin will likely hang now" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "" @@ -2844,15 +2960,15 @@ msgstr "" msgid "IR Sensitivity:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "" @@ -2860,21 +2976,22 @@ msgstr "" msgid "Icon" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 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." +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " +"Audio to throttle using the DSP (might fix audio clicks but can also cause " +"constant noise depending on the game)." msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 @@ -2899,7 +3016,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "" @@ -2938,7 +3055,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "" @@ -2947,7 +3064,7 @@ msgid "In-Game" msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "" @@ -2967,7 +3084,7 @@ msgstr "" msgid "Insert Encrypted or Decrypted code here..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "" @@ -2979,7 +3096,7 @@ msgstr "" msgid "Install WAD" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "" @@ -2988,6 +3105,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -2997,14 +3115,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "" @@ -3027,11 +3148,11 @@ msgstr "" msgid "Internal Resolution:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "" @@ -3048,7 +3169,7 @@ msgstr "" msgid "Invalid bat.map or dir entry" msgstr "" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "" @@ -3065,14 +3186,15 @@ msgid "" " You may need to redump this game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3088,27 +3210,32 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "" @@ -3117,8 +3244,8 @@ msgstr "" msgid "Key" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "" @@ -3136,7 +3263,7 @@ msgstr "" msgid "L-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "" @@ -3182,7 +3309,7 @@ msgstr "" msgid "Less Than" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "" @@ -3190,7 +3317,7 @@ msgstr "" msgid "Load" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "" @@ -3238,6 +3365,7 @@ msgstr "" msgid "Load State..." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3259,6 +3387,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -3282,7 +3417,7 @@ msgstr "" msgid "Local" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "" @@ -3295,11 +3430,11 @@ msgstr "" msgid "Log Configuration" msgstr "הגדרות גרפיקה" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "" @@ -3327,7 +3462,7 @@ msgid "" " %016llx%016llx != %016llx%016llx" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "" @@ -3349,11 +3484,11 @@ msgstr "" msgid "Main Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "" @@ -3377,6 +3512,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3384,6 +3520,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "" @@ -3412,7 +3551,7 @@ msgstr "" msgid "Menu" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "" @@ -3421,11 +3560,11 @@ msgstr "" msgid "Min" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "" @@ -3442,7 +3581,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "" @@ -3455,7 +3594,7 @@ msgstr "" msgid "Motor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3470,7 +3609,7 @@ msgstr "" msgid "Multiply" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3560,6 +3699,7 @@ msgstr "" msgid "NP Up" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3569,6 +3709,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3577,7 +3720,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "" @@ -3591,7 +3734,7 @@ msgid "New Scan" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "" @@ -3603,7 +3746,7 @@ msgstr "" msgid "Nickname :" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "" @@ -3642,7 +3785,7 @@ msgstr "" msgid "None" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "" @@ -3650,8 +3793,8 @@ msgstr "" msgid "Not Equal" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "" @@ -3671,7 +3814,7 @@ msgstr "" msgid "Notes" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "" @@ -3709,7 +3852,7 @@ msgstr "" msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "" @@ -3735,11 +3878,11 @@ msgstr "" msgid "Open" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "" @@ -3761,11 +3904,11 @@ msgstr "" msgid "OpenAL: can't open device %s" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "" @@ -3794,7 +3937,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "" @@ -3844,19 +3987,20 @@ msgstr "" msgid "Parameters" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -3869,6 +4013,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "" @@ -3877,7 +4025,7 @@ msgstr "" msgid "Per-Pixel Lighting" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "" @@ -3890,6 +4038,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -3900,6 +4049,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "" @@ -3913,7 +4066,7 @@ msgstr "" msgid "Play/Pause" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "" @@ -3925,6 +4078,7 @@ msgstr "" msgid "Players" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -3934,6 +4088,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "" @@ -3945,23 +4102,23 @@ msgstr "" msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "" @@ -3970,11 +4127,11 @@ msgstr "" msgid "Port :" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "" @@ -3982,17 +4139,17 @@ msgstr "" msgid "Post-Processing Effect:" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4005,7 +4162,7 @@ msgstr "" msgid "Prev Page" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "" @@ -4056,7 +4213,7 @@ msgstr "" msgid "RAM" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "" @@ -4069,7 +4226,7 @@ msgstr "" msgid "Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "" @@ -4139,6 +4296,7 @@ msgstr "" msgid "Refresh game list" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4157,6 +4315,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "" @@ -4206,11 +4370,11 @@ msgstr "" msgid "Rumble" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "" @@ -4218,10 +4382,11 @@ msgstr "" msgid "Sa&ve State" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4231,6 +4396,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "" @@ -4288,12 +4456,12 @@ msgstr "" msgid "Save State..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "" @@ -4301,11 +4469,11 @@ msgstr "" msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -4314,6 +4482,7 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4323,15 +4492,18 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "" @@ -4347,12 +4519,12 @@ msgstr "" msgid "Search Filter" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 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:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "" @@ -4362,6 +4534,7 @@ msgstr "" msgid "Select" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4386,6 +4559,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "" @@ -4408,16 +4589,21 @@ msgstr "" msgid "Select the file to load" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 @@ -4437,6 +4623,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "" @@ -4451,7 +4640,7 @@ msgid "" "If unsure, select Auto." msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "" @@ -4487,11 +4676,11 @@ msgstr "" msgid "Separator" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4500,11 +4689,11 @@ msgstr "" msgid "Set" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "" @@ -4514,7 +4703,7 @@ msgstr "" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 #, fuzzy msgid "Settings..." msgstr "הגדרות קול" @@ -4527,7 +4716,7 @@ msgstr "" msgid "Shake" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "" @@ -4555,7 +4744,7 @@ msgstr "" msgid "Show Drives" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "" @@ -4571,7 +4760,7 @@ msgstr "" msgid "Show GameCube" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "" @@ -4587,7 +4776,7 @@ msgstr "" msgid "Show Korea" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "" @@ -4608,7 +4797,7 @@ msgstr "" msgid "Show Regions" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "" @@ -4628,34 +4817,34 @@ msgstr "" msgid "Show Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 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." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "" @@ -4686,7 +4875,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "" @@ -4694,11 +4883,11 @@ msgstr "" msgid "Size" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "" @@ -4730,11 +4919,11 @@ msgstr "" msgid "Slot %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "" @@ -4754,7 +4943,7 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "" @@ -4772,6 +4961,7 @@ msgstr "" msgid "Space" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -4787,6 +4977,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "" @@ -4810,7 +5005,7 @@ msgstr "" msgid "Specify a video backend" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "" @@ -4818,7 +5013,7 @@ msgstr "" msgid "Square Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "" @@ -4911,12 +5106,12 @@ msgstr "" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "" @@ -4955,7 +5150,7 @@ msgstr "" msgid "Take Screenshot" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -4971,7 +5166,7 @@ msgstr "" msgid "Texture Cache" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "" @@ -4987,13 +5182,13 @@ msgstr "" msgid "The checksum was successfully fixed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, fuzzy, c-format msgid "" "The file %s already exists.\n" @@ -5012,7 +5207,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "" @@ -5034,7 +5229,7 @@ msgid "" "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." +"If unsure, use the rightmost value." msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 @@ -5072,7 +5267,7 @@ msgstr "" msgid "The value is invalid" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "" @@ -5080,13 +5275,13 @@ msgstr "" msgid "Theme selection went wrong" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5098,7 +5293,7 @@ msgid "" "Replay itself." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "" @@ -5114,19 +5309,10 @@ msgid "" msgstr "" #: 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" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5134,7 +5320,7 @@ msgid "" "cause occasional crashes/glitches." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "" @@ -5157,7 +5343,7 @@ msgstr "" msgid "To" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "" @@ -5177,6 +5363,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5184,14 +5371,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "" @@ -5199,7 +5389,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:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "" @@ -5209,7 +5399,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "" @@ -5230,11 +5420,11 @@ msgstr "" msgid "UDP Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "" @@ -5312,7 +5502,7 @@ msgstr "" msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "" @@ -5325,7 +5515,7 @@ msgstr "&מסך מלא" msgid "Use Hex" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "" @@ -5346,7 +5536,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "" @@ -5370,25 +5560,28 @@ msgstr "" msgid "Verbosity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +msgid "WAD installation failed: error creating ticket" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5403,15 +5596,15 @@ msgstr "" msgid "Warning" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "" @@ -5432,7 +5625,7 @@ msgid "" "Continue?" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5440,7 +5633,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5448,7 +5641,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5476,7 +5669,7 @@ msgstr "" msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "" @@ -5484,15 +5677,15 @@ msgstr "" msgid "Width" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "" @@ -5500,6 +5693,7 @@ msgstr "" msgid "Wii Save Import" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5509,6 +5703,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5571,10 +5768,11 @@ msgstr "" msgid "Windows Right" msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -5590,6 +5788,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "" @@ -5597,6 +5800,10 @@ msgstr "" msgid "Write to Console" msgstr "" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +msgid "Write to Debugger" +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "" @@ -5650,7 +5857,7 @@ msgstr "" msgid "You must enter a valid profile name." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" @@ -5668,7 +5875,7 @@ msgid "" "Do you want to generate a new one?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "" @@ -5722,7 +5929,7 @@ msgstr "" msgid "^ ADD" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "" @@ -5753,12 +5960,12 @@ msgstr "" msgid "s" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "" diff --git a/Languages/po/hu.po b/Languages/po/hu.po index 7bdf045357..fb426b13e9 100644 --- a/Languages/po/hu.po +++ b/Languages/po/hu.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-12-18 13:41-0600\n" ======= @@ -25,6 +26,9 @@ msgstr "" "PO-Revision-Date: 2011-12-27 08:22-0600\n" >>>>>>> Update from master branch. ======= +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-12-28 09:44+0100\n" >>>>>>> Update Hungarian translation. "Last-Translator: Delirious \n" @@ -68,9 +72,9 @@ msgstr "\"%s\" egy érvénytelen GCM/ISO fájl, vagy nem GC/Wii ISO." msgid "%1$sCopy%1$s" msgstr "%1$sMásolás%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -132,7 +136,8 @@ msgid "" "file is not large enough to be a valid memory card file (0x%x bytes)" msgstr "" "%s memóriakártyakénti betöltése sikertelen\n" -"a fájl nem elég nagy ahhoz, hogy megfelelő memóriakártya fájl lehessen (0x%x bájt)" +"a fájl nem elég nagy ahhoz, hogy megfelelő memóriakártya fájl lehessen (0x%x " +"bájt)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 #, c-format @@ -180,7 +185,7 @@ msgstr "%sGCI exportálás%s" msgid "%sImport GCI%s" msgstr "%sGCI importálás%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u szabad blokk; %u szabad könyvtár bejegyzés" @@ -213,11 +218,11 @@ msgstr "&Csalás kezelő" msgid "&DSP Settings" msgstr "&Hang beállítások" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&ISO törlése..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&A kiválasztott ISO fájlok törlése..." @@ -281,7 +286,7 @@ msgstr "&Szünet" msgid "&Play" msgstr "&Indítás" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&Tulajdonságok" @@ -325,7 +330,7 @@ msgstr "&Nézet" msgid "&Wiimote Settings" msgstr "&Wiimote beállítások" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "&Wiki" @@ -369,7 +374,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -378,7 +383,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -404,11 +409,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" @@ -418,25 +425,28 @@ msgid "" msgstr "" "FIGYELEM:\n" "\n" -"A NetPlay jelenleg csak a következő beállítások használatával működik megfelelően:\n" +"A NetPlay jelenleg csak a következő beállítások használatával működik " +"megfelelően:\n" " - Dual Core [KI]\n" " - Hang szabályozás [KI]\n" " - DSP-HLE \"Null Audio\" használatával vagy DSP-LLE\n" -" - Kézileg legyen beállítva az irányítók pontos száma, amik használva lesznek, mint [szabvány irányító]\n" +" - Kézileg legyen beállítva az irányítók pontos száma, amik használva " +"lesznek, mint [szabvány irányító]\n" "\n" "Minden játékosnak azonos Dolphin verziót és beállításokat kell használnia.\n" -"Legyen minden memóriakártya kikapcsolva vagy mindenkinek továbbítani kell a játék megkezdése előtt.\n" +"Legyen minden memóriakártya kikapcsolva vagy mindenkinek továbbítani kell a " +"játék megkezdése előtt.\n" "Wiimote támogatás még nem működik.\n" "\n" "Továbbítani kell a TCP portot a host számára!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "AM alaplap" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "AR kódok" @@ -448,11 +458,11 @@ msgstr "A Dolphin névjegye" msgid "Acceleration" msgstr "Gyorsítás" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "Pontosság:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Pontos VBeam emuláció" @@ -466,12 +476,14 @@ msgstr "Pontos VBeam emuláció" >>>>>>> Update Hungarian and Turkish translations. 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 másolatok pontos emulációja.\n" -"Néhány játék számára elengedhetetlen bizonyos grafikai effektushoz vagy a játszhatóság végett.\n" +"Néhány játék számára elengedhetetlen bizonyos grafikai effektushoz vagy a " +"játszhatóság végett.\n" "\n" "Ha bizonytalan vagy, válaszd az EFB textúrába másolása lehetőséget." @@ -497,23 +509,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 hiba: érvénytelen méret (%08x : address = %08x) a kód hozzáadásban (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" +msgstr "" +"Action Replay hiba: érvénytelen méret (%08x : address = %08x) a kód " +"hozzáadásban (%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 hiba: érvénytelen méret (%08x : address = %08x) a kitöltésben és regiszterben (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " +"(%s)" +msgstr "" +"Action Replay hiba: érvénytelen méret (%08x : address = %08x) a kitöltésben " +"és regiszterben (%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 hiba: érvénytelen méret (%08x : address = %08x) a RAM írásban és kitöltésben (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " +"Fill (%s)" +msgstr "" +"Action Replay hiba: érvénytelen méret (%08x : address = %08x) a RAM írásban " +"és kitöltésben (%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 hiba: érvénytelen méret (%08x : address = %08x) a mutató írásában (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Write To " +"Pointer (%s)" +msgstr "" +"Action Replay hiba: érvénytelen méret (%08x : address = %08x) a mutató " +"írásában (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:803 #, c-format @@ -522,7 +549,8 @@ msgstr "Action Replay hiba: érvénytelen érték (%08x) a memória másolásban #: Source/Core/Core/Src/ActionReplay.cpp:684 #, c-format -msgid "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +msgid "" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" msgstr "Action Replay hiba: Mester kód és CCXXXXXX írása nincs beépítve (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:196 @@ -559,11 +587,11 @@ msgstr "Adapter:" msgid "Add" msgstr "Hozzáadás" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "ActionReplay kód hozzáadása" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "Patch hozzáadása" @@ -571,6 +599,7 @@ msgstr "Patch hozzáadása" msgid "Add new pane" msgstr "Új mező hozzáadása" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -586,6 +615,11 @@ msgstr "Új mező hozzáadása" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Hozzáadás..." @@ -597,14 +631,16 @@ msgstr "Cím:" 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." msgstr "" "Meghatározott értéket ad a zFar paraméterhez.\n" "Két módja a lebegőpontos értékek kifejezésének.\n" -"Például: a ''200'' vagy ''0.0002'' érték közvetlen megadása, azonos hatásokat eredményez, a kapott érték ''0.0002'' lesz.\n" +"Például: a ''200'' vagy ''0.0002'' érték közvetlen megadása, azonos " +"hatásokat eredményez, a kapott érték ''0.0002'' lesz.\n" "Értékek: (0->+/-egész szám) vagy (0->+/-FP[6 számjegyes pontosság])\n" "\n" "MEGJEGYZÉS: Ellenőrizd a napló ablakot/konzolt a kapott értékekhez." @@ -613,27 +649,31 @@ 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." msgstr "" "Meghatározott értéket ad a zNear paraméterhez.\n" "Két módja a lebegőpontos értékek kifejezésének.\n" -"Például: a ''200'' vagy ''0.0002'' érték közvetlen megadása, azonos hatásokat eredményez, a kapott érték ''0.0002'' lesz.\n" +"Például: a ''200'' vagy ''0.0002'' érték közvetlen megadása, azonos " +"hatásokat eredményez, a kapott érték ''0.0002'' lesz.\n" "Értékek: (0->+/-egész szám) vagy (0->+/-FP[6 számjegyes pontosság])\n" "\n" "MEGJEGYZÉS: Ellenőrizd a napló ablakot/konzolt a kapott értékekhez." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 msgid "Adjust the analog control pressure required to activate buttons." -msgstr "Az analóg irányító gombok aktiválásához szükséges lenyomás érzékenységének beállítása." +msgstr "" +"Az analóg irányító gombok aktiválásához szükséges lenyomás érzékenységének " +"beállítása." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "Haladó" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Haladó beállítások" @@ -641,14 +681,15 @@ msgstr "Haladó beállítások" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Minden GC/Wii fájl (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Minden GC/Wii képfájl (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "Minden Gamecube GCM fájl (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -661,31 +702,38 @@ msgstr "Minden Gamecube GCM fájl (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Minden állásmentés (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "Minden Wii ISO fájl (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Minden tömörített GC/Wii ISO fájl (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "Minden fájl (*.*)|*.*" #: 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 "" -"Bizonyos opciók elérhetővé válnak a 3, 4, 5, 6 és 7 gyorsbillentyűkkel az emulációs ablakon belül.\n" +"Bizonyos opciók elérhetővé válnak a 3, 4, 5, 6 és 7 gyorsbillentyűkkel az " +"emulációs ablakon belül.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 <<<<<<< HEAD <<<<<<< HEAD @@ -697,6 +745,9 @@ msgid "Alternate Wiimote Timing" msgstr "Emulált Wiimote" >>>>>>> Update translation files for recent changes in the code. ======= +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Alternate Wiimote Timing" msgstr "Változtatható Wiimote időzítés" >>>>>>> Update Hungarian and Turkish translations. @@ -711,13 +762,14 @@ msgstr "Élsimítás:" #: Source/Core/DiscIO/Src/VolumeDirectory.cpp:317 msgid "Apploader is the wrong size...is it really an apploader?" -msgstr "A betöltő program nem megfelelő méretű...ez tényleg egy betöltő program?" +msgstr "" +"A betöltő program nem megfelelő méretű...ez tényleg egy betöltő program?" #: Source/Core/DiscIO/Src/VolumeDirectory.cpp:311 msgid "Apploader unable to load from file" msgstr "A betöltő program nem képes fájlból betölteni" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Betöltő program:" @@ -735,7 +787,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, válaszd ezt: (ki)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Arab" @@ -744,7 +796,7 @@ msgstr "Arab" msgid "Are you sure you want to delete \"%s\"?" msgstr "Biztos törlöd ezt: \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -752,10 +804,11 @@ msgstr "" "Biztos törlöd ezeket a fájlokat?\n" "Végleg el fognak veszni!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 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 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -765,6 +818,9 @@ msgstr "Biztos törlöd ezt a fájlt? Végleg el fog veszni!" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Képarány:" @@ -773,18 +829,20 @@ msgstr "Képarány:" msgid "At least one pane must remain open." msgstr "Legalább egy mezőnek megnyitva kell maradnia." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Hang" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Hang feldolgozó:" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Hiba az AO eszköz megnyitásakor.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -794,6 +852,9 @@ msgstr "AudioCommon: Hiba az AO eszköz megnyitásakor.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automatikus" @@ -827,8 +888,10 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"Automatikusan létrehozza a mipmapeket, inkább mintsem kikódolná azokat a memóriából.\n" -"Egy keveset növel a teljesítményen, de kisebb textúra hiányosságokat okozhat.\n" +"Automatikusan létrehozza a mipmapeket, inkább mintsem kikódolná azokat a " +"memóriából.\n" +"Egy keveset növel a teljesítményen, de kisebb textúra hiányosságokat " +"okozhat.\n" "\n" "Ha bizonytalan vagy, hagyd kijelölve." @@ -836,7 +899,7 @@ msgstr "" msgid "Back" msgstr "Hátra" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Hang feldolgozó beállításai" @@ -863,11 +926,11 @@ msgstr "Rossz fájl fejléc" msgid "Banner" msgstr "Játék kép" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "Játék kép részletek" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "Játék kép:" @@ -879,7 +942,7 @@ msgstr "Vevő" msgid "Basic" msgstr "Alap" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Alap beállítások" @@ -910,6 +973,7 @@ msgstr "Kék jobbra" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -917,6 +981,9 @@ msgstr "Kék jobbra" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Gomb" @@ -925,7 +992,7 @@ msgstr "Gomb" msgid "Bound Controls: %lu" msgstr "Összekötött irányítások: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Hibás" @@ -941,7 +1008,7 @@ msgstr "Hozzáadandó könyvtár tallózása" msgid "Browse for an ISO directory..." msgstr "Egy ISO könyvtár tallózása..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "Kimeneti könyvtár tallózása" @@ -971,23 +1038,28 @@ msgstr "C kar" msgid "C-Stick" msgstr "C-kar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "Processzor emulátor motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "Kijelző listák gyorsítótárazása" #: 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 "" -"A 3D-s grafika mélységének értékét képpont alapon számolja inkább, mintsem csúcspont alapon.\n" -"Ellentétben a képpont megvilágítással (ami pusztán egy finomítás), a képpont alapú mélység számítás csupán csak néhány játék pontos emulálásához szükséges.\n" +"A 3D-s grafika mélységének értékét képpont alapon számolja inkább, mintsem " +"csúcspont alapon.\n" +"Ellentétben a képpont megvilágítással (ami pusztán egy finomítás), a képpont " +"alapú mélység számítás csupán csak néhány játék pontos emulálásához " +"szükséges.\n" "\n" "Ha bizonytalan vagy, hagyd kijelölve." @@ -999,7 +1071,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"A 3D-s grafikai fényhatásokat képpont alapon számolja inkább, mintsem csúcspont alapon.\n" +"A 3D-s grafikai fényhatásokat képpont alapon számolja inkább, mintsem " +"csúcspont alapon.\n" "Néhány százalékkal csökkenti az emuláció sebességét (videókártyától függ).\n" "Ez többnyire biztonságos finomítás, de időnként hibákat okozhat.\n" "\n" @@ -1031,6 +1104,7 @@ msgstr "A mozgások rögzítése nem lehetséges írásvédett módban." msgid "Cannot unregister events with events pending" msgstr "Nem lehet esemény bejegyzéseket törölni függőben lévő eseményekkel" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 @@ -1040,6 +1114,9 @@ msgstr "Nem lehet esemény bejegyzéseket törölni függőben lévő események ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1050,7 +1127,7 @@ msgstr "" "%s\n" "fájl nem megfelelő GameCube memóriakártya fájl" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1068,8 +1145,6 @@ msgstr "Nem található WiiMote bd szerint: %02x:%02x:%02x:%02x:%02x:%02x" msgid "Cant find WiiMote by connection handle %02x" msgstr "Nem található WiiMote %02x csatlakozás kezelő szerint" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1079,7 +1154,7 @@ msgstr "Sikertelen beolvasás a DVD_Plugin - DVD-felületből: végzetes hiba" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "Katalán" @@ -1104,7 +1179,7 @@ msgstr "Lemez váltás" msgid "Change Game" msgstr "Játék váltás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1120,8 +1195,8 @@ msgstr "Megváltoztatja a zFar paraméterhez tartozó jegyet (javítás után)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Megváltoztatja a zNear paraméterhez tartozó jegyet (javítás után)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "A változtatások nem érvényesülnek ameddig fut az emulátor!" @@ -1141,31 +1216,31 @@ msgstr "Csalás keresés" msgid "Cheats Manager" msgstr "Csalás kezelő" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Kínai (egyszerűsített)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Kínai (hagyományos)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "Válassz DVD gyökér könyvtárat:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "Válassz NAND gyökér könyvtárat:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Válassz alapértelmezett ISO fájlt:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "Válassz hozzáadandó könyvtárat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Válasz megnyitandó fájl" @@ -1173,12 +1248,16 @@ msgstr "Válasz megnyitandó fájl" msgid "Choose a memory card:" msgstr "Válassz memóriakártyát:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 -msgid "Choose file to use as apploader: (applies to discs constructed from directories only)" -msgstr "Válassz betöltő programnak használandó fájlt: (csak könyvtárakból létrehozott lemezekre érvényesíthető)" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 +msgid "" +"Choose file to use as apploader: (applies to discs constructed from " +"directories only)" +msgstr "" +"Válassz betöltő programnak használandó fájlt: (csak könyvtárakból " +"létrehozott lemezekre érvényesíthető)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Válassz mappát a kitömörítéshez" @@ -1190,25 +1269,30 @@ msgstr "Körös kar" msgid "Classic" msgstr "Klasszikus" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "Törlés" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "Törlés sikertelen." #: Source/Core/Core/Src/NetPlayServer.cpp:259 -msgid "Client disconnect while game is running!! NetPlay is disabled. You must manually stop the game." -msgstr "A kliens kapcsolata megszakadt játék közben! A NetPlay kikapcsolva. Kézileg kell leállítanod a játékot." +msgid "" +"Client disconnect while game is running!! NetPlay is disabled. You must " +"manually stop the game." +msgstr "" +"A kliens kapcsolata megszakadt játék közben! A NetPlay kikapcsolva. Kézileg " +"kell leállítanod a játékot." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 @@ -1217,6 +1301,10 @@ msgstr "A kliens kapcsolata megszakadt játék közben! A NetPlay kikapcsolva. K #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Bezárás" @@ -1240,20 +1328,20 @@ msgstr "Parancs" msgid "Comment" msgstr "Megjegyzés" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Megjegyzés:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "ISO tömörítése..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Kiválasztott ISO tömörítése..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "ISO tömörítése" @@ -1280,13 +1368,13 @@ msgstr "Irányítók beállítása" msgid "Configure..." msgstr "Beállítások..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "Fájl felülírás jóváhagyása" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "Kilépéskor megerősítés" @@ -1295,7 +1383,7 @@ msgstr "Kilépéskor megerősítés" msgid "Connect" msgstr "Csatlakozás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "USB billentyűzet csatlakoztatása" @@ -1352,12 +1440,12 @@ msgstr "Konvertálás: GCI" msgid "Copy failed" msgstr "Másolás sikertelen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "%c. memóriakártyára másolás" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "Mag" @@ -1373,15 +1461,21 @@ msgstr "%s hang feldolgozó iniciálása sikertelen." #: 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." -msgstr "\"%s\" nem olvasható. Nincs lemez a meghajtóban, vagy ez nem egy GC/Wii biztonsági mentés. Célszerű tudni, hogy az eredeti Gamecube és Wii lemezeket a legtöbb számítógépes DVD meghajtó nem képes olvasni." +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\" nem olvasható. Nincs lemez a meghajtóban, vagy ez nem egy GC/Wii " +"biztonsági mentés. Célszerű tudni, hogy az eredeti Gamecube és Wii " +"lemezeket a legtöbb számítógépes DVD meghajtó nem képes olvasni." #: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format msgid "Could not recognize ISO file %s" msgstr "%s ISO fájl nem ismerhető fel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "%s nem menthető el" @@ -1394,18 +1488,19 @@ msgstr "" "Irányítók beállítása nem sikerült. A játékos kilépett vagy a játék épp fut!\n" "(irányítók beállítása még nem támogatott miközben a játék fut)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, 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 memóriakártya fájl nem írható.\n" "\n" "CD/DVD lemezről futtatod a Dolphin emulátort, vagy a mentési fájl írásvédett?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "Az 'ini' kiterjesztéshez nem található nyitott parancs!" @@ -1422,7 +1517,7 @@ msgstr "" msgid "Count:" msgstr "Számláló:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "Ország:" @@ -1436,23 +1531,26 @@ msgstr "AR kód létrehozása" msgid "Create new perspective" msgstr "Új perspektíva készítése" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "Készítette: KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 -msgid "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -msgstr "Készítette: Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +msgid "" +"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +msgstr "" +"Készítette: Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "Készítette: VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" -msgstr "Készítette: black_rider és közzétette ForumW.org > Web Developments oldalon" +msgstr "" +"Készítette: black_rider és közzétette ForumW.org > Web Developments oldalon" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "Készítő:" @@ -1460,7 +1558,7 @@ msgstr "Készítő:" msgid "Critical" msgstr "Kritikus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "Levágás" @@ -1483,7 +1581,7 @@ msgstr "Kereszthalkítás" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Ez a könyvtár megváltozott erről: %s erre: %s a wxFileSelector után!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "Egyedi megjelenítési hack" @@ -1491,11 +1589,11 @@ msgstr "Egyedi megjelenítési hack" msgid "Custom Projection Hack Settings" msgstr "Egyedi megjelenítési hack beállítások" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "Néhány ortografikus megjelenítési paraméter egyedi beállítása." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Cseh" @@ -1507,10 +1605,11 @@ msgstr "Digitális irányok" msgid "DSP" msgstr "Hang" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "DSP emulátor motor" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1521,18 +1620,22 @@ msgstr "DSP emulátor motor" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emuláció (gyors)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE interpreter (lassú)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "DSP LLE folyamatágon" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP LLE recompiler" @@ -1540,15 +1643,23 @@ msgstr "DSP LLE recompiler" msgid "DSP settings" msgstr "Hang (DSP) beállítások" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "DVD gyökér könyvtár:" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "Adatok mérete" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "Dátum:" @@ -1569,7 +1680,7 @@ msgstr "Holtsáv" msgid "Debug" msgstr "Hibakereső" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "Hibakeresés" @@ -1577,16 +1688,16 @@ msgstr "Hibakeresés" msgid "Decimal" msgstr "Decimális" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "ISO kitömörítése..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "A kiválasztott ISO fájlok kitömörítése..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "ISO kitömörítés" @@ -1594,11 +1705,11 @@ msgstr "ISO kitömörítés" msgid "Default" msgstr "Alap" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "Alapértelmezett ISO:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "Alap betűtípus" @@ -1607,7 +1718,7 @@ msgstr "Alap betűtípus" msgid "Delete" msgstr "Törlés" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "Mentés törlése" @@ -1616,7 +1727,7 @@ msgstr "Mentés törlése" msgid "Delete the existing file '%s'?" msgstr "Törlöd a meglévő '%s' fájlt?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "Leírás" @@ -1624,18 +1735,22 @@ msgstr "Leírás" msgid "Detect" msgstr "Észlelés" -#: 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 "A kimeneti puffernél nagyobb adamennyiség kiolvasására történő probálkozás észlelve a DVD lemezről. Beszabályozás." +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 +msgid "" +"Detected attempt to read more data from the DVD than fit inside the out " +"buffer. Clamp." +msgstr "" +"A kimeneti puffernél nagyobb adamennyiség kiolvasására történő probálkozás " +"észlelve a DVD lemezről. Beszabályozás." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 msgid "Device" msgstr "Eszköz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Eszköz beállítások" @@ -1660,47 +1775,55 @@ msgstr "" " és a könyvtár biztonsági mentés ellenőrző összeg hibás" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "Kikapcsolás" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "Köd kikapcsolása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "Fényhatások kikapcsolása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "Képpont mélység kikapcsolása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "Textúrák kikapcsolása" #: 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 "" "Bármilyen XFB emuláció kikapcsolása.\n" -"Nagymértékben gyorsítja az emulációt, de számos grafikai hibát okoz sok olyan játékban, amelyhez szükséges az XFB (főleg egyedi fejlesztésű alkalmazások).\n" +"Nagymértékben gyorsítja az emulációt, de számos grafikai hibát okoz sok " +"olyan játékban, amelyhez szükséges az XFB (főleg egyedi fejlesztésű " +"alkalmazások).\n" "\n" "Ha bizonytalan vagy, hagyd kijelölve." #: 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 másolatok emulációjának kikapcsolása.\n" -"A másolatok gyakran használatosak utófeldolgozáshoz vagy textúra megjelenítési effektusokhoz, ezért ennek a beállításnak a kijelölésével nagymértékű sebesség növekedés érhető el, azonban majdnem mindig hibákat is okoz.\n" +"A másolatok gyakran használatosak utófeldolgozáshoz vagy textúra " +"megjelenítési effektusokhoz, ezért ennek a beállításnak a kijelölésével " +"nagymértékű sebesség növekedés érhető el, azonban majdnem mindig hibákat is " +"okoz.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -1714,7 +1837,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Lemez" @@ -1741,6 +1864,7 @@ msgstr "" msgid "Divide" msgstr "Megosztás" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1750,10 +1874,13 @@ msgstr "Megosztás" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Le akarod állítani az éppen működő emulációt?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1778,6 +1905,7 @@ msgstr "Dolphin emulált Wiimote beállítások" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1802,6 +1930,14 @@ 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. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GCPad beállítások" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS videók (*.dtm)" @@ -1814,23 +1950,31 @@ msgid "Dolphin at &Google Code" msgstr "Dolphin &Google Code oldal" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339 -msgid "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for files..." -msgstr "Dolphin nem talált egyetlen GC/Wii ISO fájlt sem. Fájlok tallózásához dupla kattintás ide..." +msgid "" +"Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " +"files..." +msgstr "" +"Dolphin nem talált egyetlen GC/Wii ISO fájlt sem. Fájlok tallózásához dupla " +"kattintás ide..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 -msgid "Dolphin is currently set to hide all games. Doubleclick here to show all games..." -msgstr "A Dolphin beállításai végett jelenleg a játékok rejtve vannak. Dupla kattintás ide a játékok megjelenítéséhez..." +msgid "" +"Dolphin is currently set to hide all games. Doubleclick here to show all " +"games..." +msgstr "" +"A Dolphin beállításai végett jelenleg a játékok rejtve vannak. Dupla " +"kattintás ide a játékok megjelenítéséhez..." #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Down" msgstr "Le" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "Kódok letöltése (WiiRD adatbázis)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Letöltve %lu kód. (hozzáadva %lu)" @@ -1839,23 +1983,23 @@ msgstr "Letöltve %lu kód. (hozzáadva %lu)" msgid "Drums" msgstr "Dobok" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "Utánzat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "Hang mentése" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "EFB cél letárolása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "Képkockák letárolása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "Textúrák letárolása" @@ -1865,7 +2009,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Az összes létrehozott képkocka mentése egy AVI fájlba ide: User/Dump/Frames/\n" +"Az összes létrehozott képkocka mentése egy AVI fájlba ide: User/Dump/" +"Frames/\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -1889,6 +2034,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1904,6 +2050,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Holland" @@ -1917,10 +2068,18 @@ msgstr "EFB másolatok" #: 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 "HIBA: A Dolphin ezen változatához szükséges a TAP-Win32 driver %d.%d verziója legalább -- Ha mostanában telepítetted a Dolphin emulátort, akkor valószínűleg újra kell indítanod a számítógépet, hogy a Windows felismerje az új illesztőprogramot." +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 "" +"HIBA: A Dolphin ezen változatához szükséges a TAP-Win32 driver %d.%d " +"verziója legalább -- Ha mostanában telepítetted a Dolphin emulátort, akkor " +"valószínűleg újra kell indítanod a számítógépet, hogy a Windows felismerje " +"az új illesztőprogramot." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "EURÓPA" @@ -1936,7 +2095,7 @@ msgstr "Szerkesztés" msgid "Edit ActionReplay Code" msgstr "ActionReplay kód szerkesztése" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Beállítások szerkesztése" @@ -1948,8 +2107,8 @@ msgstr "Patch szerkesztése" msgid "Edit current perspective" msgstr "Jelenlegi perspektíva szerkesztése" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "Szerkesztés..." @@ -1968,24 +2127,30 @@ msgstr "Az emuláció már fut" #: 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 "" "Az XFB pontos emulációja.\n" -"Jelentősen lassítja az emulációt és korlátozza a nagy felbontású megjelenítést, azonban szükséges számos játék pontos emulációjához.\n" +"Jelentősen lassítja az emulációt és korlátozza a nagy felbontású " +"megjelenítést, azonban szükséges számos játék pontos emulációjához.\n" "\n" "Ha bizonytalan vagy, jelöld ki inkább az XFB emulációt." #: 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 "" "XFB emuláció grafikai processzor textúra objektumainak használatával.\n" -"Javít sok XFB emuláció nélkül nem működő játékot miközben nem olyan lassú, mint a valódi XFB emuláció. Azonban, még mindig nem használható sok más játék esetén (főleg egyedi fejlesztésű alkalmazások).\n" +"Javít sok XFB emuláció nélkül nem működő játékot miközben nem olyan lassú, " +"mint a valódi XFB emuláció. Azonban, még mindig nem használható sok más " +"játék esetén (főleg egyedi fejlesztésű alkalmazások).\n" "\n" "Ha bizonytalan vagy, hagyd kijelölve." @@ -1993,7 +2158,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Emulált Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "Emuláció állapota:" @@ -2003,13 +2168,15 @@ msgstr "Használat" #: 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 "" -"A 3D-s effektusok megjelenítése sztereoszkópikus módon az Nvidia 3D Vision technológia használatával, ha támogatja a videókártya.\n" +"A 3D-s effektusok megjelenítése sztereoszkópikus módon az Nvidia 3D Vision " +"technológia használatával, ha támogatja a videókártya.\n" "Estleg hibákat okozhat.\n" "Működéséhez teljes képernyő szükséges.\n" "\n" @@ -2019,18 +2186,15 @@ msgstr "" msgid "Enable AR Logging" msgstr "AR naplózás bekapcsolása" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "Hang szabályozás használata" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "BAT használata" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Blokk csatlakozás használata" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 @@ -2041,6 +2205,9 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "Bounding Box kalkuláció használata" @@ -2049,6 +2216,7 @@ msgstr "Bounding Box kalkuláció használata" msgid "Enable Cache" msgstr "Gyorsítótár használata" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2058,51 +2226,54 @@ msgstr "Gyorsítótár használata" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Csalások használata" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "DTK zene bekapcsolása" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Dual Core használata" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Dual Core használata (gyorsítás)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "Gyorsbillentyűk használata" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Tétlen állapot mellőzése" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Tétlen állapot mellőzése (gyorsítás)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "MMU használata" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "Progresszív pásztázás használata" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "Képernyővédő bekapcsolása" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "Széleskijelző bekapcsolása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "Vonalháló bekapcsolása" @@ -2120,11 +2291,15 @@ msgstr "" "\n" "Ha bizonytalan vagy, válaszd ezt: 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 -msgid "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = Compatible)" -msgstr "Gyors lemez hozzáférés használata. Szükséges néhány játékhoz. (BE = gyors, KI = kompatibilis)" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +msgid "" +"Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " +"Compatible)" +msgstr "" +"Gyors lemez hozzáférés használata. Szükséges néhány játékhoz. (BE = gyors, " +"KI = kompatibilis)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "Oldalak bekapcsolása" @@ -2142,23 +2317,35 @@ msgstr "" #: 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 "" -"Kapcsold be ha azt akarod, hogy inkább a Dolphin fő ablakában jelenjen meg az emuláció, mint sem egy különálló ablakban.\n" +"Kapcsold be ha azt akarod, hogy inkább a Dolphin fő ablakában jelenjen meg " +"az emuláció, mint sem egy különálló ablakban.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 -msgid "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for ANY other game." -msgstr "Használatával The Legend of Zelda: Twilight Princess játék sebessége növekedik. A TÖBBI játéknál legyen kikapcsolva." +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +msgid "" +"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " +"ANY other game." +msgstr "" +"Használatával The Legend of Zelda: Twilight Princess játék sebessége " +"növekedik. A TÖBBI játéknál legyen kikapcsolva." -#: 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 "Bekapcsolja a Blokk cím átvitelt (BAT); a memória vezérlő egység egyik funkcióját. A hardverhez viszonyítva pontos, de az emulációhoz lassú. (BE = kompatibilis, KI = gyors)" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +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 "" +"Bekapcsolja a Blokk cím átvitelt (BAT); a memória vezérlő egység egyik " +"funkcióját. A hardverhez viszonyítva pontos, de az emulációhoz lassú. (BE = " +"kompatibilis, KI = gyors)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "Egyedi megjelenítési hack használata" @@ -2169,14 +2356,19 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Bekapcsolja a progresszív pásztázást, ha az támogatott az emulált szoftver által.\n" +"Bekapcsolja a progresszív pásztázást, ha az támogatott az emulált szoftver " +"által.\n" "A legtöbb játék nem használja ezt.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 -msgid "Enables the Memory Management Unit, needed for some games. (ON = Compatible, OFF = Fast)" -msgstr "Bekapcsolja a memória kezelő egységet (Memory Management Unit), szükséges néhány játékhoz. (BE = kompatibilis, KI = gyors)" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +msgid "" +"Enables the Memory Management Unit, needed for some games. (ON = Compatible, " +"OFF = Fast)" +msgstr "" +"Bekapcsolja a memória kezelő egységet (Memory Management Unit), szükséges " +"néhány játékhoz. (BE = kompatibilis, KI = gyors)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" @@ -2192,6 +2384,7 @@ msgstr "" msgid "End" msgstr "Vége" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2207,6 +2400,11 @@ msgstr "Vége" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Angol" @@ -2237,6 +2435,7 @@ msgstr "Egyenlő" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Hiba" @@ -2269,18 +2468,30 @@ msgstr "" "Sajnos a Wii videó rögzítés egyenlőre nem működik." >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "Hiba" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." -msgstr "Hiba a kiválasztott nyelv betöltése közben. Rendszer alapértelmezett visszaállítva." +msgstr "" +"Hiba a kiválasztott nyelv betöltése közben. Rendszer alapértelmezett " +"visszaállítva." -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" <<<<<<< HEAD +<<<<<<< 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..." @@ -2289,11 +2500,20 @@ msgstr "" 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..." >>>>>>> Update Hungarian translation. +======= +"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 the pot file to reflect recent changes in the code. -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format -msgid "Error: Trying to access %s fonts but they are not loaded. Games may not show fonts correctly, or crash." -msgstr "Hiba: A(z) %s betűtípusokhoz történő hozzáférési próbálkozás során, a betöltésük sikertelen. A játékokban a betűk lehet nem jelennek meg megfelelően, vagy kifagynak." +msgid "" +"Error: Trying to access %s fonts but they are not loaded. Games may not show " +"fonts correctly, or crash." +msgstr "" +"Hiba: A(z) %s betűtípusokhoz történő hozzáférési próbálkozás során, a " +"betöltésük sikertelen. A játékokban a betűk lehet nem jelennek meg " +"megfelelően, vagy kifagynak." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:30 msgid "Escape" @@ -2320,7 +2540,7 @@ msgstr "Kilépés a Dolphin emulátorból" msgid "Export Failed" msgstr "Exportálás sikertelen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "Fájl exportálása" @@ -2333,15 +2553,15 @@ msgstr "Felvétel exportálása" msgid "Export Recording..." msgstr "Felvétel exportálása..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "Mentés exportálása" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "Wii mentés exportálása (kísérleti)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "Minden mentés exportálása" @@ -2357,7 +2577,7 @@ msgstr "Exportálás mentése másként..." msgid "Extension" msgstr "Kiegészítő" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "Külső képkocka puffer" @@ -2369,44 +2589,44 @@ msgstr "Extra paraméter" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Az extra paraméter csak a ''Metroid: Other M'' játékban hasznos." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "Minden fájl kitömörítése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "Betöltő program kitömörítése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "DOL kitömörítése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "Könyvtár kitömörítése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "Fájl kitömörítése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "Partíció kitömörítése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "%s kitömörítése" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "Minden fájl kitömörítése" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "Könyvtár kitömörítése" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "Kitömörítés..." @@ -2418,11 +2638,11 @@ msgstr "FIFO bájt" msgid "FIFO Player" msgstr "FIFO lejátszó" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "FRANCIAORSZÁG" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "FST méret:" @@ -2434,11 +2654,11 @@ msgstr "Csatlakozás sikertelen!" msgid "Failed to Listen!!" msgstr "Meghallgatás sikertelen!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "Kódok letöltése sikertelen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Kitömörítés nem sikerült ide: %s!" @@ -2483,7 +2703,8 @@ msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" msgstr "" -"A blokk kiosztási tábla biztonsági mentésének pontos visszaolvasása sikertelen\n" +"A blokk kiosztási tábla biztonsági mentésének pontos visszaolvasása " +"sikertelen\n" "(0x8000-0x9FFF)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:144 @@ -2555,18 +2776,28 @@ msgstr "Fejléc írása sikertelen a(z) %s számára" msgid "Failed to write header for file %d" msgstr "Fejléc írása sikertelen a(z) %d fájl számára" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "Gyors" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "Gyors mipmapek" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "MMU gyors verziója. Nem működik minden játéknál." +#: Source/Core/Core/Src/Movie.cpp:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "Fifo lejátszó" @@ -2575,7 +2806,7 @@ msgstr "Fifo lejátszó" msgid "File Info" msgstr "Fájl infó" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "A fájl nem tartalmazott kódokat." @@ -2608,16 +2839,16 @@ msgstr "A fájl nem ismerhető fel memóriakártyaként" msgid "File not compressed" msgstr "A fájl nincs tömörítve" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Ismeretlen megnyitási mód : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "Fájlrendszer" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Az 'ini' fájltípus ismeretlen! Nem lesz megnyitva!" @@ -2625,7 +2856,7 @@ msgstr "Az 'ini' fájltípus ismeretlen! Nem lesz megnyitva!" msgid "First Block" msgstr "Első blokk" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "Állandó ellenőrzőösszeg" @@ -2637,7 +2868,7 @@ msgstr "Kényszerített 16:9" msgid "Force 4:3" msgstr "Kényszerített 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "Konzol kényszerítése NTSC-J típusra" @@ -2652,7 +2883,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Kényszerített textúra szűrés lesz még akkor is, ha a játék határozottan letiltotta azt.\n" +"Kényszerített textúra szűrés lesz még akkor is, ha a játék határozottan " +"letiltotta azt.\n" "Némileg javítja a textúra minőséget, de képhibákat okozhat néhány játékban.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -2669,13 +2901,15 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 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 "" "Az NTSC-J működési módot kényszeríti japán ROM betűkészlet használatához.\n" -"Hagyd kijelöletlenül, a Dolphin alapértelmezett az NTSC-U és automatikusan bekapcsolódik ez a beállítás japán játékok használatakor." +"Hagyd kijelöletlenül, a Dolphin alapértelmezett az NTSC-U és automatikusan " +"bekapcsolódik ez a beállítás japán játékok használatakor." #: Source/Core/Core/Src/HW/GCMemcard.cpp:76 msgid "" @@ -2703,7 +2937,7 @@ msgstr "Képkocka" msgid "Frame Advance" msgstr "Képkocka léptetés" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "Képkocka mentések FFV1 használatával" @@ -2715,7 +2949,7 @@ msgstr "Képkocka rendezés" msgid "Frame S&kipping" msgstr "Képkocka k&ihagyás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Képkocka korlát:" @@ -2723,10 +2957,11 @@ msgstr "Képkocka korlát:" msgid "Frames To Record" msgstr "Rögzítendő képkockák" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "Szabad nézet" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2742,6 +2977,11 @@ msgstr "Szabad nézet" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Francia" @@ -2780,7 +3020,7 @@ msgstr "GCMic beállítások" msgid "GCPad" msgstr "GC irányító" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "Játék azonosító:" @@ -2796,15 +3036,15 @@ msgstr "A játék nem fut!" msgid "Game not found!!" msgstr "A játék nem található!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "A játék sajátos beállításai" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Játék konfig" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" @@ -2815,6 +3055,7 @@ msgstr "Gamecube &irányító beállítások" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2822,6 +3063,9 @@ msgstr "Gamecube &irányító beállítások" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube memóriakártyák (*.raw,*.gcp)" @@ -2830,15 +3074,17 @@ msgid "Gamecube Pad settings" msgstr "Gamecube irányító beállítások" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Gecko kódok" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" "GeckoCode futtatása sikertelen (CT%i CST%i) (%s)\n" "(vagy rossz a kód vagy a kód típus még nem támogatott.)" @@ -2847,6 +3093,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 @@ -2855,6 +3102,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Általános" @@ -2863,6 +3113,7 @@ msgstr "Általános" msgid "General Settings" msgstr "Általános beállítások" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2878,6 +3129,11 @@ msgstr "Általános beállítások" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Német" @@ -2907,19 +3163,23 @@ msgstr "Nagyobb mint" ======= >>>>>>> Update Hungarian and Turkish translations. 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 "" -"Nagymértékben javítja azon textúrák minőségét, amelyeket a textúra effektusokhoz használatos képalkotó hozott létre.\n" +"Nagymértékben javítja azon textúrák minőségét, amelyeket a textúra " +"effektusokhoz használatos képalkotó hozott létre.\n" "A belső felbontás növelése javítja ennek a beállításnak a hatását.\n" -"Némileg csökkenti a teljesítményt és esetlegesen hibákat okozhat (habár valószínűtlen).\n" +"Némileg csökkenti a teljesítményt és esetlegesen hibákat okozhat (habár " +"valószínűtlen).\n" "\n" "Ha bizonytalan vagy, hagyd kijelölve." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Görög" @@ -2951,7 +3211,7 @@ msgstr "Hackek" msgid "Header checksum failed" msgstr "A fejléc ellenőrző összege hibás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Héber" @@ -2974,7 +3234,8 @@ msgid "" msgstr "" "Szia,\n" "\n" -"A Dolphin működéséhez szükséges, hogy a processzor rendelkezzen SSE2 utasításkészlettel.\n" +"A Dolphin működéséhez szükséges, hogy a processzor rendelkezzen SSE2 " +"utasításkészlettel.\n" "Sajnos a processzorod nem támogatja azt, ezért a Dolphin nem fog működni.\n" "\n" "Sayonara!\n" @@ -3020,12 +3281,16 @@ msgstr "Gyorsbillentyű beállítások" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Gyorsbill." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Magyar" @@ -3033,27 +3298,31 @@ msgstr "Magyar" msgid "Hybrid Wiimote" msgstr "Hibrid Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" -msgstr "IOCTL_ES_GETVIEWS: Adatok kinyerése megkísérelve egy ismeretlen jegyből: %08x/%08x" +msgstr "" +"IOCTL_ES_GETVIEWS: Adatok kinyerése megkísérelve egy ismeretlen jegyből: " +"%08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, 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: A játék megkísérelte az IOS újratöltését vagy egy olyan címét ami nem érhető el a NAND mentésedben\n" +"IOCTL_ES_LAUNCH: A játék megkísérelte az IOS újratöltését vagy egy olyan " +"címét ami nem érhető el a NAND mentésedben\n" "TitleID %016llx.\n" " A Dolphin valószínűleg kifagy most" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - rossz cél" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "IPL beállítások" @@ -3069,15 +3338,15 @@ msgstr "IR mutató" msgid "IR Sensitivity:" msgstr "IR érzékenysége:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "ISO részletek" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "ISO könyvtárak" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "OLASZORSZÁG" @@ -3085,13 +3354,18 @@ msgstr "OLASZORSZÁG" msgid "Icon" msgstr "Ikon" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 <<<<<<< HEAD +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" <<<<<<< HEAD +<<<<<<< HEAD ======= "Kijelölés esetén a bounding box regiszterek frissítve lesznek. A Paper Mario " "játékok használják." @@ -3100,14 +3374,28 @@ msgstr "" 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." >>>>>>> Update Hungarian translation. +======= +"Kijelölés esetén a bounding box regiszterek frissítve lesznek. A Paper Mario " +"játékok használják." +>>>>>>> Update the pot file to reflect recent changes in the code. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 -msgid "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" -msgstr "Ha az FPS értéke szabálytalan, akkor ez a beállítás segíthet. (BE = kompatibilis, KI = gyors)" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +msgid "" +"If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" +msgstr "" +"Ha az FPS értéke szabálytalan, akkor ez a beállítás segíthet. (BE = " +"kompatibilis, KI = gyors)" -#: 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." -msgstr "Ha a képkocka korlát értéke magasabb a játék teljes sebességénél (NTSC:60, PAL:50), akkor a hatékonyság eléréséhez ki kell kapcsolni a hang szabályozást is a DSP beállításoknál. " +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy +msgid "" +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " +"Audio to throttle using the DSP (might fix audio clicks but can also cause " +"constant noise depending on the game)." +msgstr "" +"Ha a képkocka korlát értéke magasabb a játék teljes sebességénél (NTSC:60, " +"PAL:50), akkor a hatékonyság eléréséhez ki kell kapcsolni a hang " +"szabályozást is a DSP beállításoknál. " #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" @@ -3116,28 +3404,33 @@ msgstr "Formátum változások kihagyása" #: 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 "" "Minden EFB formátum változás figyelmen kívül hagyása.\n" -"Sok játékban növeli a teljesítményt bármilyen negatív hatás nélkül. Noha grafikai hiányosságok jelentkezhetnek kevés egyéb játékban.\n" +"Sok játékban növeli a teljesítményt bármilyen negatív hatás nélkül. Noha " +"grafikai hiányosságok jelentkezhetnek kevés egyéb játékban.\n" "\n" "Ha bizonytalan vagy, hagyd kijelölve." #: 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 "" -"Figyelmen kívül hagyja a processzor összes EFB-re irányuló kiolvasási vagy írási kérelmét.\n" -"Néhány játékban növeli a teljesítményt, de kikapcsolhat néhány játékmenetre vonatkozó funkciót vagy grafikus effektust.\n" +"Figyelmen kívül hagyja a processzor összes EFB-re irányuló kiolvasási vagy " +"írási kérelmét.\n" +"Néhány játékban növeli a teljesítményt, de kikapcsolhat néhány játékmenetre " +"vonatkozó funkciót vagy grafikus effektust.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "Mentés importálása" @@ -3167,11 +3460,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öveli a teljesítményt de képhibákat okoz azokban a játékban, amelykben fontos a megfelelő köd emuláció.\n" +"Növeli a teljesítményt de képhibákat okoz azokban a játékban, amelykben " +"fontos a megfelelő köd emuláció.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -3181,11 +3476,12 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Növeli a teljesítményt, de használatával a fényhatások eltűnnek a legtöbb játékban.\n" +"Növeli a teljesítményt, de használatával a fényhatások eltűnnek a legtöbb " +"játékban.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "Elindul" @@ -3194,7 +3490,7 @@ msgid "In-Game" msgstr "Elindul" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Infó" @@ -3214,7 +3510,7 @@ msgstr "Insert" msgid "Insert Encrypted or Decrypted code here..." msgstr "Lekódolt vagy kódolatlan kód beszúrása ide..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "SD kártya behelyezése" @@ -3226,14 +3522,17 @@ msgstr "Írj be ide nevet..." msgid "Install WAD" msgstr "WAD telepítése" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Telepítés a Wii menübe" #: Source/Core/Core/Src/MemTools.cpp:248 -msgid "InstallExceptionHandler called, but this platform does not yet support it." -msgstr "InstallExceptionHandler előidézve, de ez a platform még nem támogatja azt." +msgid "" +"InstallExceptionHandler called, but this platform does not yet support it." +msgstr "" +"InstallExceptionHandler előidézve, de ez a platform még nem támogatja azt." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3243,14 +3542,17 @@ msgstr "InstallExceptionHandler előidézve, de ez a platform még nem támogatj ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "WAD telepítése..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "Felhasználói felület" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "Felület beállítások" @@ -3275,11 +3577,11 @@ msgstr "Belső LZO hiba - lzo_init() sikertelen" msgid "Internal Resolution:" msgstr "Belső felbontás:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Interpreter (NAGYON lassú)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "Intró" @@ -3296,7 +3598,7 @@ msgstr "Érvénytelen érték!" msgid "Invalid bat.map or dir entry" msgstr "Érvénytelen bat.map vagy könyvtár bejegyzés" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "Érvénytelen esemény fajta %i" @@ -3316,14 +3618,15 @@ msgstr "" "%s\n" " Valószínűleg újra le kell mentened a játékot." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "Nem megfelelő rögzített fájl" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "Nem megfelelő mentés" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3339,27 +3642,32 @@ msgstr "Nem megfelelő mentés" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Olasz" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "JAPÁN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT Recompiler (ajánlott)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL Recompiler (kísérleti)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japán" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "KOREA" @@ -3368,8 +3676,8 @@ msgstr "KOREA" msgid "Key" msgstr "Bill." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Koreai" @@ -3387,7 +3695,7 @@ msgstr "L gomb" msgid "L-Analog" msgstr "Bal analóg" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "Nyelv:" @@ -3440,7 +3748,7 @@ msgstr "" msgid "Less Than" msgstr "Kevesebb mint" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "FPS alapú korlátozás" @@ -3448,7 +3756,7 @@ msgstr "FPS alapú korlátozás" msgid "Load" msgstr "Betöltés" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "Egyedi textúrák betöltése" @@ -3496,6 +3804,7 @@ msgstr "Állás betöltése a 8. helyről" msgid "Load State..." msgstr "Állás betöltése..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3517,6 +3826,13 @@ msgstr "Wii rendszer menü betöltése" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "Wii rendszer menü betöltése" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii rendszer menü betöltése %d%c" @@ -3543,7 +3859,7 @@ msgstr "Meghatározott fájlt tölt be (DOL,ELF,GCM,ISO,WAD)" msgid "Local" msgstr "Helyi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Folyamatágak magokhoz zárolása" @@ -3555,11 +3871,11 @@ msgstr "Napló" msgid "Log Configuration" msgstr "Napló beállítások" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Napló típus" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Napló kimenetek" @@ -3589,7 +3905,7 @@ msgstr "" "MD5 eltérés\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU sebesség növelő hack" @@ -3611,11 +3927,11 @@ msgstr "MadCatz Gameshark fájlok (*.gcs)" msgid "Main Stick" msgstr "Főkar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "Gyártó azonosító:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "Gyártó:" @@ -3639,6 +3955,7 @@ msgstr "Memória bájt" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3646,12 +3963,19 @@ msgstr "Memória bájt" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Memóriakártya" #: Source/Core/DolphinWX/Src/MemcardManager.h:36 -msgid "Memory Card Manager WARNING-Make backups before using, should be fixed but could mangle stuff!" -msgstr "Memóriakártya kezelő FIGYELMEZTETÉS - Készíts biztonsági mentést a használata előtt, helyreállítható de a meglévő adatok sérülhetnek!" +msgid "" +"Memory Card Manager WARNING-Make backups before using, should be fixed but " +"could mangle stuff!" +msgstr "" +"Memóriakártya kezelő FIGYELMEZTETÉS - Készíts biztonsági mentést a " +"használata előtt, helyreállítható de a meglévő adatok sérülhetnek!" #: Source/Core/Core/Src/CoreParameter.cpp:369 #, c-format @@ -3678,7 +4002,7 @@ msgstr "A memóriakártya fájlmérete nem egyezik a fejléc méretével" msgid "Menu" msgstr "Menü" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "Mikrofon" @@ -3687,11 +4011,11 @@ msgstr "Mikrofon" msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "Egyebek" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Egyéb beállítások" @@ -3702,15 +4026,17 @@ msgstr "Változó" #: 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 "" -"Tetxúrák módosítása a kódolásukhoz használt formátum megjelenítéséhez. A legtöbb esetben az emuláció alapra állítása szükséges.\n" +"Tetxúrák módosítása a kódolásukhoz használt formátum megjelenítéséhez. A " +"legtöbb esetben az emuláció alapra állítása szükséges.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "Azonos szélességű betűtípus" @@ -3723,7 +4049,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3745,9 +4071,13 @@ msgstr "" 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 "Lenémítja a Wiimote hangszórót. Javítja a valódi Wiimote irányítók véletlenszerű lekapcsolódási hibáját. Nincs hatással az emulált irányítókra." +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +msgid "" +"Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " +"effect on emulated wiimotes." +msgstr "" +"Lenémítja a Wiimote hangszórót. Javítja a valódi Wiimote irányítók " +"véletlenszerű lekapcsolódási hibáját. Nincs hatással az emulált irányítókra." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:126 msgid "NP Add" @@ -3833,6 +4163,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3842,6 +4173,9 @@ msgstr "NP Up" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3850,7 +4184,7 @@ msgstr "Cím:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Név:" @@ -3864,7 +4198,7 @@ msgid "New Scan" msgstr "Új keresés" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "Következő lap" @@ -3876,7 +4210,7 @@ msgstr "Következő keresés" msgid "Nickname :" msgstr "Becenév:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "Nincs ország (SDK)" @@ -3915,7 +4249,7 @@ msgstr "%s játékhoz nem található mentési mappa" msgid "None" msgstr "Nincs" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Norvég" @@ -3923,8 +4257,8 @@ msgstr "Norvég" msgid "Not Equal" msgstr "Nem egyenlő" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "Nincs beállítva" @@ -3944,7 +4278,7 @@ msgstr "Nincs csatlakoztatva" msgid "Notes" msgstr "Megjegyzés" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "Megjegyzések:" @@ -3982,7 +4316,7 @@ msgstr "Elem" msgid "Object Range" msgstr "Elem hatótáv" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Ki" @@ -4008,11 +4342,11 @@ msgstr "Csak %d blokk szabad" msgid "Open" msgstr "Megnyitás" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "A játékot &tartalmazó mappa megnyitása" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "Wii &mentések mappa megnyitása" @@ -4034,11 +4368,11 @@ msgstr "OpenAL: nem található hang eszköz" msgid "OpenAL: can't open device %s" msgstr "OpenAL: %s eszköz nem nyitható meg" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "OpenCL textúra dekódoló" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "OpenMP textúra dekódoló" @@ -4070,13 +4404,17 @@ msgstr "" "és az állásmentések importálásához az új memóriakártyára\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "Egyéb" #: Source/Core/Core/Src/NetPlayClient.cpp:206 -msgid "Other client disconnected while game is running!! NetPlay is disabled. You manually stop the game." -msgstr "A másik kliens kapcsolata megszakadt játék közben! A NetPlay kikapcsolva. Kézileg kell leállítanod a játékot." +msgid "" +"Other client disconnected while game is running!! NetPlay is disabled. You " +"manually stop the game." +msgstr "" +"A másik kliens kapcsolata megszakadt játék közben! A NetPlay kikapcsolva. " +"Kézileg kell leállítanod a játékot." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 msgid "Output" @@ -4118,19 +4456,20 @@ msgstr "Paragraph" msgid "Parameters" msgstr "Paraméterek" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "%i partíció" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Javítások" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Mappák" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4143,6 +4482,10 @@ msgstr "Mappák" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Szünet" @@ -4151,7 +4494,7 @@ msgstr "Szünet" msgid "Per-Pixel Lighting" msgstr "Képpont alapú fényhatások" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Tökéletes" @@ -4164,6 +4507,7 @@ msgstr "%d perspektíva" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -4174,6 +4518,10 @@ msgstr "%d perspektíva" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Indítás" @@ -4187,7 +4535,7 @@ msgstr "Felvétel visszajátszása" msgid "Play/Pause" msgstr "Indítás/Szünet" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "Játszható" @@ -4199,6 +4547,7 @@ msgstr "Visszajátszási lehetőségek" msgid "Players" msgstr "Játékosok" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4208,6 +4557,9 @@ msgstr "Játékosok" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Változtatás jóváhagyása..." @@ -4219,23 +4571,23 @@ msgstr "Hozz először létre egy perspektívát mielőtt mentenél" msgid "Plus-Minus" msgstr "Plusz - minusz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Lengyel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "1. port" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "2. port" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "3. port" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "4. port" @@ -4244,11 +4596,11 @@ msgstr "4. port" msgid "Port :" msgstr "Port:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portugál" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portugál (brazil)" @@ -4256,7 +4608,7 @@ msgstr "Portugál (brazil)" msgid "Post-Processing Effect:" msgstr "Utófeldolgozási effektus:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" <<<<<<< HEAD @@ -4265,7 +4617,7 @@ msgstr "" msgstr "Túl korai PlayController videó befejezés. %u + 8 > %u" >>>>>>> Update from master branch. -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" <<<<<<< HEAD @@ -4274,7 +4626,7 @@ msgstr "" msgstr "Túl korai PlayWiimote videó befejezés. %u + %d > %u" >>>>>>> Update from master branch. -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" <<<<<<< HEAD @@ -4291,7 +4643,7 @@ msgstr "Gombkiosztás:" msgid "Prev Page" msgstr "Előző lap" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "Előző lap" @@ -4342,7 +4694,7 @@ msgstr "Jobb analóg" msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "OROSZORSZÁG" @@ -4355,7 +4707,7 @@ msgstr "Hatótáv" msgid "Read-only mode" msgstr "Írásvédett mód" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "Valódi" @@ -4409,7 +4761,8 @@ msgid "" "\n" "If unsure, select None." msgstr "" -"Csökkenti az éltöredezettséget, amit a képpontokra felbontott 3D-s grafika okoz.\n" +"Csökkenti az éltöredezettséget, amit a képpontokra felbontott 3D-s grafika " +"okoz.\n" "Ezáltal a megjelenített kép kevésbé lesz recézett.\n" "Erősen csökkenti az emuláció sebességét és néha hibákat okoz.\n" "Ha bizonytalan vagy, válaszd ezt: Nincs. " @@ -4429,6 +4782,7 @@ msgstr "A lista frissítése" msgid "Refresh game list" msgstr "Játéklista frissítése" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4447,6 +4801,12 @@ msgstr "Játéklista frissítése" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Törlés" @@ -4499,11 +4859,11 @@ msgstr "Jobb kar" msgid "Rumble" msgstr "Rumble funkció" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "DSP LLE futtatása egy dedikált folyamatágon (nem ajánlott)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Orosz" @@ -4511,10 +4871,11 @@ msgstr "Orosz" msgid "Sa&ve State" msgstr "Ál&lás mentése" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "Biztonságos" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4524,6 +4885,9 @@ msgstr "Biztonságos" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Mintavételezési frekvencia:" @@ -4581,12 +4945,12 @@ msgstr "Állás mentés a 8. helyre" msgid "Save State..." msgstr "Állás mentése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Mentés másként..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Tömörített GCM/ISO mentése" @@ -4594,11 +4958,11 @@ msgstr "Tömörített GCM/ISO mentése" msgid "Save current perspective" msgstr "Jelenlegi perspektíva mentése" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "Kitömörített GCM/ISO mentése" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "%s állásmentés videója sérült, videó rögzítése leáll..." @@ -4607,6 +4971,7 @@ 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 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4616,15 +4981,18 @@ msgstr "Méretezett EFB másolat" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Keresés %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "ISO fájlok keresése" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "Keresés..." @@ -4640,14 +5008,12 @@ msgstr "Scroll Lock" msgid "Search Filter" msgstr "Keresési szűrő" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Keresés az almappákban" -#: 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:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "%s rész nem található a SYSCONF fájlban" @@ -4657,6 +5023,7 @@ msgstr "%s rész nem található a SYSCONF fájlban" msgid "Select" msgstr "Választás" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4681,6 +5048,14 @@ msgstr "Válassz rögzítendő fájlt" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Válassz rögzítendő fájlt" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Válassz telepítendő Wii WAD fájlt" @@ -4706,6 +5081,7 @@ msgstr "Válassz lebegő ablakokat" msgid "Select the file to load" msgstr "Betöltendő fájl kiválasztása" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 @@ -4722,19 +5098,26 @@ msgstr "Válassz betöltendő állásmentést" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Válassz mentési fájlt" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Válassz betöltendő állásmentést" +<<<<<<< HEAD <<<<<<< 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. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Válassz mentendő állást" @@ -4756,20 +5139,22 @@ msgstr "" "\n" "Ha bizonytalan vagy, válaszd ezt: Automatikus." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Kiválasztott betűtípus" #: 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 "" "A teljes kijelző estén használatos felbontást állítja be.\n" -"Ennek mindig nagyobbnak, vagy azonosnak kell lennie a belső felbontással. Hatása a teljesítményre elhanyagolható.\n" +"Ennek mindig nagyobbnak, vagy azonosnak kell lennie a belső felbontással. " +"Hatása a teljesítményre elhanyagolható.\n" "\n" "Ha bizonytalan vagy, használd az asztali felbontást.\n" "Ha továbbra is bizonytalan vagy, használd a legmagasabb működő felbontást." @@ -4777,14 +5162,17 @@ msgstr "" #: 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 "" "Kiválasztja melyik grafikus API legyen használva belsőleg.\n" -"A Direct3D 9 többnyire a leggyorsabb. Az OpenGL azonban pontosabb. A Direct3D 11 valahol a kettő között van.\n" -"Vedd figyelembe, hogy a Direct3D feldolgozók csak Windows esetén állnak rendelkezésre.\n" +"A Direct3D 9 többnyire a leggyorsabb. Az OpenGL azonban pontosabb. A " +"Direct3D 11 valahol a kettő között van.\n" +"Vedd figyelembe, hogy a Direct3D feldolgozók csak Windows esetén állnak " +"rendelkezésre.\n" "\n" "Ha bizonytalan vagy, használd ezt: Direct3D 9." @@ -4800,23 +5188,25 @@ msgstr "Érzékelő helyzete:" msgid "Separator" msgstr "Elválasztó" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Szerb" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 -msgid "Serial Port 1 - This is the port which devices such as the net adapter use" -msgstr "1. soros port - Ezt a portot használják azok az eszközök, mint a net adapter" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +msgid "" +"Serial Port 1 - This is the port which devices such as the net adapter use" +msgstr "" +"1. soros port - Ezt a portot használják azok az eszközök, mint a net adapter" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 msgid "Set" msgstr "Beáll." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "Beállítás &alapértelmezett ISO fájlként" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "Beállítás alapértelmezett %c. memóriakártyaként" @@ -4824,9 +5214,10 @@ msgstr "Beállítás alapértelmezett %c. memóriakártyaként" #: Source/Core/Core/Src/ActionReplay.cpp:462 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" -msgstr "SetARCode_IsActive: A jelzőszám nagyobb mint az ar kód lista mérete %lu" +msgstr "" +"SetARCode_IsActive: A jelzőszám nagyobb mint az ar kód lista mérete %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "Beállítások..." @@ -4838,7 +5229,7 @@ msgstr "SetupWiiMem: Nem található a beállítási fájl" msgid "Shake" msgstr "Rázás" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "Rövid cím:" @@ -4866,7 +5257,7 @@ msgstr "Eszközsor &mutatása" msgid "Show Drives" msgstr "Meghajtók mutatása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "EFB másolat régiók megjelenítése" @@ -4882,7 +5273,7 @@ msgstr "Franciaország mutatása" msgid "Show GameCube" msgstr "GameCube mutatása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "Bemeneti kijelző megjelenítése" @@ -4898,7 +5289,7 @@ msgstr "JAP mutatása" msgid "Show Korea" msgstr "Korea mutatása" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "A játék nyelve:" @@ -4918,7 +5309,7 @@ msgstr "Platformok mutatása" msgid "Show Regions" msgstr "Régiók mutatása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "Statisztikák megjelenítése" @@ -4938,45 +5329,50 @@ msgstr "Wad mutatása" msgid "Show Wii" msgstr "Wii mutatása" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "A játék leállítása előtt megjelenik egy megerősítő ablak." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 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 "" -"Figyelmeztető üzenet jelenik meg egy potenciálisan komoly hiba bekövetkezésekor.\n" -"Kikapcsolásával megszűntethetők a kellemetlen és nem végzetes üzenetek, de ezáltal a Dolphin hirtelen kifagyhat bármilyen magyarázat nélkül." +"Figyelmeztető üzenet jelenik meg egy potenciálisan komoly hiba " +"bekövetkezésekor.\n" +"Kikapcsolásával megszűntethetők a kellemetlen és nem végzetes üzenetek, de " +"ezáltal a Dolphin hirtelen kifagyhat bármilyen magyarázat nélkül." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "Az első blokk megjelenítése" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "Mentendő blokkok megjelenítése" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "Mentendő megjegyzések megjelenítése" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "Mentendő ikonok megjelenítése" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "Mentendő címek megjelenítése" #: 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 "" -"A másodpercenként megjelenített képkockák számát jelzi ki az emuláció sebességének méréséhez.\n" +"A másodpercenként megjelenített képkockák számát jelzi ki az emuláció " +"sebességének méréséhez.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -5002,7 +5398,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Oldalt tartott Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Egyszerűsített kínai" @@ -5010,11 +5406,11 @@ msgstr "Egyszerűsített kínai" msgid "Size" msgstr "Méret" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "BIOS kihagyása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "Dest. Alpha Pass kihagyása" @@ -5024,11 +5420,13 @@ msgstr "Az EFB processzor hozzáférésének átugrása" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 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 "" -"A sok játékban különféle grafikai effektusokhoz használt destination alpha pass figyelmen kívül hagyása.\n" +"A sok játékban különféle grafikai effektusokhoz használt destination alpha " +"pass figyelmen kívül hagyása.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -5036,13 +5434,15 @@ 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 "" "Kissé gyorsítja az EFB RAM másolatokat az emuláció pontosságának rovására.\n" "Néha a vizuális minőséget is növeli.\n" -"Ha bármely hibát tapasztalsz, próbáld növelni a textúra gyorsítótár pontosságát vagy kapcsold ki ezt az opciót.\n" +"Ha bármely hibát tapasztalsz, próbáld növelni a textúra gyorsítótár " +"pontosságát vagy kapcsold ki ezt az opciót.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -5052,11 +5452,11 @@ msgstr "" msgid "Slot %i" msgstr "%i hely" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "A hely" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "B hely" @@ -5070,15 +5470,18 @@ msgstr "Szoftveres képalkotó" #: 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 "" -"A szoftveres képalkotó egy fontosságbeli sorrenden alapul és lassabb a feldolgozók használatánál.\n" +"A szoftveres képalkotó egy fontosságbeli sorrenden alapul és lassabb a " +"feldolgozók használatánál.\n" "Csak hibakeresési célra hasznos.\n" -"Biztosan be kívánod kapcsolni a szoftveres képalkotót? Ha bizonytalan vagy, válaszd ezt: 'Nem'." +"Biztosan be kívánod kapcsolni a szoftveres képalkotót? Ha bizonytalan vagy, " +"válaszd ezt: 'Nem'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "Hang beállítások" @@ -5096,6 +5499,7 @@ msgstr "Hang puffer létrehozása sikertelen: %s" msgid "Space" msgstr "Szóköz" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5111,6 +5515,11 @@ msgstr "Szóköz" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Spanyol" @@ -5120,13 +5529,21 @@ msgstr "Hangszóró hangerő:" #: 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 "" -"Meghatározza a megjelenítéshez használatos felbontást. A magas felbontás nagyban növeli a vizuális minőséget, de erősen befolyásolja a teljesítményt és képhibákat okozhat bizonyos játékoknál.\n" -"\"640x528 többszöröse\" egy kicsivel lassabb, mint az \"Ablak méret\" viszont kevesebb hibák eredményez. Általánosságban elmondható, minél kisebb a belső felbontás, annál jobb a teljesítmény.\n" +"Meghatározza a megjelenítéshez használatos felbontást. A magas felbontás " +"nagyban növeli a vizuális minőséget, de erősen befolyásolja a teljesítményt " +"és képhibákat okozhat bizonyos játékoknál.\n" +"\"640x528 többszöröse\" egy kicsivel lassabb, mint az \"Ablak méret\" " +"viszont kevesebb hibák eredményez. Általánosságban elmondható, minél kisebb " +"a belső felbontás, annál jobb a teljesítmény.\n" "\n" "Ha bizonytalan vagy, válaszd ezt: 640x528." @@ -5134,7 +5551,7 @@ msgstr "" msgid "Specify a video backend" msgstr "Válassz videó feldolgozót" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "A lemez adatátviteli arány gyorsítása" @@ -5142,7 +5559,7 @@ msgstr "A lemez adatátviteli arány gyorsítása" msgid "Square Stick" msgstr "Négyzetes kar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "Normál irányító" @@ -5204,12 +5621,15 @@ msgstr "Leállítás" #: 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 "" "Az EFB másolatokat a grafikai processzor textúra objektumaiban tárolja.\n" -"Ez nem annyira pontos, de elég jól működik a legtöbb játék esetén és jelentős sebességnövekedést okoz az EFB RAM-ban történő tárolásával szemben.\n" +"Ez nem annyira pontos, de elég jól működik a legtöbb játék esetén és " +"jelentős sebességnövekedést okoz az EFB RAM-ban történő tárolásával " +"szemben.\n" "\n" "Ha bizonytalan vagy, hagyd kijelölve." @@ -5238,12 +5658,12 @@ msgstr "Mentés fájlok sikeresen importálva" msgid "Swing" msgstr "Lengetés" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Rendszer nyelv:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "TAJVAN" @@ -5289,7 +5709,7 @@ msgstr "Tábla jobbra" msgid "Take Screenshot" msgstr "Pillanatkép készítése" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" <<<<<<< HEAD msgstr "" @@ -5309,7 +5729,7 @@ msgstr "Textúra" msgid "Texture Cache" msgstr "Textúra gyorsítótár" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "Textúra formátum átfedés" @@ -5325,13 +5745,13 @@ msgstr "A cím érvénytelen" msgid "The checksum was successfully fixed" msgstr "Az ellenőrző összeg sikeresen javítva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "A választott könyvtár már szerepel a listán" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5342,15 +5762,19 @@ 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 fájl nem nyitható meg íráshoz. Ellenőrizd, hogy nincs-e megnyitva már másik program által." +msgid "" +"The file %s could not be opened for writing. Please check if it's already " +"opened by another program." +msgstr "" +"%s fájl nem nyitható meg íráshoz. Ellenőrizd, hogy nincs-e megnyitva már " +"másik program által." #: Source/Core/AudioCommon/Src/WaveFile.cpp:44 #, c-format msgid "The file %s was already open, the file header will not be written." msgstr "%s fáj már meg van nyitva, a fájl fejléce nem írható." -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Az általad megadott (%s) fájl nem létezik" @@ -5368,12 +5792,15 @@ msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "A kapott kódolatlan AR kód nem tartalmaz sorokat." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#, fuzzy 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." +"If unsure, use the rightmost value." msgstr "" -"Minél biztonságosabb a beállítás, annál kevésbé valószínű, hogy az emulátor textúra frissítést fog a RAM-ból hiányolni.\n" +"Minél biztonságosabb a beállítás, annál kevésbé valószínű, hogy az emulátor " +"textúra frissítést fog a RAM-ból hiányolni.\n" "\n" "Ha bizonytalan vagy, használd a második leggyorsabb értéket jobbról." @@ -5382,8 +5809,12 @@ msgid "The save you are trying to copy has an invalid file size" msgstr "A másolni kívánt mentés érvénytelen méretű" #: Source/Core/DolphinWX/Src/Main.cpp:353 -msgid "The selected language is not supported by your system. Falling back to system default." -msgstr "A választott nyelvet nem támogatja az oprációs rendszer. Visszaállás a rendszer alapértelmezettre." +msgid "" +"The selected language is not supported by your system. Falling back to " +"system default." +msgstr "" +"A választott nyelvet nem támogatja az oprációs rendszer. Visszaállás a " +"rendszer alapértelmezettre." #: Source/Core/Core/Src/NetPlayClient.cpp:43 msgid "The server and client's NetPlay versions are incompatible!" @@ -5410,7 +5841,7 @@ msgstr "A megadott \"%s\" fájl nem létezik" msgid "The value is invalid" msgstr "Az érték érvénytelen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Kinézet" @@ -5418,11 +5849,15 @@ msgstr "Kinézet" msgid "Theme selection went wrong" msgstr "Kinézet választáskor hiba történt" -#: 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 "Kell lennie egy jegynek itt: 00000001/00000002. A NAND mentésed valószínűleg befejezetlen." +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 +msgid "" +"There must be a ticket for 00000001/00000002. Your NAND dump is probably " +"incomplete." +msgstr "" +"Kell lennie egy jegynek itt: 00000001/00000002. A NAND mentésed valószínűleg " +"befejezetlen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5431,52 +5866,53 @@ msgstr "" "A módosítatlan opcióknál a játék a Dolphin beállításait használja." #: Source/Core/Core/Src/ActionReplay.cpp:356 -msgid "This action replay simulator does not support codes that modify Action Replay itself." -msgstr "Az action replay szimulátor nem támogat olyan kódokat, amelyek módosítját magát az Action Replay-t." +msgid "" +"This action replay simulator does not support codes that modify Action " +"Replay itself." +msgstr "" +"Az action replay szimulátor nem támogat olyan kódokat, amelyek módosítját " +"magát az Action Replay-t." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "Ez lassulást okozhat a Wii menüben és néhány játékban." #: 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 "" "Ez a funkció lehetővé teszi a játék kamera szabad irányítását.\n" -"Tartsd lenyomva a jobb egér gombot és mozgasd az egeret, hogy körbepásztázz a kamerával. Tartsd lenyomva a SHIFT billentyűt és a WASD billentyűk valamelyikével mozgasd a kamerát távolsági léptékenként (SHIFT+0 megduplázza (x2) és a SHIFT+9 megfelezi (x0.5)). Nyomd le a SHIFT+R kombinációt a kamera alapértékre állításához.\n" +"Tartsd lenyomva a jobb egér gombot és mozgasd az egeret, hogy körbepásztázz " +"a kamerával. Tartsd lenyomva a SHIFT billentyűt és a WASD billentyűk " +"valamelyikével mozgasd a kamerát távolsági léptékenként (SHIFT+0 megduplázza " +"(x2) és a SHIFT+9 megfelezi (x0.5)). Nyomd le a SHIFT+R kombinációt a " +"kamera alapértékre állításához.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." #: 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" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" -"Ez a játék sebességének szabályozására szolgál a hang szabályozás által.\n" -"Kikapcsolása rendellenes sebességet okozhat, többnyire túl gyorsat.\n" -"Viszont néha a bekapcsolása folyamatos zajt eredményezhet.\n" -"\n" -"Gyorsbillentyű : Tartsd lenyomva a szabályozás azonnali kikapcsolásához." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "Ez a zenei sávok, mint BGM lejátszásra szolgál." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 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 "" -"Ez megosztja a videó és processzor folyamatágakat, így azok külön magon futhatnak.\n" -"Számottevő sebességnövekedés érhető el egynél több magos számítógépeken, ugyanakkor véletlenszerű fagyásokat/hibákat is okozhat." +"Ez megosztja a videó és processzor folyamatágakat, így azok külön magon " +"futhatnak.\n" +"Számottevő sebességnövekedés érhető el egynél több magos számítógépeken, " +"ugyanakkor véletlenszerű fagyásokat/hibákat is okozhat." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "Ez által kézileg szerkesztheted az INI konfigurációs fájlt" @@ -5499,7 +5935,7 @@ msgstr "Cím" msgid "To" msgstr "eddig:" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "Minden napló típus kijelölése" @@ -5519,6 +5955,7 @@ msgstr "Váltás teljes nézetre" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5526,14 +5963,17 @@ msgstr "Váltás teljes nézetre" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Fent" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Hagyományos kínai" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "Próbálkozás egy ismeretlen fájltípus betöltésével. " @@ -5541,8 +5981,7 @@ msgstr "Próbálkozás egy ismeretlen fájltípus betöltésével. " msgid "Triggers" msgstr "Kioldó gombok" -#: Source/Core/Common/Src/SysConf.h:92 -#: Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Olvasási próbálkozás az érvénytelen SYSCONF fájlból" @@ -5554,7 +5993,7 @@ msgstr "" "Olvasási próbálkozás az érvénytelen SYSCONF fájlból\n" "Nem találhatóak Wiimote bt azonosítók " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Török" @@ -5575,11 +6014,11 @@ msgstr "UDP port:" msgid "UDP Wiimote" msgstr "UDP Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "ISMERETLEN" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "USA" @@ -5594,10 +6033,12 @@ 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 "" -"A megadott AR kód %lu sorának érvényes kódolt, vagy kódolatlan kódként történő elemzése nem lehetséges. Győződj meg róla, hogy helyesen írtad be.\n" +"A megadott AR kód %lu sorának érvényes kódolt, vagy kódolatlan kódként " +"történő elemzése nem lehetséges. Győződj meg róla, hogy helyesen írtad be.\n" "Szeretnéd átugrani ezt a sort és folytatni az elemzést?" #: Source/Core/DolphinWX/Src/FrameTools.cpp:404 @@ -5631,7 +6072,9 @@ msgstr "Ismeretlen üzenet érkezett ezzel az azonosítóval : %d" #: Source/Core/Core/Src/NetPlayServer.cpp:504 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" -msgstr "Ismeretlen üzenet érkezett ezzel az azonosítóval:%d ettől a játékostól:%d Játékos kirúgása!" +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 @@ -5662,7 +6105,7 @@ msgstr "Frissítés" msgid "Upright Wiimote" msgstr "Előre tartott Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 mód (PAL60) használata" @@ -5674,7 +6117,7 @@ msgstr "Teljes nézet használata" msgid "Use Hex" msgstr "Hexa használat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Hibakezelők használata" @@ -5686,23 +6129,27 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Több folyamatág használata a textúrák dekódolásához.\n" -"Sebesség növekedést eredményezhet (főleg a két magnál többel rendelkező processzorok esetén).\n" +"Sebesség növekedést eredményezhet (főleg a két magnál többel rendelkező " +"processzorok esetén).\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." #: 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 "" -"Általában ha az árnyaló összeállítása sikertelen, megjelenik egy hibaüzenet.\n" -"Azonban, ennek az opciónak a kijelölésével elérhető a felugró ablak kihagyása, azaz a megszakítás nélküli játékmenet.\n" +"Általában ha az árnyaló összeállítása sikertelen, megjelenik egy " +"hibaüzenet.\n" +"Azonban, ennek az opciónak a kijelölésével elérhető a felugró ablak " +"kihagyása, azaz a megszakítás nélküli játékmenet.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "Kellékek" @@ -5726,25 +6173,29 @@ msgstr "Érték:" msgid "Verbosity" msgstr "Verbosity" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Kép" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Virtuális" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Hangerő" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "WAD telepítési hiba: hiba a(z) %s létrehozása közben" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "WAD telepítési hiba: hiba a(z) %s létrehozása közben" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5763,15 +6214,15 @@ msgstr "" msgid "Warning" msgstr "Figyelem" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "Figyelem - DOL indítása nem megfelelő konzol módban!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Figyelem - ELF indítása nem megfelelő konzol módban!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Figyelem - ISO indítása nem megfelelő konzol módban!" @@ -5799,20 +6250,27 @@ msgstr "" "és azonos néven fog szerepelni a memóriakártyán lévőkkel\n" "Folytatod?" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update the pot file to reflect recent changes in the code. 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 "" <<<<<<< HEAD +<<<<<<< HEAD ======= +======= +>>>>>>> Update the pot file to reflect recent changes in the code. "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." +<<<<<<< HEAD >>>>>>> Update from master branch. #: Source/Core/Core/Src/Movie.cpp:646 @@ -5832,50 +6290,82 @@ msgstr "" ======= 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." +======= +>>>>>>> Update the pot file to reflect recent changes in the code. -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format +<<<<<<< HEAD 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." >>>>>>> Update Hungarian translation. +======= +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." +>>>>>>> Update the pot file to reflect recent changes in the code. -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, 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" +"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" +"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" +"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" +"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 <<<<<<< HEAD +<<<<<<< HEAD ======= +======= +>>>>>>> Update the pot file to reflect recent changes in the code. "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" +<<<<<<< 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" >>>>>>> Update Hungarian translation. +======= +>>>>>>> Update the pot file to reflect recent changes in the code. "\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" +"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" +"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" <<<<<<< HEAD +<<<<<<< HEAD "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. ======= "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 Hungarian translation. +======= +"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 the pot file to reflect recent changes in the code. #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 @@ -5886,7 +6376,7 @@ msgstr "WaveFileWriter - fájl nincs megnyitva." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "Szélesvásznú hack" @@ -5894,15 +6384,15 @@ msgstr "Szélesvásznú hack" msgid "Width" msgstr "Szélesség" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Wii konzol" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Wii NAND gyökér könyvtár:" @@ -5910,6 +6400,7 @@ msgstr "Wii NAND gyökér könyvtár:" msgid "Wii Save Import" msgstr "Wii mentés importálása" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5919,6 +6410,9 @@ msgstr "Wii mentés importálása" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii mentés fájlok (*.bin)|*.bin" @@ -5985,10 +6479,11 @@ msgstr "Windows menü" msgid "Windows Right" msgstr "Jobb Windows" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "Word Wrap" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -6004,6 +6499,11 @@ msgstr "Word Wrap" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Folyamatban..." @@ -6011,6 +6511,11 @@ msgstr "Folyamatban..." msgid "Write to Console" msgstr "Írás a konzolba" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "Írás fájlba" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "Írás fájlba" @@ -6060,15 +6565,17 @@ msgstr "Meg kell adnod egy nevet!" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 msgid "You must enter a valid decimal, hexadecimal or octal value." -msgstr "Be kell írnod egy érvényes decimális, hexadecimális vagy oktális értéket." +msgstr "" +"Be kell írnod egy érvényes decimális, hexadecimális vagy oktális értéket." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 msgid "You must enter a valid profile name." msgstr "Meg kell adnod egy érvényes profil nevet." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." -msgstr "Újra kell indítanod a Dolphin emulátort a változtatások érvényesítéséhez." +msgstr "" +"Újra kell indítanod a Dolphin emulátort a változtatások érvényesítéséhez." #: Source/Core/Core/Src/CoreParameter.cpp:177 msgid "" @@ -6089,7 +6596,7 @@ msgstr "" "0x%04x méretűnek kellene lennie (azonban 0x%04llx méretű)\n" "Akarsz újat létrehozni?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "ZTP hack" @@ -6126,14 +6633,19 @@ msgstr "[Egyedi]" #: 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 "" "[KÍSÉRLETI]\n" -"Az emuláció gyorsítása a célja a textúrák kirakásával dekódolva a grafikai processzor számára az OpenCL keretrendszert használva.\n" -"Azonban, jelenleg köztudottan textúra hiányosságokat okoz számos játékban. Lassabb is mint az átlagos processzoros textúra dekódolás a legtöbb esetben.\n" +"Az emuláció gyorsítása a célja a textúrák kirakásával dekódolva a grafikai " +"processzor számára az OpenCL keretrendszert használva.\n" +"Azonban, jelenleg köztudottan textúra hiányosságokat okoz számos játékban. " +"Lassabb is mint az átlagos processzoros textúra dekódolás a legtöbb " +"esetben.\n" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." @@ -6155,7 +6667,7 @@ msgstr "" msgid "^ ADD" msgstr "^ HOZZÁADÁS" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "betöltő program (.img)" @@ -6186,12 +6698,12 @@ msgstr "nem Wii mentés vagy a fájl fejléc méretének kiolvasása sikertelen msgid "s" msgstr "s" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "ismeretlen parancs 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute visszatért -1 alkalmazás fut!" @@ -6403,6 +6915,9 @@ msgstr "| VAGY" #~ msgid "Emulator Display Settings" #~ msgstr "Emulátor kijelző beállítások" +#~ msgid "Enable Audio Throttle" +#~ msgstr "Hang szabályozás használata" + #~ msgid "Enable CPU Access" #~ msgstr "Processzor hozzáférés engedélyezése" @@ -6460,6 +6975,13 @@ 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ó" @@ -6743,6 +7265,20 @@ msgstr "| VAGY" #~ msgid "The file " #~ msgstr "A fájl" +#~ msgid "" +#~ "This is used to control game speed by sound throttle.\n" +#~ "Disabling this could cause abnormal game speed, such as too fast.\n" +#~ "But sometimes enabling this could cause constant noise.\n" +#~ "\n" +#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." +#~ msgstr "" +#~ "Ez a játék sebességének szabályozására szolgál a hang szabályozás által.\n" +#~ "Kikapcsolása rendellenes sebességet okozhat, többnyire túl gyorsat.\n" +#~ "Viszont néha a bekapcsolása folyamatos zajt eredményezhet.\n" +#~ "\n" +#~ "Gyorsbillentyű : Tartsd lenyomva a szabályozás azonnali " +#~ "kikapcsolásához." + #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "Ez a játék hangok és hang effektusok lejátszásra szolgál." diff --git a/Languages/po/it.po b/Languages/po/it.po index 622cfea1fe..bc89c73efc 100644 --- a/Languages/po/it.po +++ b/Languages/po/it.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -16,6 +17,9 @@ msgstr "" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Update from master branch. +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-04-08 20:40+0100\n" "Last-Translator: RebuMan, Dolphin Team\n" "Language-Team: \n" @@ -57,9 +61,9 @@ msgstr "\"%s\" è un file GCM/ISO non valido, oppure non è una ISO GC/Wii." msgid "%1$sCopy%1$s" msgstr "%1$sCopia%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -153,7 +157,7 @@ msgstr "%sEsporta GCI%s" msgid "%sImport GCI%s" msgstr "%sImporta GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u Blocchi Liberi; %u Voci Directory Libere" @@ -186,11 +190,11 @@ msgstr "Gestore &Trucchi" msgid "&DSP Settings" msgstr "&Impostazioni DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&Elimina ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&Elimina ISO selezionate..." @@ -254,7 +258,7 @@ msgstr "&Pausa" msgid "&Play" msgstr "&Gioca" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&Proprietà" @@ -298,7 +302,7 @@ msgstr "&Visualizza" msgid "&Wiimote Settings" msgstr "Impostazioni &Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "&Wiki" @@ -342,7 +346,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -351,7 +355,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -409,13 +413,13 @@ msgstr "" "\n" "E' necessario inoltrare la porta TCP all'host!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "Scheda basata su AM" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "Codici AR" @@ -427,11 +431,11 @@ msgstr "A proposito di Dolphin" msgid "Acceleration" msgstr "Accellerazione" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Emulazione VBeam accurata" @@ -548,11 +552,11 @@ msgstr "Adattatore:" msgid "Add" msgstr "Aggiungi" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "Aggiungi codice ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "Aggiungi Patch" @@ -560,6 +564,7 @@ msgstr "Aggiungi Patch" msgid "Add new pane" msgstr "Aggiungi nuovo riquadro" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -575,6 +580,11 @@ msgstr "Aggiungi nuovo riquadro" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Aggiungi..." @@ -626,11 +636,11 @@ msgstr "" "Regolare la pressione del comando analogico necessaria per attivare i " "pulsanti." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "Avanzate" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Impostazioni Avanzate" @@ -638,14 +648,15 @@ msgstr "Impostazioni Avanzate" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Tutti i file GC/Wii (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Tutti i file di immagine GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "Tutti i file GCM GameCube (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -658,18 +669,22 @@ msgstr "Tutti i file GCM GameCube (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Tutti gli Stati di Gioco Salvati (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "Tutti i file ISO Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Tutti i file compressi GC/Wii (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "Tutti i file (*.*)|*.*" @@ -681,7 +696,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "Wiimote Emulato" @@ -704,7 +719,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "Impossibile caricare l'Apploader dal file" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Programma di Caricamento (Apploader):" @@ -719,7 +734,7 @@ msgid "" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Arabo" @@ -728,7 +743,7 @@ msgstr "Arabo" msgid "Are you sure you want to delete \"%s\"?" msgstr "Sei sicuro di voler eliminare \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -736,11 +751,12 @@ msgstr "" "Sei sicuro di voler eliminare questi file?\n" "Andranno persi definitivamente!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 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 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -750,6 +766,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Aspetto:" @@ -758,18 +777,20 @@ msgstr "Aspetto:" msgid "At least one pane must remain open." msgstr "Almeno un riquadro deve rimanere aperto." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Interfaccia Audio:" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "Audiocommon: Errore nell'apertura della periferica AO.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -779,6 +800,9 @@ msgstr "Audiocommon: Errore nell'apertura della periferica AO.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -817,7 +841,7 @@ msgstr "" msgid "Back" msgstr "Indietro" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Impostazioni Interfaccia" @@ -845,11 +869,11 @@ msgstr "File di Intestazione (Header) difettoso" msgid "Banner" msgstr "Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "Dettagli Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "Banner:" @@ -861,7 +885,7 @@ msgstr "Barra" msgid "Basic" msgstr "Impostazioni di Base" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Impostazioni di Base" @@ -893,6 +917,7 @@ msgstr "Blu Destro" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -900,6 +925,9 @@ msgstr "Blu Destro" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Sotto" @@ -908,7 +936,7 @@ msgstr "Sotto" msgid "Bound Controls: %lu" msgstr "Controlli Associati: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Corrotto" @@ -924,7 +952,7 @@ msgstr "Cerca una directory da aggiungere" msgid "Browse for an ISO directory..." msgstr "Cerca una directory per le ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "Cerca una directory di destinazione" @@ -955,11 +983,11 @@ msgstr "Levetta di Controllo" msgid "C-Stick" msgstr "Levetta di Controllo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "Motore di Emulazione CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 #, fuzzy msgid "Cache Display Lists" msgstr "Attiva Display List Caching" @@ -999,7 +1027,7 @@ msgstr "Impossibile aprire %s" msgid "Cannot unregister events with events pending" msgstr "Impossibile non registrare gli eventi in sospeso" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1009,7 +1037,7 @@ msgstr "" "Impossibile utilizzare il file come una scheda di memoria.\n" "Stai tentando di utilizzare lo stesso file su ambedue gli ingressi (slots)?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1028,8 +1056,6 @@ msgstr "" msgid "Cant find WiiMote by connection handle %02x" msgstr "Impossibile trovare il WiiMote attraverso l'handle di connessione %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1039,7 +1065,7 @@ msgstr "Impossibile leggere da DVD_Plugin - Interfaccia DVD: Errore Fatale" msgid "Caps Lock" msgstr "Bloc Maiusc" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "" @@ -1064,7 +1090,7 @@ msgstr "Cambia Disco" msgid "Change Game" msgstr "Cambia Gioco" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1080,8 +1106,8 @@ msgstr "Cambia segno al Parametro zFar (dopo la correzione)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Cambia segno al Parametro zNear (dopo la correzione)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "" "La modifica di quest'opzione non avrà alcun effetto finchè l'emulatore " @@ -1103,32 +1129,32 @@ msgstr "Cerca Trucco" msgid "Cheats Manager" msgstr "Gestore Trucchi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Cinese (Semplificato)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Cinese (Tradizionale)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "Scegli una directory principale per i DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 #, fuzzy msgid "Choose a NAND root directory:" msgstr "Scegli una directory principale per i DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Scegli una ISO predefinita:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "Scegli una directory da aggiungere" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Scegli un file da aprire" @@ -1136,7 +1162,7 @@ msgstr "Scegli un file da aprire" msgid "Choose a memory card:" msgstr "Scegli una scheda di memoria:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1144,8 +1170,8 @@ msgstr "" "Scegli il file da utilizzare come apploader: (vale per i dischi costruiti " "solo da directory)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Scegli la cartella in cui 'estrarre in'" @@ -1157,14 +1183,14 @@ msgstr "Levetta Circolare" msgid "Classic" msgstr "Controller Classico" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "Cancella" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "Cancellazione non riuscita." @@ -1180,6 +1206,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 @@ -1188,6 +1215,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Chiudi" @@ -1211,20 +1242,20 @@ msgstr "Comando" msgid "Comment" msgstr "Note" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Note:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "Comprimi ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Comprimi le ISO selezionate..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "Compressione ISO" @@ -1251,13 +1282,13 @@ msgstr "Configura Pads" msgid "Configure..." msgstr "Configura..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "Conferma la Sovrascrittura del File" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 #, fuzzy msgid "Confirm on Stop" msgstr "Conferma alla Chiusura" @@ -1267,7 +1298,7 @@ msgstr "Conferma alla Chiusura" msgid "Connect" msgstr "Connetti" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "Collega Tastiera USB" @@ -1324,12 +1355,12 @@ msgstr "Converti a GCI" msgid "Copy failed" msgstr "Copia non riuscita" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "Copia nella Memcard %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "Core" @@ -1359,7 +1390,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Impossibile riconoscere il file ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "Impossibile salvare %s" @@ -1374,7 +1405,7 @@ msgstr "" "(l'impostazione dei pads mentre il gioco è in esecuzione è una funzione al " "momento non supportata)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1387,7 +1418,7 @@ msgstr "" "Stai eseguendo Dolphin da CD/DVD, o il file di salvataggio è protetto in " "scrittura?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "Impossibile trovare il comando di apertura per l'estensione 'ini'!" @@ -1404,7 +1435,7 @@ msgstr "" msgid "Count:" msgstr "Conteggio:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "Paese:" @@ -1418,25 +1449,25 @@ msgstr "Crea codice AR" msgid "Create new perspective" msgstr "Crea nuova prospettiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "Creata da KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Creata da Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "Creata da VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "Creata da black_rider e pubblicata su ForumW.org > Web Developments" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "Creatore: " @@ -1444,7 +1475,7 @@ msgstr "Creatore: " msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "Taglia Immagine lungo i Bordi" @@ -1464,7 +1495,7 @@ msgstr "Dissolvenza Incrociata" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Directory corrente cambiata da %s a %s dopo wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "Hack Proiezione Personalizzato" @@ -1472,11 +1503,11 @@ msgstr "Hack Proiezione Personalizzato" msgid "Custom Projection Hack Settings" msgstr "Impostazioni Hack Proiezione Personalizzato" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "Personalizza alcuni parametri di Proiezione Ortografica" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Ceco" @@ -1488,10 +1519,11 @@ msgstr "Croce Direzionale" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "Motore di Emulazione DSP" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1502,19 +1534,23 @@ msgstr "Motore di Emulazione DSP" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulazione DSP HLE (veloce)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "Interprete DSP LLE (lento)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 #, fuzzy msgid "DSP LLE on Thread" msgstr "Esegui DSP LLE in un processo dedicato" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "Ricompilatore DSP LLE" @@ -1522,15 +1558,23 @@ msgstr "Ricompilatore DSP LLE" msgid "DSP settings" msgstr "Impostazioni DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "Origine DVD:" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "Dimensione Dati" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "Data:" @@ -1551,7 +1595,7 @@ msgstr "Zona Morta" msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 #, fuzzy msgid "Debugging" msgstr "Debug" @@ -1560,16 +1604,16 @@ msgstr "Debug" msgid "Decimal" msgstr "." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "Decomprimi ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "Decomprimi ISO selezionate..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "Decompressione ISO" @@ -1577,11 +1621,11 @@ msgstr "Decompressione ISO" msgid "Default" msgstr "Predef." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "ISO Predefinita:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "Carattere predefinito" @@ -1590,7 +1634,7 @@ msgstr "Carattere predefinito" msgid "Delete" msgstr "Elimina" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "Elimina Save" @@ -1599,7 +1643,7 @@ msgstr "Elimina Save" msgid "Delete the existing file '%s'?" msgstr "Elimina l'esistente file di salvataggio '%s'" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 #, fuzzy msgid "Description" msgstr "Descrizione Vertex" @@ -1608,8 +1652,8 @@ msgstr "Descrizione Vertex" msgid "Detect" msgstr "Rileva" -#: 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 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." @@ -1622,8 +1666,8 @@ msgstr "" msgid "Device" msgstr "Periferica" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Impostazioni Periferica" @@ -1648,25 +1692,25 @@ msgstr "" " e 'checksum' Directory di backup" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 #, fuzzy msgid "Disable" msgstr "Disabilita Nebbia" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "Disabilita Nebbia" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "Disabilita Illuminazione" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 #, fuzzy msgid "Disable Per-Pixel Depth" msgstr "Profondità Pixel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "Disabilita Trame" @@ -1696,7 +1740,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Disco" @@ -1721,6 +1765,7 @@ msgstr "Visualizza i tasti di input letti dall'emulatore." msgid "Divide" msgstr "/" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1730,10 +1775,13 @@ msgstr "/" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Vuoi interrompere l'emulazione in corso?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1758,6 +1806,7 @@ msgstr "Dolphin - Configurazione Wiimote Emulato" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1782,6 +1831,14 @@ msgstr "Dolphin - Configurazione Controlli GC" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin - Configurazione Controlli GC" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmati TAS Dolphin (*.dtm)" @@ -1813,11 +1870,11 @@ msgstr "" msgid "Down" msgstr "Giù" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "Scarica Codici (Database WiiRD)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Codici %lu scaricati. (%lu aggiunti)" @@ -1826,23 +1883,23 @@ msgstr "Codici %lu scaricati. (%lu aggiunti)" msgid "Drums" msgstr "Percussioni/Batteria" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "Fittizio/a" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "Immagazzina Audio su disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "Immagazzina Oggetti EFB su disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "Immagazzina Fotogrammi su disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "Immagazzina Trame su disco" @@ -1870,6 +1927,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1885,6 +1943,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Olandese" @@ -1910,7 +1973,7 @@ msgstr "" "distribuzione di Dolphin, probabile sia richiesto un riavvio per consentire " "Windows di 'vedere' il nuovo driver." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "EUROPA" @@ -1926,7 +1989,7 @@ msgstr "Modifica" msgid "Edit ActionReplay Code" msgstr "Modifica Codice ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Modifica Configurazione" @@ -1938,8 +2001,8 @@ msgstr "Modifica Pacth" msgid "Edit current perspective" msgstr "Modifica prospettiva corrente" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "Modifica..." @@ -1979,7 +2042,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Wiimote Emulato" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "Stato dell'Emulazione: " @@ -2001,23 +2064,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "Attiva Registrazione Eventi AR" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "Abilita Autoregolazione Audio" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "Attiva BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Attiva Unione Blocchi" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -2031,6 +2094,7 @@ msgstr "" msgid "Enable Cache" msgstr "Attiva Cache" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2040,52 +2104,55 @@ msgstr "Attiva Cache" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Abilita Trucchi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "Abilita Audio DTK" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Attiva Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Attiva Dual Core (aumenta la velocità)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "Attiva Tasti di Scelta Rapida" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Salta pause dovute a inattività" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Salta pause dovute a inattività (aumenta la velocità)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Attiva MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "Attiva Scansione Progressiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 #, fuzzy msgid "Enable Screen Saver" msgstr "Attiva WideScreen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "Attiva WideScreen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "Attiva Rappres. Vettoriale" @@ -2102,7 +2169,7 @@ msgstr "" "Migliora la qualità visiva delle trame che si trovano sotto un angolo di " "vista obliquo." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2110,7 +2177,7 @@ msgstr "" "Attivare l'accesso veloce del disco. Necessario per alcuni giochi. " "(Abilitato = Veloce, Disabilitato = Compatibile)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "Attiva pagine" @@ -2130,7 +2197,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2138,7 +2205,7 @@ msgstr "" "Se attivato velocizza The Legend of Zelda: Twilight Princess. Disattiva per " "qualsiasi altro gioco" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2149,7 +2216,7 @@ msgstr "" "Accresce l'accuratezza dell'hardware emulato, ma è lento da eseguire (Attivo " "= Compatibile, Disattivato = Veloce)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "Abilita Hack Proiezione Personalizzato" @@ -2161,7 +2228,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2180,6 +2247,7 @@ msgstr "" msgid "End" msgstr "Fine" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2195,6 +2263,11 @@ msgstr "Fine" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Inglese" @@ -2225,6 +2298,7 @@ msgstr "Uguale" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Errore/i" @@ -2255,20 +2329,26 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "Errore/i" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "Errore caricamento della lingua selezionata. Ritorno alla predefinita di " "sistema." -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, 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 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2304,7 +2384,7 @@ msgstr "Esci dall'Emulatore Dolphin" msgid "Export Failed" msgstr "Esportazione non riuscita" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "Esporta File" @@ -2317,15 +2397,15 @@ msgstr "Esporta Registrazione" msgid "Export Recording..." msgstr "Esporta Registrazione..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "Esporta Salvataggio" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "Esporta salvataggi Wii (sperimentale)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "Esporta tutti i salvataggi" @@ -2341,7 +2421,7 @@ msgstr "Esporta salvataggio come..." msgid "Extension" msgstr "Estensione" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 #, fuzzy msgid "External Frame Buffer" msgstr "Frame Buffer" @@ -2354,44 +2434,44 @@ msgstr "Parametro Extra" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Parametro Extra utile solo in ''Metroid: Other M''." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "Estrai Tutti i File..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "Estrai Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "Estrai DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "Estrai Directory..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "Estrai File..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "Estrai Partizione..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "Estrazione %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "Estrazione di Tutti i File" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "Estrazione Directory" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "Estrazione..." @@ -2403,11 +2483,11 @@ msgstr "Byte FIFO" msgid "FIFO Player" msgstr "Lettore FIFO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "FRANCIA" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "Dimensione FST:" @@ -2419,11 +2499,11 @@ msgstr "Connessione non riuscita!" msgid "Failed to Listen!!" msgstr "Impossibile 'rimanere in ascolto'!!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "Download dei codici non riuscito" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Estrazione in %s non riuscita!" @@ -2544,19 +2624,29 @@ msgstr "Scrittura intestazione per %s non riuscita" msgid "Failed to write header for file %d" msgstr "Scrittura intestazione per il file %d non riuscita" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "Veloce" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 #, fuzzy msgid "Fast Mipmaps" msgstr "Carica Mip Maps precalcolate" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "Versione veloce della MMU. Non funziona con qualsiasi gioco." +#: Source/Core/Core/Src/Movie.cpp:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "Lettore Fifo" @@ -2565,7 +2655,7 @@ msgstr "Lettore Fifo" msgid "File Info" msgstr "Info File" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "Il file non conteneva codici." @@ -2598,16 +2688,16 @@ msgstr "Il file non è riconosciuto come una memcard" msgid "File not compressed" msgstr "File non compresso" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "File I/O: Modalità di apertura sconosciuta : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "Filesystem" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Il tipo 'ini' è sconosciuto! Il file non verrà aperto!" @@ -2615,7 +2705,7 @@ msgstr "Il tipo 'ini' è sconosciuto! Il file non verrà aperto!" msgid "First Block" msgstr "Primo Blocco" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "Ripara Somme di Controllo (Checksums)" @@ -2627,7 +2717,7 @@ msgstr "Forza 16:9" msgid "Force 4:3" msgstr "Forza 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 #, fuzzy msgid "Force Console as NTSC-J" msgstr "Imposta come Console NTSC-J" @@ -2661,7 +2751,7 @@ msgstr "" "Forza l'uscita video del gioco per risoluzioni widescreen.\n" "Questo potrebbe causare difetti grafici" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2694,7 +2784,7 @@ msgstr "Fotogramma " msgid "Frame Advance" msgstr "Fotogramma per Fotogramma" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 #, fuzzy msgid "Frame Dumps use FFV1" msgstr "Usa FFV1 per immagazzinare i fotogrammi" @@ -2707,7 +2797,7 @@ msgstr "Intervallo Fotogramma" msgid "Frame S&kipping" msgstr "Salta &Fotogramma" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Limite FPS:" @@ -2715,10 +2805,11 @@ msgstr "Limite FPS:" msgid "Frames To Record" msgstr "Fotogrammi da Registrare:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "Visuale Libera" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2734,6 +2825,11 @@ msgstr "Visuale Libera" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Francese" @@ -2768,7 +2864,7 @@ msgstr "Configurazione Log" msgid "GCPad" msgstr "Controlli GC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "ID Gioco:" @@ -2784,15 +2880,15 @@ msgstr "Il gioco non è avviato" msgid "Game not found!!" msgstr "Gioco non trovato!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "Impostazioni di Gioco Specifiche" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Configurazione di Gioco" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "GameCube" @@ -2803,6 +2899,7 @@ msgstr "Impostazioni &Controlli 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 @@ -2810,6 +2907,9 @@ msgstr "Impostazioni &Controlli GameCube" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Schede di Memoria GameCube (*.raw,*.gcp)" @@ -2818,15 +2918,17 @@ msgid "Gamecube Pad settings" msgstr "Impostazioni Controlli GameCube" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Codici Gecko" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" "Esecuzione Codice Gecko non riuscita (CT%i CST%i) (%s)\n" "(codice corrotto oppure tipo di codice non ancora supportato.)" @@ -2841,8 +2943,12 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Generale" @@ -2852,6 +2958,7 @@ msgstr "Generale" msgid "General Settings" msgstr "Impostazioni Interfaccia" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2867,6 +2974,11 @@ msgstr "Impostazioni Interfaccia" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Tedesco" @@ -2900,7 +3012,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Greco" @@ -2932,7 +3044,7 @@ msgstr "" msgid "Header checksum failed" msgstr "Somma di controllo dell'intestazione non riuscita" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Ebreo" @@ -3000,12 +3112,16 @@ msgstr "Configurazione Tasti di Scelta Rapida" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Tasti di Scelta Rapida" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Ungherese" @@ -3013,14 +3129,14 @@ msgstr "Ungherese" msgid "Hybrid Wiimote" msgstr "Wiimote Ibrido" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS: Tentativo di accesso ai dati da un punto di ingresso " "sconosciuto: %08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -3033,11 +3149,11 @@ msgstr "" "IDTitolo %016llx.\n" " Dolphin, adesso, probabile vada in blocco" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - destinazione corrotta" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "Impostazioni IPL" @@ -3053,15 +3169,15 @@ msgstr "Puntatore a raggi infrarossi (IR)" msgid "IR Sensitivity:" msgstr "Sensibilità IR:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "Dettagli ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "Directory ISO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "ITALIA" @@ -3069,23 +3185,25 @@ msgstr "ITALIA" msgid "Icon" msgstr "Icona" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "Se il framerate risulta incoerente o incostante, questa opzione potrebbe " "porre rimedio. (Attivo = Compatibile, Disabilitato = Veloce)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy 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." +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " +"Audio to throttle using the DSP (might fix audio clicks but can also cause " +"constant noise depending on the game)." msgstr "" "Se si imposta un Limite di Fotogramma elevato (NTSC:60, PAL:50),\n" "bisogna disabilitare l'Autoregolazione Audio in DSP per rendere efficace " @@ -3114,7 +3232,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "Salva Importazione" @@ -3163,7 +3281,7 @@ msgstr "" "Disabilita illuminazione. Migliora le prestazioni ma provoca la scomparasa\n" "dell'illuminazione stessa nei giochi che la utilizzano" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "In Game" @@ -3172,7 +3290,7 @@ msgid "In-Game" msgstr "In-Game" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info" @@ -3192,7 +3310,7 @@ msgstr "Ins" msgid "Insert Encrypted or Decrypted code here..." msgstr "Inserisci il codice criptato o decriptato qui..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Inserisci SD Card" @@ -3204,7 +3322,7 @@ msgstr "Inserire il nome qui..." msgid "Install WAD" msgstr "Installa WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Installa in Menu Wii" @@ -3215,6 +3333,7 @@ msgstr "" "E' stata sollevata un'Eccezione all'Installazione, tuttavia questa " "piattaforma non la supporta ancora." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3224,15 +3343,18 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Installazione WAD..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 #, fuzzy msgid "Interface" msgstr "Impostazioni Interfaccia" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "Impostazioni Interfaccia" @@ -3258,11 +3380,11 @@ msgstr "Errore Interno LZO - lzo_init() non riuscita" msgid "Internal Resolution:" msgstr "Risoluzione video a Schermo Intero:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Interprete (molto lento)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "Intro" @@ -3279,7 +3401,7 @@ msgstr "Valore non Valido!" msgid "Invalid bat.map or dir entry" msgstr "bat.map o voce directory non valide" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "Tipo di evento %i non valido" @@ -3299,14 +3421,15 @@ msgstr "" "%s\n" " E' possibile che sia necessario il redumping del gioco." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "File di registrazione non valido" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "Stato non valido" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3322,27 +3445,32 @@ msgstr "Stato non valido" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italiano" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "GIAPPONE" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "Ricompilatore JIT (consigliato)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "Ricompilatore JITIL sperimentale" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Giapponese" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "KOREA" @@ -3351,8 +3479,8 @@ msgstr "KOREA" msgid "Key" msgstr "Combinaz. Tasti" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Coreano" @@ -3370,7 +3498,7 @@ msgstr "Pulsante L" msgid "L-Analog" msgstr "L-Analogico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "Lingua:" @@ -3423,7 +3551,7 @@ msgstr "" msgid "Less Than" msgstr "Minore di" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "" @@ -3431,7 +3559,7 @@ msgstr "" msgid "Load" msgstr "Carica" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 #, fuzzy msgid "Load Custom Textures" msgstr "Carica Trame ad Alta Risoluzione" @@ -3480,6 +3608,7 @@ msgstr "Carica Stato di Gioco dall'Ingresso 8" msgid "Load State..." msgstr "Carica Stato di Gioco..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3489,10 +3618,14 @@ msgstr "Carica Stato di Gioco..." ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "Carica il Menu di Sistema Wii %d%c" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 @@ -3502,6 +3635,9 @@ msgstr "Carica il Menu di Sistema Wii %d%c" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carica il Menu di Sistema Wii %d%c" @@ -3528,7 +3664,7 @@ msgstr "Carica il file specificato (DOL, ELF, GCM, ISO, WAD)" msgid "Local" msgstr "Locale" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 #, fuzzy msgid "Lock Threads to Cores" msgstr "Blocca processi ai nuclei" @@ -3541,11 +3677,11 @@ msgstr "Log" msgid "Log Configuration" msgstr "Configurazione Log" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Tipi di Log" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Destinazione Logger" @@ -3575,7 +3711,7 @@ msgstr "" "L'MD5 non corrisponde\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "Hack Velocità MMU" @@ -3597,11 +3733,11 @@ msgstr "File MadCatz Gameshark(*.gcs)" msgid "Main Stick" msgstr "Levetta Principale" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "ID Produttore:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "Produttore:" @@ -3625,6 +3761,7 @@ msgstr "Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3632,6 +3769,9 @@ msgstr "Byte" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Scheda di Memoria" @@ -3668,7 +3808,7 @@ msgstr "" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "Mic" @@ -3678,11 +3818,11 @@ msgstr "Mic" msgid "Min" msgstr "Mic" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "Varie" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Impostazioni Varie" @@ -3699,7 +3839,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "Carattere a spaziatura fissa" @@ -3712,7 +3852,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motore" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3727,7 +3867,7 @@ msgstr "" msgid "Multiply" msgstr "*" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3817,6 +3957,7 @@ msgstr "TN Tab" msgid "NP Up" msgstr "TN Su" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3826,6 +3967,9 @@ msgstr "TN Su" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3834,7 +3978,7 @@ msgstr "Nome:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Nome: " @@ -3848,7 +3992,7 @@ msgid "New Scan" msgstr "Nuova Ricerca" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "Pagina Successiva" @@ -3860,7 +4004,7 @@ msgstr "Ricerca Successiva" msgid "Nickname :" msgstr "Pseudonimo:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "Nessun Paese (SDK)" @@ -3899,7 +4043,7 @@ msgstr "Nessuna cartella di salvataggio trovata per il titolo %s" msgid "None" msgstr "Nessuno/a" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Norvegese" @@ -3907,8 +4051,8 @@ msgstr "Norvegese" msgid "Not Equal" msgstr "Diverso" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "Non Impostato" @@ -3928,7 +4072,7 @@ msgstr "Non collegato" msgid "Notes" msgstr "Note" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "Note: " @@ -3966,7 +4110,7 @@ msgstr "Oggetto" msgid "Object Range" msgstr "Intervallo Oggetto" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Spento" @@ -3992,11 +4136,11 @@ msgstr "Solo %d blocchi disponibili" msgid "Open" msgstr "Apri" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "Apri &percorso file" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "Apri cartella &salvataggi Wii" @@ -4018,12 +4162,12 @@ msgstr "OpenAL: impossibile trovare la periferica audio" msgid "OpenAL: can't open device %s" msgstr "OpenAL: impossibile aprire il dispositivo %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 #, fuzzy msgid "OpenCL Texture Decoder" msgstr "Decodificatore Trama OpenMP" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "Decodificatore Trama OpenMP" @@ -4057,7 +4201,7 @@ msgstr "" "memcard\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "" @@ -4109,19 +4253,20 @@ msgstr "Paragrafo" msgid "Parameters" msgstr "Parametri" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partizione %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Patches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Percorsi" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4134,6 +4279,10 @@ msgstr "Percorsi" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -4143,7 +4292,7 @@ msgstr "Pausa" msgid "Per-Pixel Lighting" msgstr "Illuminazione Pixel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Perfetto" @@ -4156,6 +4305,7 @@ msgstr "Prospettiva %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 ======= @@ -4166,6 +4316,10 @@ msgstr "Prospettiva %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Gioca" @@ -4179,7 +4333,7 @@ msgstr "Avvia Riproduzione Registrazione" msgid "Play/Pause" msgstr "Gioca/Pausa" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "Giocabile" @@ -4191,6 +4345,7 @@ msgstr "Opzioni di Riproduzione" msgid "Players" msgstr "Giocatori" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4200,6 +4355,9 @@ msgstr "Giocatori" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Per favore confermare..." @@ -4211,23 +4369,23 @@ msgstr "Si prega di creare un prospettiva prima di salvare" msgid "Plus-Minus" msgstr "Più-Meno" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Polacco" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Porta 1:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Porta 2:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Porta 3:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Porta 4:" @@ -4236,11 +4394,11 @@ msgstr "Porta 4:" msgid "Port :" msgstr "Porta:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portoghese" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portoghese (Brasiliano)" @@ -4249,17 +4407,17 @@ msgstr "Portoghese (Brasiliano)" msgid "Post-Processing Effect:" msgstr "Effetti di Post-Processing:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4272,7 +4430,7 @@ msgstr "Preimpostazioni: " msgid "Prev Page" msgstr "Pagina Precedente" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "Pagina Precedente" @@ -4323,7 +4481,7 @@ msgstr "R-Analogico" msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "RUSSIA" @@ -4336,7 +4494,7 @@ msgstr "Gamma" msgid "Read-only mode" msgstr "Modalità in Sola-lettura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "Reale" @@ -4413,6 +4571,7 @@ msgstr "Aggiorna Elenco" msgid "Refresh game list" msgstr "Aggiorna elenco giochi" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4431,6 +4590,12 @@ msgstr "Aggiorna elenco giochi" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Rimuovi" @@ -4483,11 +4648,11 @@ msgstr "Levetta Destra" msgid "Rumble" msgstr "Vibrazione" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Esegui DSP LLE in un thread dedicato (non raccomandato)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Russo" @@ -4495,10 +4660,11 @@ msgstr "Russo" msgid "Sa&ve State" msgstr "Sa&lva Stato di Gioco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "Accurata" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4508,6 +4674,9 @@ msgstr "Accurata" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Frequenza di Campionamento:" @@ -4565,12 +4734,12 @@ msgstr "Salva Stato di Gioco nell'Ingresso 8" msgid "Save State..." msgstr "Salva Stato di Gioco..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Salva come..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Salva GCM/ISO compressi" @@ -4578,11 +4747,11 @@ msgstr "Salva GCM/ISO compressi" msgid "Save current perspective" msgstr "Salva prospettiva corrente" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "Salva GCM/ISO decompressi" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Il salvataggio del filmato %s è corrotto, arresto registrazione..." @@ -4592,6 +4761,7 @@ msgstr "Il salvataggio del filmato %s è corrotto, arresto registrazione..." msgid "Scaled EFB Copy" msgstr "Scala Copie EFB" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4601,15 +4771,18 @@ msgstr "Scala Copie EFB" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "Ricerca..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "Ricerca ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "Ricerca..." @@ -4625,12 +4798,12 @@ msgstr "Bloc Scroll" msgid "Search Filter" msgstr "Filtro di Ricerca" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Cerca nelle Sottocartelle" -#: 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:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "Sezione %s non trovata in SYSCONF" @@ -4640,6 +4813,7 @@ msgstr "Sezione %s non trovata in SYSCONF" msgid "Select" msgstr "Seleziona" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4664,6 +4838,14 @@ msgstr "Seleziona il File di Registrazione" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Seleziona il File di Registrazione" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Seleziona un file WAD Wii da installare" @@ -4689,16 +4871,21 @@ msgstr "Seleziona finestre libere/mobili" msgid "Select the file to load" msgstr "Seleziona il file da caricare" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Seleziona il file di salvataggio" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Seleziona lo stato di gioco da caricare" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 @@ -4718,6 +4905,9 @@ msgstr "Seleziona lo stato di gioco da caricare" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Seleziona lo stato di gioco da salvare" @@ -4739,7 +4929,7 @@ msgstr "" "- Adatta a finestra: Estende l'immagine per adattarsi alle dimensioni della " "finestra." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Carattere selezionato" @@ -4775,11 +4965,11 @@ msgstr "Posizione della Barra a Sensori: " msgid "Separator" msgstr "Separatore" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Serbo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4790,11 +4980,11 @@ msgstr "" msgid "Set" msgstr "Imposta" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "Imposta come ISO &predefinita" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "Imposta %c come Memcard predefinita" @@ -4806,7 +4996,7 @@ msgstr "" "SetARCode_IsActive: Indice troppo grande rispetto alla dimensione " "dell'elenco dei codici AR %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "Impostazioni..." @@ -4818,7 +5008,7 @@ msgstr "SetupWiiMem: Impossible trovare il file per le impostazioni" msgid "Shake" msgstr "Scuoti" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "Nome breve:" @@ -4847,7 +5037,7 @@ msgstr "Mostra Barra degli St&rumenti" msgid "Show Drives" msgstr "Mostra Unità a Disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 #, fuzzy msgid "Show EFB Copy Regions" msgstr "Individua Copie EFB" @@ -4864,7 +5054,7 @@ msgstr "Mostra Francia" msgid "Show GameCube" msgstr "Mostra GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "Mostra Tasti di Input" @@ -4880,7 +5070,7 @@ msgstr "Mostra JAP" msgid "Show Korea" msgstr "Mostra Corea" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "Mostra Lingua:" @@ -4900,7 +5090,7 @@ msgstr "Mostra Piattaforme" msgid "Show Regions" msgstr "Mostra Regioni" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 #, fuzzy msgid "Show Statistics" msgstr "Statistiche" @@ -4921,11 +5111,11 @@ msgstr "Mostra Wad" msgid "Show Wii" msgstr "Mostra Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "Mostra una messaggio di conferma prima di arrestare un gioco." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 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 " @@ -4937,23 +5127,23 @@ msgstr "" "potrà accadere che Dolphin improvvisamente incorra in un crash senza nessuna " "apparente spiegazione." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "Mostra primo blocco" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "Mostra blocchi salvati" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "Mostra commento salvato" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "Mostra icona salvata" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "Mostra titolo salvato" @@ -4984,7 +5174,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Wiimote in posizione di traverso" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Cinese Semplificato" @@ -4992,12 +5182,12 @@ msgstr "Cinese Semplificato" msgid "Size" msgstr "Dimensioni" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 #, fuzzy msgid "Skip BIOS" msgstr "Salta Caricamento BIOS GC" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 #, fuzzy msgid "Skip Dest. Alpha Pass" msgstr "Disabilita Dest. Alpha Pass" @@ -5030,11 +5220,11 @@ msgstr "" msgid "Slot %i" msgstr "Ingresso %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Ingresso A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Ingresso B" @@ -5054,7 +5244,7 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "Impostazioni Audio" @@ -5072,6 +5262,7 @@ msgstr "Creazione buffer audio non riuscita: %s" msgid "Space" msgstr "Spazio" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5087,6 +5278,11 @@ msgstr "Spazio" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Spagnolo" @@ -5110,7 +5306,7 @@ msgstr "" msgid "Specify a video backend" msgstr "Seleziona un plugin video" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Aumenta la velocità di trasferimento del Disco" @@ -5118,7 +5314,7 @@ msgstr "Aumenta la velocità di trasferimento del Disco" msgid "Square Stick" msgstr "Levetta Quadrata" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "Controller Standard" @@ -5211,12 +5407,12 @@ msgstr "Seleziona il file di salvataggio" msgid "Swing" msgstr "Ruota/Oscilla" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Lingua di Sistema:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "TAIWAN" @@ -5256,7 +5452,7 @@ msgstr "Semipiano destro" msgid "Take Screenshot" msgstr "Genera un'Istantanea di Gioco" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -5273,7 +5469,7 @@ msgstr "Trama" msgid "Texture Cache" msgstr "Cmd Trama" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 #, fuzzy msgid "Texture Format Overlay" msgstr "Formato Trama" @@ -5290,13 +5486,13 @@ msgstr "L'indirizzo non è valido" msgid "The checksum was successfully fixed" msgstr "Tentativo di ripristino della somma di controllo riuscito" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "La directory scelta è già in lista" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5318,7 +5514,7 @@ msgid "The file %s was already open, the file header will not be written." msgstr "" "Il file %s è già stato aperto, il file di intestazione non verrà scritto." -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Il file %s specificato non esiste" @@ -5340,7 +5536,7 @@ msgid "" "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." +"If unsure, use the rightmost value." msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 @@ -5382,7 +5578,7 @@ msgstr "il file \"%s\" specificato non esiste" msgid "The value is invalid" msgstr "Il valore non è valido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Tema" @@ -5390,7 +5586,7 @@ msgstr "Tema" msgid "Theme selection went wrong" msgstr "La selezione del Tema non era corretta" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5398,7 +5594,7 @@ msgstr "" "Un punto di ingresso in 00000001/00000002 deve essere presente. Dumping NAND " "probabilmente incompleto." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5414,7 +5610,7 @@ msgid "" msgstr "" "Questo simulatore di action replay non supporta codici automodificanti." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "" "Ciò potrebbe causare rallentamenti all'interno del Menu Wii e in alcuni " @@ -5432,28 +5628,10 @@ msgid "" msgstr "" #: 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" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" -"Questo è utilizzato per calibrare la velocità di gioco secondo " -"l'autoregolazione audio.\n" -"La disabilitazione di quest'opzione potrebbe causare una velocità di gioco " -"anomala e troppo veloce.\n" -"Ma alcune volte la sua attivazione porta a rumori e disturbi costanti " -"all'audio.\n" -"\n" -"Scorciatoia da Tastiera : Tenere premuto per disabilitare " -"istantaneamente l'Autoregolazione." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "Questo è usato per riprodurre tracce e brani musicali, come BGM." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5467,7 +5645,7 @@ msgstr "" "Migliora la velocità sui PC con più di un core,\n" "ma può anche provocare occasionali crash/difetti." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "" "Questo vi permetterà di modificare manualmente il file di configurazione INI" @@ -5491,7 +5669,7 @@ msgstr "Titolo" msgid "To" msgstr "a" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "Seleziona/Deseleziona tutti i Tipi di Log" @@ -5511,6 +5689,7 @@ msgstr "Commuta a Schermo Intero" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5518,14 +5697,17 @@ msgstr "Commuta a Schermo Intero" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Sopra" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Cinese Tradizionale" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "Tentativo di caricamento di un tipo di file sconosciuto." @@ -5533,7 +5715,7 @@ msgstr "Tentativo di caricamento di un tipo di file sconosciuto." msgid "Triggers" msgstr "Grilletti" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Tentativo di accesso da una SYSCONF non valida" @@ -5545,7 +5727,7 @@ msgstr "" "Tentativo di accesso da una SYSCONF non valida\n" "Gli identificativi Wiimote bt non sono disponibili" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Turco" @@ -5566,11 +5748,11 @@ msgstr "Porta UDP:" msgid "UDP Wiimote" msgstr "Wiimote UDP" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "SCONOSCIUTO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "USA" @@ -5652,7 +5834,7 @@ msgstr "Aggiorna" msgid "Upright Wiimote" msgstr "Wiimote in posizione verticale" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Utilizza Modalità EuRGB60 (PAL60)" @@ -5665,7 +5847,7 @@ msgstr "&Schermo Intero" msgid "Use Hex" msgstr "Usa Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Avvisi di Errore" @@ -5686,7 +5868,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "Utilità" @@ -5710,25 +5892,29 @@ msgstr "Valore: " msgid "Verbosity" msgstr "Verboso" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Video" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Virtuale" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Volume" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "Installazione WAD non riuscita: errore nella creazione di %s" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "Installazione WAD non riuscita: errore nella creazione di %s" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5743,15 +5929,15 @@ msgstr "" msgid "Warning" msgstr "Allarme/i" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "Attenzione - avvio DOL in modalità console errata!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Attenzione - avvio ELF in modalità console errata!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Attenzione - avvio ISO in modalità console errata!" @@ -5781,7 +5967,7 @@ msgstr "" "la quale presenta un nome uguale ai file sulla tua memcard\n" "Continuare?" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5789,7 +5975,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5797,7 +5983,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5825,7 +6011,7 @@ msgstr "WaweFileWriter - file non aperto." msgid "Whammy" msgstr "Tremolo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "Hack Widescreen" @@ -5833,15 +6019,15 @@ msgstr "Hack Widescreen" msgid "Width" msgstr "Larghezza" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Console Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #, fuzzy msgid "Wii NAND Root:" msgstr "Origine DVD:" @@ -5850,6 +6036,7 @@ msgstr "Origine DVD:" msgid "Wii Save Import" msgstr "Importa Salvataggi Wii" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5859,6 +6046,9 @@ msgstr "Importa Salvataggi Wii" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Salva i file Wii (*.bin)|*.bin" @@ -5926,10 +6116,11 @@ msgstr "Menù Windows" msgid "Windows Right" msgstr "Windows Destro" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "Adatta Testo" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -5945,6 +6136,11 @@ msgstr "Adatta Testo" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Attività in corso..." @@ -5952,6 +6148,11 @@ msgstr "Attività in corso..." msgid "Write to Console" msgstr "Scrivi nella Console" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "Scrivi su File" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "Scrivi su File" @@ -6005,7 +6206,7 @@ msgstr "E' necessario inserire un valore decimale, esadecimale o ottale." msgid "You must enter a valid profile name." msgstr "E' necessario inserie un nome valido per il profilo." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" "E' necessario il riavvio di Dolphin affinché le modifiche abbiano effetto." @@ -6029,7 +6230,7 @@ msgstr "" "Dovrebbe essere 0x%04x (invece di 0x%04llx)\n" "Desideri generarne uno nuovo?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "Hack ZTP" @@ -6083,7 +6284,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -6116,12 +6317,12 @@ msgstr "" msgid "s" msgstr "s" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "cmd 0x%08x sconosciuto" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "valore wxExecute ritornato -1 su applicazione in esecuzione!" @@ -6554,6 +6755,9 @@ msgstr "| OR" #~ msgid "Emulator Display Settings" #~ msgstr "Impostazioni di Visualizzazione dell'Emulatore" +#~ msgid "Enable Audio Throttle" +#~ msgstr "Abilita Autoregolazione Audio" + #~ msgid "Enable CPU Access" #~ msgstr "Attiva Accesso alla CPU" @@ -7019,6 +7223,23 @@ msgstr "| OR" #~ msgid "The file " #~ msgstr "Il file" +#~ msgid "" +#~ "This is used to control game speed by sound throttle.\n" +#~ "Disabling this could cause abnormal game speed, such as too fast.\n" +#~ "But sometimes enabling this could cause constant noise.\n" +#~ "\n" +#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." +#~ msgstr "" +#~ "Questo è utilizzato per calibrare la velocità di gioco secondo " +#~ "l'autoregolazione audio.\n" +#~ "La disabilitazione di quest'opzione potrebbe causare una velocità di " +#~ "gioco anomala e troppo veloce.\n" +#~ "Ma alcune volte la sua attivazione porta a rumori e disturbi costanti " +#~ "all'audio.\n" +#~ "\n" +#~ "Scorciatoia da Tastiera : Tenere premuto per disabilitare " +#~ "istantaneamente l'Autoregolazione." + #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "Questo solitamente è usato per riprodurre voci ed effetti sonori." diff --git a/Languages/po/ja.po b/Languages/po/ja.po index 12fee69911..eec5710d55 100644 --- a/Languages/po/ja.po +++ b/Languages/po/ja.po @@ -9,7 +9,11 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-10-12 20:45+0900\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -62,9 +66,9 @@ msgstr "\"%s\" は無効なファイル、またはゲームキューブ／Wii msgid "%1$sCopy%1$s" msgstr "%1$s コピー %1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -159,7 +163,7 @@ msgstr "%s エクスポート GCI %s" msgid "%sImport GCI%s" msgstr "%s インポート GCI %s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u ブロック空き | %u エントリ空き" @@ -192,11 +196,11 @@ msgstr "チートコード編集ツール(&C)" msgid "&DSP Settings" msgstr "サウンド設定(&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "このタイトルの実体を削除(&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "選択したタイトルの実体を全て削除(&D)" @@ -260,7 +264,7 @@ msgstr "一時停止(&P)" msgid "&Play" msgstr "開始(&P)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "プロパティ(&P)" @@ -304,7 +308,7 @@ msgstr "表示(&V)" msgid "&Wiimote Settings" msgstr "Wii入力設定(&W)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "公式Wiki(英語)で動作状況を確認(&W)" @@ -348,7 +352,7 @@ msgstr "コード名を入力してください" msgid "" msgstr "<対応解像度が見つかりません>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "なし" @@ -357,7 +361,7 @@ msgstr "なし" msgid "" msgstr "入力を待機..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "＜システムの言語＞" @@ -412,13 +416,13 @@ msgstr "" "\n" "TCPポートの開放を忘れずに！" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "Triforce基板" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "アクションリプレイコード" @@ -430,11 +434,11 @@ msgstr "Dolphinについて" msgid "Acceleration" msgstr "加速度" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "精度：" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Accurate VBeam emulation" @@ -558,11 +562,11 @@ msgstr "ビデオカード：" msgid "Add" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "コードを追加" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "パッチを追加" @@ -570,6 +574,7 @@ msgstr "パッチを追加" msgid "Add new pane" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -585,6 +590,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "追加" @@ -630,11 +640,11 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "ボタンが反応する感度を調整します" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "高度な設定" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "高度な設定" @@ -642,14 +652,15 @@ msgstr "高度な設定" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "全ての GC/Wii ファイル (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "全ての GC/Wii イメージ (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "GC GCMファイル (gcm)|*.gcm" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -662,18 +673,22 @@ msgstr "GC GCMファイル (gcm)|*.gcm" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "全てのステートセーブファイル (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "Wii ISOファイル (iso)|*.iso" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "圧縮されたGC/Wii ISOファイル (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "全てのファイル (*.*)|*.*" @@ -689,6 +704,7 @@ msgstr "" "\n" "よく分からなければ、チェックを入れないでください。" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 <<<<<<< HEAD <<<<<<< HEAD @@ -700,6 +716,9 @@ msgid "Alternate Wiimote Timing" msgstr "Wii リモコンをエミュレート" >>>>>>> Update translation files for recent changes in the code. ======= +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Alternate Wiimote Timing" msgstr "Wii リモコンの同期調整" >>>>>>> Update Arabic and Japanese translations. @@ -721,7 +740,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "Apploader ファイルから読み込むことができません" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Apploader" @@ -739,7 +758,7 @@ msgstr "" "\n" "よく分からなければ、【オフ】を選択してください。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "アラビア語" @@ -748,7 +767,7 @@ msgstr "アラビア語" msgid "Are you sure you want to delete \"%s\"?" msgstr "\"%s\" このプロファイルを削除しますか？" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -756,10 +775,11 @@ msgstr "" "これら複数のタイトルの実体ファイルを削除しますか？\n" "元に戻すことはできません！" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "このタイトルの実体ファイルを削除しますか？元に戻すことはできません！" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -769,6 +789,9 @@ msgstr "このタイトルの実体ファイルを削除しますか？元に戻 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "アスペクト比：" @@ -777,18 +800,20 @@ msgstr "アスペクト比：" msgid "At least one pane must remain open." msgstr "At least one pane must remain open." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "サウンド" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "出力API (Audio Backend)" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error opening AO device.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -798,6 +823,9 @@ msgstr "AudioCommon: Error opening AO device.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "自動" @@ -840,7 +868,7 @@ msgstr "" msgid "Back" msgstr "Back" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "出力設定" @@ -867,11 +895,11 @@ msgstr "ファイルヘッダの不良" msgid "Banner" msgstr "バナー" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "バナーの詳細" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "バナー表示" @@ -883,7 +911,7 @@ msgstr "バー" msgid "Basic" msgstr "基本設定" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "基本設定" @@ -914,6 +942,7 @@ msgstr "青 - 右" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -921,6 +950,9 @@ msgstr "青 - 右" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "下部" @@ -929,7 +961,7 @@ msgstr "下部" msgid "Bound Controls: %lu" msgstr "コマンド数: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "ダメダメ" @@ -945,7 +977,7 @@ msgstr "ゲームリストに追加するフォルダを選択してください msgid "Browse for an ISO directory..." msgstr "ISOのあるフォルダをブラウズ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "出力先を選択" @@ -975,11 +1007,11 @@ msgstr "C-スティック" msgid "C-Stick" msgstr "C-スティック" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "CPUエミュレーション方式" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "Cache Display Lists" @@ -1029,7 +1061,7 @@ msgstr "%s を開くことができません" msgid "Cannot unregister events with events pending" msgstr "Cannot unregister events with events pending" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1040,7 +1072,7 @@ msgstr "" "%s\n" "これは不正なメモリーカードデータです" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1058,8 +1090,6 @@ msgstr "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgid "Cant find WiiMote by connection handle %02x" msgstr "Cant find WiiMote by connection handle %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1069,7 +1099,7 @@ msgstr "DVD_Pluginからの読み込みが不可能 - DVD-Interface: 致命的 msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "カタルーニャ語" @@ -1095,7 +1125,7 @@ msgstr "ディスクの入れ替え" msgid "Change Game" msgstr "ゲームを変更" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1113,8 +1143,8 @@ msgstr "Changes sign to zFar Parameter (after correction)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Changes sign to zNear Parameter (after correction)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "この設定は次回のゲーム開始時に反映されます！" @@ -1134,31 +1164,31 @@ msgstr "コードサーチ" msgid "Cheats Manager" msgstr "チートコード編集ツール" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "簡体字中国語" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "繁体字中国語" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "DVDルートフォルダを選択" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "NANDのあるルートフォルダを選択" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "ディスクチャンネルに表示するタイトルを選択" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "追加したいフォルダを選択" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "メモリーカードを選択" @@ -1166,7 +1196,7 @@ msgstr "メモリーカードを選択" msgid "Choose a memory card:" msgstr "メモリーカードを選択" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1174,8 +1204,8 @@ msgstr "" "apploaderとして使用するファイルを選択：(フォルダからのみ構築されたディスクに" "適用されます)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "抽出先のフォルダを選択" @@ -1187,14 +1217,14 @@ msgstr "丸み" msgid "Classic" msgstr "クラシックコントローラ" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "全消去" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "クリアに失敗" @@ -1210,6 +1240,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 @@ -1218,6 +1249,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "閉じる" @@ -1241,20 +1276,20 @@ msgstr "Command" msgid "Comment" msgstr "コメント" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "ゲーム紹介" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "このタイトルを圧縮" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "選択したISOファイルを全て圧縮" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "圧縮しています..." @@ -1281,13 +1316,13 @@ msgstr "パッド設定" msgid "Configure..." msgstr "Dolphin本体の設定を行います" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "ファイルの上書きを確認" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "動作停止時に確認" @@ -1296,7 +1331,7 @@ msgstr "動作停止時に確認" msgid "Connect" msgstr "接続" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "USBキーボードの接続をエミュレート" @@ -1353,12 +1388,12 @@ msgstr "GCIファイルに変換" msgid "Copy failed" msgstr "コピーに失敗" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "メモリーカード%cにコピー" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "コア" @@ -1388,7 +1423,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "ISOファイル %s を認識できませんでした" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "%s をセーブできませんでした" @@ -1401,7 +1436,7 @@ msgstr "" "現在パッド設定を行えません。 プレーヤーが残っているかゲームが起動中です！\n" "(ゲーム中のパッド設定は現在サポートされていません)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1414,7 +1449,7 @@ msgstr "" "DolphinをCD/DVDから起動しているか、セーブファイルが読み取り専用になっていませ" "んか？" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "拡張子'ini'に対して関連付けられているプログラムが見つかりません！" @@ -1431,7 +1466,7 @@ msgstr "" msgid "Count:" msgstr "該当：" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "発売国" @@ -1445,25 +1480,25 @@ msgstr "アクションリプレイコードを作成" msgid "Create new perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "Created by KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "Created by VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "Created by black_rider and published on ForumW.org > Web Developments" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "制作者： " @@ -1471,7 +1506,7 @@ msgstr "制作者： " msgid "Critical" msgstr "致命的なエラー" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "クロッピング" @@ -1495,7 +1530,7 @@ msgstr "クロスフェーダー" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "カレントフォルダは wxFileSelector の後に %s から %s に変更されました！" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "Custom Projection Hack" @@ -1503,11 +1538,11 @@ msgstr "Custom Projection Hack" msgid "Custom Projection Hack Settings" msgstr "Custom Projection Hack Settings" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "設定画面に入ります" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "チェコ語" @@ -1519,10 +1554,11 @@ msgstr "十字キー" msgid "DSP" msgstr "サウンド" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "DSPエミュレーション方式" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1533,18 +1569,22 @@ msgstr "DSPエミュレーション方式" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP-HLE エミュレーション (高速)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "DSP-LLE インタプリタ (低速)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "DSP-LLEを別スレッドで実行" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP-LLE リコンパイラ" @@ -1552,15 +1592,23 @@ msgstr "DSP-LLE リコンパイラ" msgid "DSP settings" msgstr "サウンドに関する設定を行います" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "DVDルート" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "データサイズ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "発売日" @@ -1581,7 +1629,7 @@ msgstr "'遊び'の調整" msgid "Debug" msgstr "デバッグ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "デバッグ用項目" @@ -1589,16 +1637,16 @@ msgstr "デバッグ用項目" msgid "Decimal" msgstr "Decimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "ISOファイルを解凍" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "選択したISOファイルを全て解凍" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "解凍中..." @@ -1606,11 +1654,11 @@ msgstr "解凍中..." msgid "Default" msgstr "既定" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "デフォルトISO" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "既定のフォント" @@ -1619,7 +1667,7 @@ msgstr "既定のフォント" msgid "Delete" msgstr "削除" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "このセーブデータを削除" @@ -1628,7 +1676,7 @@ msgstr "このセーブデータを削除" msgid "Delete the existing file '%s'?" msgstr "既存ファイル '%s' を削除しますか？" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "説明" @@ -1636,8 +1684,8 @@ msgstr "説明" msgid "Detect" 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 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 #, fuzzy msgid "" "Detected attempt to read more data from the DVD than fit inside the out " @@ -1651,8 +1699,8 @@ msgstr "" msgid "Device" msgstr "デバイス" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "デバイス設定" @@ -1677,23 +1725,23 @@ msgstr "" "ディレクトリバックアップのチェックサムにも失敗" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "無効化" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "Disable Fog" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "Disable Lighting" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "Disable Per-Pixel Depth" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "テクスチャ無効化" @@ -1736,7 +1784,7 @@ msgstr "" "\n" "よく分からなければ、チェックを入れないでください。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Disc" @@ -1763,6 +1811,7 @@ msgstr "" msgid "Divide" msgstr "Divide" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1772,10 +1821,13 @@ msgstr "Divide" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "動作中のゲームを停止しますか？" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1800,6 +1852,7 @@ msgstr "Wii リモコンのエミュレーション設定" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1824,6 +1877,14 @@ msgstr "GCコントローラ設定" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "GCコントローラ設定" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS ムービー (*.dtm)" @@ -1856,11 +1917,11 @@ msgstr "" msgid "Down" msgstr "Down" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "チートコードをダウンロード (WiiRD Database)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "%lu個のコードが見つかりました。( 新規追加： %lu個 )" @@ -1869,23 +1930,23 @@ msgstr "%lu個のコードが見つかりました。( 新規追加： %lu個 )" msgid "Drums" msgstr "ドラムコントローラ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "ダミーデバイス" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "サウンドのダンプ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "EFBターゲットをダンプ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "フレームをダンプ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "テクスチャをダンプ" @@ -1920,6 +1981,7 @@ msgstr "" "\n" "よく分からなければ、チェックを入れないでください。" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1935,6 +1997,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "オランダ語" @@ -1958,7 +2025,7 @@ msgstr "" "Dolphinのバージョンを更新した場合は、ドライバを認識させるためにWindowsの再起" "動が必要になるかもしれません。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "欧州" @@ -1974,7 +2041,7 @@ msgstr "編集" msgid "Edit ActionReplay Code" msgstr "コードを編集" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "iniを編集" @@ -1986,8 +2053,8 @@ msgstr "パッチを編集" msgid "Edit current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "編集" @@ -2038,7 +2105,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Wii リモコンをエミュレート" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "動作状況：" @@ -2066,23 +2133,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "アクションリプレイコードのログを取得する" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "Enable Audio Throttle" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "Enable BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Enable Block Merging" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -2095,6 +2162,7 @@ msgstr "" msgid "Enable Cache" msgstr "Enable Cache" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2104,51 +2172,54 @@ msgstr "Enable Cache" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "チートコードを有効化" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "Enable DTK Music" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Enable Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "デュアルコア動作を行う (速度向上)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "ホットキーを使用" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Enable Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "アイドルスキップ処理を行う (速度向上)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Enable MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "プログレッシブ表示を有効化" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "スクリーンセーバーを有効化" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "Enable WideScreen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "ワイヤーフレーム有効化" @@ -2166,7 +2237,7 @@ msgstr "" "\n" "よく分からなければ、【1x】を選択してください。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2174,7 +2245,7 @@ msgstr "" "ディスクの読み取り速度を向上させます。必要になるタイトルはわずかです [有効＝" "ロード時間短縮／無効＝互換性・安定性重視]" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "ページ分けして表示" @@ -2201,7 +2272,7 @@ msgstr "" "\n" "よく分からなければ、チェックを入れないでください。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2209,7 +2280,7 @@ msgstr "" "トワイライトプリンセスにおいて、広大なエリアで発生するFPS低下を抑えます。他の" "タイトルでは無効にしてください" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2219,7 +2290,7 @@ msgstr "" "ハードウェアのエミュレーション精度が向上します[有効＝互換性重視,／無効＝動作" "速度向上]" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "Enables Custom Projection Hack" @@ -2235,7 +2306,7 @@ msgstr "" "\n" "よく分からなければ、チェックを入れないでください。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2257,6 +2328,7 @@ msgstr "" msgid "End" msgstr "End" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2272,6 +2344,11 @@ msgstr "End" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "英語" @@ -2302,6 +2379,7 @@ msgstr "に一致する" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "エラー" @@ -2332,19 +2410,25 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "エラー" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: 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 +#: Source/Core/Common/Src/ChunkFile.h:194 #, 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 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2378,7 +2462,7 @@ msgstr "Dolphinを終了" msgid "Export Failed" msgstr "エクスポートに失敗" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "ファイルを抽出" @@ -2391,15 +2475,15 @@ msgstr "録画ファイルのエクスポート" msgid "Export Recording..." msgstr "録画ファイルのエクスポート" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "セーブデータをエクスポート" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "セーブデータをエクスポート (実験的)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "全てのセーブデータをエクスポート" @@ -2415,7 +2499,7 @@ msgstr "セーブデータのエクスポート先を選択" msgid "Extension" msgstr "拡張コントローラ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "External Frame Buffer (外部フレームバッファ)" @@ -2427,44 +2511,44 @@ msgstr "特殊パラメータ" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "『メトロイド Other M』のみに有効な設定です" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "全てのファイルを抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "Apploaderを抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "DOLを抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "このフォルダを抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "このファイルを抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "この Partition を抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "%s を抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "全てのファイルをエクスポート" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "フォルダをエクスポート" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "抽出中" @@ -2476,11 +2560,11 @@ msgstr "FIFO バイト" msgid "FIFO Player" msgstr "FIFO プレーヤー" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "フランス" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "FSTサイズ" @@ -2492,11 +2576,11 @@ msgstr "接続に失敗！" msgid "Failed to Listen!!" msgstr "Listenに失敗！" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "見つかりません" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "%s への抽出に失敗" @@ -2613,18 +2697,28 @@ msgstr "Failed to write header for %s" msgid "Failed to write header for file %d" msgstr "Failed to write header for file %d" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "Fast" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "Fast Mipmaps" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "高速なMMUを使用します。全てのゲームでうまく動くわけではありません" +#: Source/Core/Core/Src/Movie.cpp:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "FIFO プレーヤー" @@ -2633,7 +2727,7 @@ msgstr "FIFO プレーヤー" msgid "File Info" msgstr "ファイル情報" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "コードを含まないファイルです" @@ -2666,16 +2760,16 @@ msgstr "このファイルはメモリーカードとして認識されません msgid "File not compressed" msgstr "圧縮されていないファイル" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Unknown open mode : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "構造" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr " 'ini' は不明な拡張子です。開くことができません！" @@ -2683,7 +2777,7 @@ msgstr " 'ini' は不明な拡張子です。開くことができません！" msgid "First Block" msgstr "ブロック開始位置" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "チェックサムを修正" @@ -2695,7 +2789,7 @@ msgstr "Force 16:9" msgid "Force 4:3" msgstr "Force 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "コンソールを日本向け (NTSC-J) に設定" @@ -2729,7 +2823,7 @@ msgstr "" "\n" "よく分からなければ、チェックを入れないでください。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2766,7 +2860,7 @@ msgstr "フレーム" msgid "Frame Advance" msgstr "Frame Advance" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "FFV1を使用してフレームをダンプ" @@ -2778,7 +2872,7 @@ msgstr "フレームの範囲" msgid "Frame S&kipping" msgstr "フレームスキップ(&K)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "フレームリミット：" @@ -2786,10 +2880,11 @@ msgstr "フレームリミット：" msgid "Frames To Record" msgstr "録画フレーム数設定" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "フリールック" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2805,6 +2900,11 @@ msgstr "フリールック" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "フランス語" @@ -2838,7 +2938,7 @@ msgstr "ログの設定" msgid "GCPad" msgstr "入力(GC)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "ゲームID" @@ -2854,15 +2954,15 @@ msgstr "ゲームが起動していません！" msgid "Game not found!!" msgstr "ゲームが見つかりません！" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "固有設定" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "ゲーム設定" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "ゲームキューブ" @@ -2873,6 +2973,7 @@ msgstr "ゲームキューブ入力設定(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2880,6 +2981,9 @@ msgstr "ゲームキューブ入力設定(&P)" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "メモリーカードファイル (*.raw,*.gcp)|*.raw;*.gcp" @@ -2888,15 +2992,17 @@ msgid "Gamecube Pad settings" msgstr "ゲームキューブの入力設定を行います" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Geckoコード" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" "Geckoコードの実行に失敗 (CT%i CST%i) (%s)\n" "(コードに問題があるか、まだサポートされていないタイプのコードです)" @@ -2911,8 +3017,12 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "一般" @@ -2921,6 +3031,7 @@ msgstr "一般" msgid "General Settings" msgstr "一般" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2936,6 +3047,11 @@ msgstr "一般" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "ドイツ語" @@ -2980,7 +3096,7 @@ msgstr "" "動作速度は少々低下し、まれに描画バグの原因にもなることもあります。\n" "よく分からなければ、チェックを外さないでください。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "ギリシア語" @@ -3012,7 +3128,7 @@ msgstr "高速化(Hacks)" msgid "Header checksum failed" msgstr "ヘッダのチェックサムに失敗" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "ヘブライ語" @@ -3077,6 +3193,7 @@ msgstr "ホットキーの設定" <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:570 @@ -3085,10 +3202,13 @@ msgstr "ホットキーの設定" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "ホットキー" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "ハンガリー語" @@ -3096,12 +3216,12 @@ msgstr "ハンガリー語" msgid "Hybrid Wiimote" msgstr "Hybrid Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -3114,11 +3234,11 @@ msgstr "" "TitleID %016llx.\n" " Dolphin will likely hang now" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - bad destination" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "IPL設定" @@ -3134,15 +3254,15 @@ msgstr "IR ポインタ" msgid "IR Sensitivity:" msgstr "感度" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "ゲームの詳細" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "フォルダ一覧" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "イタリア" @@ -3150,22 +3270,24 @@ msgstr "イタリア" msgid "Icon" msgstr "アイコン" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "FPSが安定しないゲームで効果があります [有効＝互換性向上／無効＝動作速度向上]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy 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." +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " +"Audio to throttle using the DSP (might fix audio clicks but can also cause " +"constant noise depending on the game)." msgstr "" "実機(NTSC:60／PAL:50)より高いFPSで制限をかける場合、サウンド設定で「Audio " "Throttle」を無効にしないと効果が現れません" @@ -3202,7 +3324,7 @@ msgstr "" "\n" "よく分からなければ、チェックを入れないでください。" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "セーブデータをインポート" @@ -3255,7 +3377,7 @@ msgstr "" "\n" "よく分からなければ、チェックを入れないでください。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "ソコソコ" @@ -3264,7 +3386,7 @@ msgid "In-Game" msgstr "ゲーム内" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "情報" @@ -3284,7 +3406,7 @@ msgstr "Insert" msgid "Insert Encrypted or Decrypted code here..." msgstr "ここに暗号化or復号化されたコードを貼り付けてください" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "SDカードの挿入をエミュレート" @@ -3296,7 +3418,7 @@ msgstr "コード名を入力してください" msgid "Install WAD" msgstr "WiiメニューにWADファイルを追加" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Wiiメニューにインストール" @@ -3307,6 +3429,7 @@ msgstr "" "InstallExceptionHandler が呼び出されましたが、このプラットフォームはまだサ" "ポートされていません" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3316,14 +3439,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "WADファイルを追加しています..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "表示" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "Dolphinの表示に関する設定" @@ -3348,11 +3474,11 @@ msgstr "Internal LZO Error - lzo_init() failed" msgid "Internal Resolution:" msgstr "内部解像度の変更：" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "インタプリタ (非推奨)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "イントロ" @@ -3369,7 +3495,7 @@ msgstr "無効な値です！" msgid "Invalid bat.map or dir entry" msgstr "Invalid bat.map or dir entry" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "Invalid event type %i" @@ -3389,14 +3515,15 @@ msgstr "" "%s\n" " このゲームをダンプしなおしてください" -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "不正な録画ファイル" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "不正なセーブ／ロードファイル" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3412,27 +3539,32 @@ msgstr "不正なセーブ／ロードファイル" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "イタリア語" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "日本" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT リコンパイラ (推奨)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL リコンパイラ (実験的)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "日本語" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "韓国" @@ -3441,8 +3573,8 @@ msgstr "韓国" msgid "Key" msgstr "キー設定" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "韓国語" @@ -3460,7 +3592,7 @@ msgstr "Lボタン" msgid "L-Analog" msgstr "L (半押し)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "GUI言語：" @@ -3513,7 +3645,7 @@ msgstr "" msgid "Less Than" msgstr "より小さい" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "FPSによる制限を有効化" @@ -3521,7 +3653,7 @@ msgstr "FPSによる制限を有効化" msgid "Load" msgstr "読込" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "カスタムテクスチャを読み込む" @@ -3569,6 +3701,7 @@ msgstr "ステートロード - スロット 8" msgid "Load State..." msgstr "ファイルからロード" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3590,6 +3723,13 @@ msgstr "Wiiメニューを起動" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "Wiiメニューを起動" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wiiメニューを起動 ( バージョン：%d %c )" @@ -3617,7 +3757,7 @@ msgstr "規定されたファイル (DOL,ELF,GCM,ISO,WAD)" msgid "Local" msgstr "ローカル" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "スレッドをコア数に合わせて固定" @@ -3629,11 +3769,11 @@ msgstr "ログ" msgid "Log Configuration" msgstr "ログの設定" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "表示するログ情報" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "ログ出力先" @@ -3663,7 +3803,7 @@ msgstr "" "MD5の不整合\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU Speed Hack" @@ -3685,11 +3825,11 @@ msgstr "MadCatz Gameshark セーブファイル(*.gcs)" msgid "Main Stick" msgstr "コントロールスティック" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "メーカーID" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "メーカー" @@ -3713,6 +3853,7 @@ msgstr "メモリバイト" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3720,6 +3861,9 @@ msgstr "メモリバイト" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "メモリーカード" @@ -3754,7 +3898,7 @@ msgstr "メモリカードのファイルサイズが、ヘッダのサイズに msgid "Menu" msgstr "メニュー" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "マイク" @@ -3763,11 +3907,11 @@ msgstr "マイク" msgid "Min" msgstr "最小" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "その他" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "その他の設定" @@ -3788,7 +3932,7 @@ msgstr "" "\n" "よく分からなければ、チェックを入れないでください。" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "等幅フォント" @@ -3801,7 +3945,7 @@ msgstr "モーションプラス" msgid "Motor" msgstr "モーター" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3823,7 +3967,7 @@ msgstr "" msgid "Multiply" msgstr "Multiply" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3915,6 +4059,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3924,6 +4069,9 @@ msgstr "NP Up" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3932,7 +4080,7 @@ msgstr "名前" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "名前： " @@ -3946,7 +4094,7 @@ msgid "New Scan" msgstr "新規検索" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "次のページ" @@ -3958,7 +4106,7 @@ msgstr "続けて検索" msgid "Nickname :" msgstr "ニックネーム：" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "No Country (SDK)" @@ -3997,7 +4145,7 @@ msgstr "%s のセーブフォルダがありません" msgid "None" msgstr "なし" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "ノルウェー語" @@ -4005,8 +4153,8 @@ msgstr "ノルウェー語" msgid "Not Equal" msgstr "に一致しない" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "未確認" @@ -4026,7 +4174,7 @@ msgstr "未接続" msgid "Notes" msgstr "ノート" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "補足： " @@ -4064,7 +4212,7 @@ msgstr "オブジェクト" msgid "Object Range" msgstr "オブジェクトの範囲" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "オフ" @@ -4090,11 +4238,11 @@ msgstr "残り %d ブロックしかありません！" msgid "Open" msgstr "開く" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "実体のあるフォルダを開く(&C)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "セーブデータのあるフォルダを開く(&S)" @@ -4116,11 +4264,11 @@ msgstr "OpenAL: サウンドデバイスが見つかりません" msgid "OpenAL: can't open device %s" msgstr "OpenAL: デバイス %s が開けません" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "OpenCL Texture Decoder" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "OpenMP Texture Decoder" @@ -4152,7 +4300,7 @@ msgstr "" "新しいメモリーカードにセーブデータを移行してください\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "その他" @@ -4204,19 +4352,20 @@ msgstr "Paragraph" msgid "Parameters" msgstr "パラメータ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "パーティション %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "パッチ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "フォルダ" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4229,6 +4378,10 @@ msgstr "フォルダ" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "一時停止" @@ -4237,7 +4390,7 @@ msgstr "一時停止" msgid "Per-Pixel Lighting" msgstr "Per-Pixel Lighting" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "カンペキ！" @@ -4250,6 +4403,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -4260,6 +4414,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "開始" @@ -4273,7 +4431,7 @@ msgstr "録画ファイルを再生" msgid "Play/Pause" msgstr "開始／一時停止" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "サクサク" @@ -4285,6 +4443,7 @@ msgstr "再生オプション" msgid "Players" msgstr "プレイヤー一覧" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4294,6 +4453,9 @@ msgstr "プレイヤー一覧" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "確認" @@ -4305,23 +4467,23 @@ msgstr "" msgid "Plus-Minus" msgstr "Plus-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "ポーランド語" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "ポート 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "ポート 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "ポート 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "ポート 4" @@ -4330,11 +4492,11 @@ msgstr "ポート 4" msgid "Port :" msgstr "ポート:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "ポルトガル語" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "ブラジル語" @@ -4342,17 +4504,17 @@ msgstr "ブラジル語" msgid "Post-Processing Effect:" msgstr "Post-Processing Effect:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4365,7 +4527,7 @@ msgstr "プリセット：" msgid "Prev Page" msgstr "前のページ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "前のページ" @@ -4416,7 +4578,7 @@ msgstr "R (半押し)" msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "ロシア" @@ -4429,7 +4591,7 @@ msgstr "強さ" msgid "Read-only mode" msgstr "読み込み専用 有効／無効" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "Real" @@ -4505,6 +4667,7 @@ msgstr "ゲームリストを再更新" msgid "Refresh game list" msgstr "ゲームリストを再更新します" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4523,6 +4686,12 @@ msgstr "ゲームリストを再更新します" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "削除" @@ -4575,11 +4744,11 @@ msgstr "右スティック" msgid "Rumble" msgstr "振動" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "DSP-LLEの処理を別スレッドに分離して行います (非推奨)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "ロシア語" @@ -4587,10 +4756,11 @@ msgstr "ロシア語" msgid "Sa&ve State" msgstr "ステートセーブ(&V)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "Safe" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4600,6 +4770,9 @@ msgstr "Safe" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "サンプルレート" @@ -4657,12 +4830,12 @@ msgstr "ステートセーブ - スロット 8" msgid "Save State..." msgstr "ファイルとして保存" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "ファイルとして保存" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "圧縮するタイトルの保存先を選択" @@ -4670,11 +4843,11 @@ msgstr "圧縮するタイトルの保存先を選択" msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "解凍するタイトルの保存先を選択" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, fuzzy, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Savestate movie %s の破損を確認しました。録画を中止しています..." @@ -4683,6 +4856,7 @@ msgstr "Savestate movie %s の破損を確認しました。録画を中止し msgid "Scaled EFB Copy" msgstr "Scaled EFB Copy" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4692,15 +4866,18 @@ msgstr "Scaled EFB Copy" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "確認中... .%s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "確認中..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "確認中..." @@ -4716,12 +4893,12 @@ msgstr "Scroll Lock" msgid "Search Filter" msgstr "フィルタリング" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 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:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "Section %s not found in SYSCONF" @@ -4731,6 +4908,7 @@ msgstr "Section %s not found in SYSCONF" msgid "Select" msgstr "選択" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4755,6 +4933,14 @@ msgstr "録画ファイルを選択" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "録画ファイルを選択" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "追加するWADファイルを選択" @@ -4780,16 +4966,21 @@ msgstr "" msgid "Select the file to load" msgstr "ロードするファイルを選択" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "セーブファイルを選択" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "ロードするステートセーブファイルを選択" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 @@ -4809,6 +5000,9 @@ msgstr "ロードするステートセーブファイルを選択" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "ステートセーブの保存先を選択" @@ -4830,7 +5024,7 @@ msgstr "" "\n" "よく分からなければ、【自動】を選択してください。" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "選択したフォント" @@ -4878,11 +5072,11 @@ msgstr "センサーバーの位置" msgid "Separator" msgstr "Separator" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "セルビア語" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "シリアルポート：ブロードバンドアダプタなどのデバイスが接続できます" @@ -4891,11 +5085,11 @@ msgstr "シリアルポート：ブロードバンドアダプタなどのデバ msgid "Set" msgstr "適用" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "Wiiメニュー(ディスクチャンネル)に表示(&D)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "メモリーカード%cを既定として設定" @@ -4907,7 +5101,7 @@ msgstr "" "SetARCode_IsActive: インデックスのサイズがコードリストのサイズを上回っていま" "す %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "設定" @@ -4919,7 +5113,7 @@ msgstr "SetupWiiMem: 設定ファイルが見つかりません" msgid "Shake" msgstr "シェイク" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "通称" @@ -4947,7 +5141,7 @@ msgstr "ツールバー(&T)" msgid "Show Drives" msgstr "DVDドライブ内のソフトを表示" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "Show EFB Copy Regions" @@ -4963,7 +5157,7 @@ msgstr "フランス" msgid "Show GameCube" msgstr "ゲームキューブ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "キー入力を表示" @@ -4979,7 +5173,7 @@ msgstr "日本" msgid "Show Korea" msgstr "韓国" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "次の言語で表示" @@ -4999,7 +5193,7 @@ msgstr "特定機種のソフトだけを表示" msgid "Show Regions" msgstr "特定リージョンのソフトだけを表示" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "統計情報を表示" @@ -5019,11 +5213,11 @@ msgstr "WAD(Wii ウェア)" msgid "Show Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "ゲーム停止前に確認ウィンドウが表示されるようになります" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 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 " @@ -5033,23 +5227,23 @@ msgstr "" "無効にすると致命的でないエラーをプレイ中に表示させずにすみますが、クラッシュ" "時にエラー表示なしに突然強制終了されるようになります" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "ブロック開始位置を表示" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "ブロック数を表示" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "コメントを表示" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "アイコンを表示" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "タイトルを表示" @@ -5087,7 +5281,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "横持ち(Sideways)で使用" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "簡体字中国語" @@ -5095,11 +5289,11 @@ msgstr "簡体字中国語" msgid "Size" msgstr "サイズ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "BIOSをスキップ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "Skip Dest. Alpha Pass" @@ -5142,11 +5336,11 @@ msgstr "" msgid "Slot %i" msgstr "スロット %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "スロットA" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "スロットB" @@ -5169,7 +5363,7 @@ msgstr "" "デバッグ用途としてのみ便利なものです。\n" "それでも使用しますか？よく分からなければ、選択しないでください。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "サウンド設定" @@ -5187,6 +5381,7 @@ msgstr "Sound buffer creation failed: %s" msgid "Space" msgstr "Space" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5202,6 +5397,11 @@ msgstr "Space" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "スペイン語" @@ -5233,7 +5433,7 @@ msgstr "" msgid "Specify a video backend" msgstr "ビデオ出力APIを指定" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Speed up Disc Transfer Rate" @@ -5241,7 +5441,7 @@ msgstr "Speed up Disc Transfer Rate" msgid "Square Stick" msgstr "丸み" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "標準コントローラ" @@ -5339,12 +5539,12 @@ msgstr "セーブファイルのインポートに成功" msgid "Swing" msgstr "動き" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "システムの言語：" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "台湾" @@ -5383,7 +5583,7 @@ msgstr "右テーブル" msgid "Take Screenshot" msgstr "スクリーンショット" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -5399,7 +5599,7 @@ msgstr "Texture" msgid "Texture Cache" msgstr "Texture Cache" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "テクスチャフォーマット情報表示" @@ -5415,13 +5615,13 @@ msgstr "無効なアドレスです" msgid "The checksum was successfully fixed" msgstr "チェックサムの修正に成功しました" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "選択したフォルダはすでにリストに存在します！" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5445,7 +5645,7 @@ msgid "The file %s was already open, the file header will not be written." msgstr "" "ファイル %s は既に開かれているため、ファイルヘッダーは書き込まれません。" -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "指定したファイル (%s) は存在しません" @@ -5463,11 +5663,12 @@ msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "復号化しましたが、このコードには一つも行が含まれていません。" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#, fuzzy msgid "" "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." +"If unsure, use the rightmost value." msgstr "" "このスライダをSafe側に設定しておくと、RAMからのテクスチャ更新に 失敗しにくく" "なります。\n" @@ -5511,7 +5712,7 @@ msgstr "指定されたファイル \"%s\" は存在しません" msgid "The value is invalid" msgstr "無効な値です" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "テーマ" @@ -5519,14 +5720,14 @@ msgstr "テーマ" msgid "Theme selection went wrong" msgstr "テーマの選択に誤りがあります" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." msgstr "" "00000001/00000002のチケットが必要です。おそらく不完全なNANDダンプです。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5545,7 +5746,7 @@ msgstr "" "このアクションリプレイシミュレータは、アクションリプレイそのものを変更する" "コードはサポートしていません。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "" "有効にしているとWiiメニューやいくつかのタイトルで動作速度が低下する場合があり" @@ -5571,26 +5772,10 @@ msgstr "" "よく分からなければ、チェックを入れないでください。" #: 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" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" -"有効にしている間はサウンドスロットルによってゲームスピードがコントロールされ" -"るようになります\n" -"無効にするとゲームスピードが異常に速くなってしまうでしょう\n" -"有効中には時々、一定のノイズが流れることがあるようです\n" -"\n" -"ノート：ゲーム中、キーを押し続けている間だけこのオプションを無効にするこ" -"とができます。" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "BGMのような音楽トラックの再生に使用されます" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5601,7 +5786,7 @@ msgstr "" "有効にすると動作速度が大きく向上しますが、クラッシュやバグの原因になる場合も" "あります" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "このゲームの設定をテキストで編集します" @@ -5624,7 +5809,7 @@ msgstr "タイトル" msgid "To" msgstr "終了" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "全てのログ情報を選択／解除" @@ -5644,6 +5829,7 @@ msgstr "フルスクリーン表示切り替え" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5651,14 +5837,17 @@ msgstr "フルスクリーン表示切り替え" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "上部" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "繁体字中国語" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "不明なファイルタイプを読み込もうとしました" @@ -5666,7 +5855,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:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Trying to read from invalid SYSCONF" @@ -5678,7 +5867,7 @@ msgstr "" "Trying to read from invalid SYSCONF\n" "Wiimote bt ids are not available" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "トルコ語" @@ -5699,11 +5888,11 @@ msgstr "UDPポート:" msgid "UDP Wiimote" msgstr "UDPで接続" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "不明" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "アメリカ合衆国" @@ -5788,7 +5977,7 @@ msgstr "再取得" msgid "Upright Wiimote" msgstr "直立状態(Upright)で使用" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 (PAL60) モードを使用" @@ -5800,7 +5989,7 @@ msgstr "フルスクリーンで表示" msgid "Use Hex" msgstr "16進" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "パニックハンドラを使用" @@ -5831,7 +6020,7 @@ msgstr "" "\n" "よく分からなければ、チェックを入れないでください。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "ユーティリティ" @@ -5855,25 +6044,29 @@ msgstr "値：" msgid "Verbosity" msgstr "Verbosityモード" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "描画" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Virtual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "音量" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "WADのインストールに失敗: %s 作成エラー" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "WADのインストールに失敗: %s 作成エラー" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5893,15 +6086,15 @@ msgstr "" msgid "Warning" msgstr "警告" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "警告 - 誤ったモードでDOLが起動されています！" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "警告 - 誤ったモードでELFが起動されています！" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "警告 - 誤ったモードでISOが起動されています！" @@ -5929,7 +6122,7 @@ msgstr "" "ファイル名はメモリーカード上の名前と同じになります\n" "続けますか？" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5937,7 +6130,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5945,7 +6138,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5973,7 +6166,7 @@ msgstr "WaveFileWriter - ファイルが開かれていません" msgid "Whammy" msgstr "ワーミー" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "疑似ワイドスクリーン化" @@ -5981,15 +6174,15 @@ msgstr "疑似ワイドスクリーン化" msgid "Width" msgstr "範囲(横)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Wii コンソール" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Wii NANDルート" @@ -5997,6 +6190,7 @@ msgstr "Wii NANDルート" msgid "Wii Save Import" msgstr "Wiiのセーブデータをインポート" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -6006,6 +6200,9 @@ msgstr "Wiiのセーブデータをインポート" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wiiセーブデータ (*.bin)|*.bin" @@ -6072,10 +6269,11 @@ msgstr "Windows Menu" msgid "Windows Right" msgstr "Windows Right" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "ワードラップ" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -6091,6 +6289,11 @@ msgstr "ワードラップ" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "動作中..." @@ -6098,6 +6301,11 @@ msgstr "動作中..." msgid "Write to Console" msgstr "コンソールに出力" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "ファイルに出力" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "ファイルに出力" @@ -6153,7 +6361,7 @@ msgstr "10進数・16進数・8進数いずれかの有効な値を入力して msgid "You must enter a valid profile name." msgstr "有効なプロファイル名を入力してください" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "変更を有効にするにはDolphinを再起動してください" @@ -6176,7 +6384,7 @@ msgstr "" "正しくは 0x%04x (このファイルは 0x%04llx)\n" "新しく作成しますか？" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "ZTP hack" @@ -6246,7 +6454,7 @@ msgstr "" msgid "^ ADD" msgstr "^ (...に加えて)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -6278,12 +6486,12 @@ msgstr "" msgid "s" msgstr "　" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "unknown cmd 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute returned -1 on application run!" @@ -6501,6 +6709,9 @@ msgstr "| (...もしくは)" #~ msgid "Emulator Display Settings" #~ msgstr "エミュレーション画面に関する設定" +#~ msgid "Enable Audio Throttle" +#~ msgstr "Enable Audio Throttle" + #~ msgid "Enable CPU Access" #~ msgstr "Enable CPU Access" @@ -6785,6 +6996,21 @@ msgstr "| (...もしくは)" #~ msgid "Take Screenshot\t" #~ msgstr "スクリーンショット\t" +#~ msgid "" +#~ "This is used to control game speed by sound throttle.\n" +#~ "Disabling this could cause abnormal game speed, such as too fast.\n" +#~ "But sometimes enabling this could cause constant noise.\n" +#~ "\n" +#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." +#~ msgstr "" +#~ "有効にしている間はサウンドスロットルによってゲームスピードがコントロールさ" +#~ "れるようになります\n" +#~ "無効にするとゲームスピードが異常に速くなってしまうでしょう\n" +#~ "有効中には時々、一定のノイズが流れることがあるようです\n" +#~ "\n" +#~ "ノート：ゲーム中、キーを押し続けている間だけこのオプションを無効にす" +#~ "ることができます。" + #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "音声や効果音の再生によく使用されます" <<<<<<< HEAD diff --git a/Languages/po/ko.po b/Languages/po/ko.po index f756486f36..338b22dab0 100644 --- a/Languages/po/ko.po +++ b/Languages/po/ko.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" <<<<<<< HEAD ======= @@ -19,6 +20,9 @@ msgstr "" >>>>>>> Update from master branch. "PO-Revision-Date: 2011-07-07 10:24+0900\n" ======= +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2012-01-19 11:47+0900\n" >>>>>>> Update Korean translations. "Last-Translator: \n" @@ -62,9 +66,9 @@ msgstr "\"%s\"는 비적합 GCM/ISO 파일임, 혹은 GC/Wii ISO가 아님." msgid "%1$sCopy%1$s" msgstr "%1$s복사%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -158,7 +162,7 @@ msgstr "%sGCI 내보내기%s" msgid "%sImport GCI%s" msgstr "%sGCI 가져오기%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u 빈 블럭; %u 빈 디렉토리 엔트리" @@ -191,11 +195,11 @@ msgstr "치트 매니저(&C)" msgid "&DSP Settings" msgstr "오디오 설정(&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "ISO 삭제(&D)..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "선택된 ISO들 삭제(&D)..." @@ -259,7 +263,7 @@ msgstr "일시정지(&P)" msgid "&Play" msgstr "실행(&P)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "속성(&P)" @@ -303,7 +307,7 @@ msgstr "보기(&V)" msgid "&Wiimote Settings" msgstr "위모트 설정(&W)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "위키(&W)" @@ -347,7 +351,7 @@ msgstr "<여기에 이름을 넣으세요>" msgid "" msgstr "<발견된 해상도가 없음>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "<없음>" @@ -356,7 +360,7 @@ msgstr "<없음>" msgid "" msgstr "<키를 누르세요>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "<시스템>" @@ -412,13 +416,13 @@ msgstr "" "\n" "TCP 포트를 호스트에 전달해야합니다!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "AM-기반보드" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "AR 코드" @@ -430,11 +434,11 @@ msgstr "돌핀에 대해" msgid "Acceleration" msgstr "가속" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "정확성:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "정확한 VBeam 에뮬레이션" @@ -550,11 +554,11 @@ msgstr "어댑터:" msgid "Add" msgstr "추가" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "액션리플레이 코드 추가" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "패치 추가" @@ -562,6 +566,7 @@ msgstr "패치 추가" msgid "Add new pane" msgstr "새로운 창 추가" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -577,6 +582,11 @@ msgstr "새로운 창 추가" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "추가..." @@ -624,11 +634,11 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "버튼들 활성화에 필요한 아날로그 컨트롤 압력을 조정하세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "고급" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "고급 설정" @@ -636,14 +646,15 @@ msgstr "고급 설정" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "모든 GC/Wii 파일들 (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "모든 GC/Wii 이미지들 (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "모든 게임큐브 GCM 파일들 (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -656,18 +667,22 @@ msgstr "모든 게임큐브 GCM 파일들 (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "모든 상태들 저장 (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "모든 Wii ISO 파일들 (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "모든 압축된 GC/Wii ISO 파일들 (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "모든 파일 (*.*)|*.*" @@ -683,7 +698,7 @@ msgstr "" "\n" "확신 없으면, 이것을 언체크로 두세요." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Alternate Wiimote Timing" msgstr "위모트 타이밍 대안" @@ -703,7 +718,7 @@ msgstr "앱로더가 잘못된 크기임... 정말 앱로더입니까?" msgid "Apploader unable to load from file" msgstr "앱로더가 파일로 부터 로드할 수 없음" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "앱로더:" @@ -721,7 +736,7 @@ msgstr "" "\n" "확신 없으면, (끄기)를 선택하세요." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "아랍어" @@ -730,7 +745,7 @@ msgstr "아랍어" msgid "Are you sure you want to delete \"%s\"?" msgstr "\"%s\" 를 정말로 지우고 싶습니까?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -738,10 +753,11 @@ msgstr "" "이 파일들을 정말로 지우고 싶습니까?\n" "그것들은 영원히 사라집니다!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "이 파일을 정말로 지우고 싶습니까? 그것은 영원히 사라집니다!" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -751,6 +767,9 @@ msgstr "이 파일을 정말로 지우고 싶습니까? 그것은 영원히 사 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "종횡비:" @@ -759,18 +778,20 @@ msgstr "종횡비:" msgid "At least one pane must remain open." msgstr "적어도 하나의 창이 열려 있어야합니다." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "오디오" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "오디오 백엔드:" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: AO 장치를 열기 에러.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -780,6 +801,9 @@ msgstr "AudioCommon: AO 장치를 열기 에러.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "자동" @@ -822,7 +846,7 @@ msgstr "" msgid "Back" msgstr "뒤로" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "백엔드 설정" @@ -849,11 +873,11 @@ msgstr "배드 파일 헤더" msgid "Banner" msgstr " 배너" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "배너 세부사항" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "배너:" @@ -865,7 +889,7 @@ msgstr "바" msgid "Basic" msgstr "기본" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "기본 설정" @@ -896,6 +920,7 @@ msgstr "파랑 오른쪽" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -903,6 +928,9 @@ msgstr "파랑 오른쪽" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "아래" @@ -911,7 +939,7 @@ msgstr "아래" msgid "Bound Controls: %lu" msgstr "바운드 컨트롤들: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "고장남" @@ -927,7 +955,7 @@ msgstr "추가할 디렉토리 둘러보기" msgid "Browse for an ISO directory..." msgstr "ISO 디렉토리 불러오기..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "출력 디렉토리 둘러보기" @@ -957,11 +985,11 @@ msgstr "C 스틱" msgid "C-Stick" msgstr "C-스틱" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "CPU 에뮬레이터 엔진" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "화면표시 목록 캐쉬" @@ -1010,7 +1038,7 @@ msgstr "%s를 열수 없음" msgid "Cannot unregister events with events pending" msgstr "이벤트들 미해결을 지닌 이벤트들을 등록하지 않을 수 없음" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1021,7 +1049,7 @@ msgstr "" "%s\n" "는 유효한 게임큐브 메모리 카드 파일이 아닙니다" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1039,8 +1067,6 @@ msgstr "bd: %02x:%02x:%02x:%02x:%02x:%02x 에 의해 위모트를 찾을 수 없 msgid "Cant find WiiMote by connection handle %02x" msgstr "%02x 연결핸들에 의해 위모트를 찾을 수 없음." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1050,7 +1076,7 @@ msgstr "DVD_플러그인에서 읽을 수 없음 - DVD-인터페이스: 치명 msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "카탈로니아어" @@ -1075,7 +1101,7 @@ msgstr "디스크 변경" msgid "Change Game" msgstr "게임 변경" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1091,8 +1117,8 @@ msgstr "표시를 z원거리 파라미터로 변경 (정정 후에)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "표시를 z근거리 파라미터로 변경 (정정 후에)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "에뮬레이터가 작동하고 있는 동안에 이 변경은 효과가 없을 겁니다!" @@ -1112,31 +1138,31 @@ msgstr "치트 찾기" msgid "Cheats Manager" msgstr "치트들 관리자" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "중국어 (간소화)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "중국어 (전통)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "DVD 루트 디렉토리 선택:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "NAND 루트 디렉토리 선택:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "디폴트 ISO 선택:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "추가할 디렉토리 선택" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "열려는 파일 선택" @@ -1144,15 +1170,15 @@ msgstr "열려는 파일 선택" msgid "Choose a memory card:" msgstr "메모리 카드 선택:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 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 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "압축해제할 폴더를 선택" @@ -1164,14 +1190,14 @@ msgstr "서클 스틱" msgid "Classic" msgstr "클래식" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "깨끗이" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "청소 실패했습니다." @@ -1187,6 +1213,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 @@ -1195,6 +1222,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "닫기" @@ -1218,20 +1249,20 @@ msgstr "명령" msgid "Comment" msgstr "주석" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "주석:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "ISO 압축..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "선택된 ISO들 압축..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "ISO 압축하기" @@ -1258,13 +1289,13 @@ msgstr "패드들 설정" msgid "Configure..." msgstr "환경설정..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "파일 덮어쓰기 확정" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "중지시 확인" @@ -1273,7 +1304,7 @@ msgstr "중지시 확인" msgid "Connect" msgstr "연결" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "USB 키보드 연결" @@ -1330,12 +1361,12 @@ msgstr "GCI 로 변환" msgid "Copy failed" msgstr "복사 실패했습니다" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "메모리카드 %c 에 복사" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "코어" @@ -1365,7 +1396,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "%s ISO 파일을 인식할 수 없었습니다" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "%s 를 저장할 수 없었습니다" @@ -1378,7 +1409,7 @@ msgstr "" "패드들을 설정할 수 없었습니다. 플레이어가 떠났거나 게임이 현재 구동중!\n" "(게임이 구동중일 때 패드들을 설정하기는 아직 지원되지 않습니다)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1390,7 +1421,7 @@ msgstr "" "\n" "CD/DVD에서 돌핀을 구동하나요, 아니면 저장 파일이 쓰기 보호일지도?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "확장자 'ini'에 대한 열린 명령을 발견할 수 없었습니다!" @@ -1407,7 +1438,7 @@ msgstr "" msgid "Count:" msgstr "카운트:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "국가:" @@ -1421,27 +1452,27 @@ msgstr "AR 코드 생성" msgid "Create new perspective" msgstr "새로운 관점 생성" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "KDE-Look.org에 의해 만들어짐" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]에 의해 만들어" "짐" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "VistaIcons.com에 의해 만들어짐" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" "black_rider에 의해 만들어지고 ForumW.org > Web Developments에서 게시됨 " -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "만든이:" @@ -1449,7 +1480,7 @@ msgstr "만든이:" msgid "Critical" msgstr "치명적" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "자르기" @@ -1472,7 +1503,7 @@ msgstr "크로스페이드" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "현재 디렉토리가 %s에서 wxFileSelector뒤에 %s로 변경됨!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "사용자 지정 프로젝션 핵:" @@ -1480,11 +1511,11 @@ msgstr "사용자 지정 프로젝션 핵:" msgid "Custom Projection Hack Settings" msgstr "사용자 지정 프로젝션 핵 설정" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "일부 정 투영 파라미터들을 커스터마이즈." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "체코" @@ -1496,10 +1527,11 @@ msgstr "D-패드" msgid "DSP" msgstr "오디오" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "DSP 에뮬레이터 엔진" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1510,18 +1542,22 @@ msgstr "DSP 에뮬레이터 엔진" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE 에뮬레이션 (빠름)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE 인터프리터 (느림)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "DSP LLE를 쓰레드상에" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP LLE 리컴파일러" @@ -1529,15 +1565,23 @@ msgstr "DSP LLE 리컴파일러" msgid "DSP settings" msgstr "DSP 설정" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "DVD 루트:" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "데이터 크기" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "날짜:" @@ -1558,7 +1602,7 @@ msgstr "데드 존" msgid "Debug" msgstr "디버그" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "디버깅" @@ -1566,16 +1610,16 @@ msgstr "디버깅" msgid "Decimal" msgstr "10진수의" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "ISO 압축해제..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "선택된 ISO들 압축해제..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "ISO 압축해제하기" @@ -1583,11 +1627,11 @@ msgstr "ISO 압축해제하기" msgid "Default" msgstr "기본" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "기본 ISO:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "기본 폰트" @@ -1596,7 +1640,7 @@ msgstr "기본 폰트" msgid "Delete" msgstr "삭제" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "저장 지우기" @@ -1605,7 +1649,7 @@ msgstr "저장 지우기" msgid "Delete the existing file '%s'?" msgstr "기존 '%s'파일을 삭제합니까?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "설명" @@ -1613,8 +1657,8 @@ msgstr "설명" msgid "Detect" 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 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." @@ -1627,8 +1671,8 @@ msgstr "" msgid "Device" msgstr "장비" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "장비 설정" @@ -1653,23 +1697,23 @@ msgstr "" " 그리고 디렉토리 백업 체크섬이 실패했습니다" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "비활성" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "안개 끔" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "광원 끔" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "픽셀 깊이 비활성" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "텍스처들 끔" @@ -1711,7 +1755,7 @@ msgstr "" "\n" "모르겠으면, 이것을 언체크로 두세요." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "디스크" @@ -1738,6 +1782,7 @@ msgstr "" msgid "Divide" msgstr "나누기" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1747,10 +1792,13 @@ msgstr "나누기" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "현재 에뮬레이션을 중단하고 싶습니까?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "돌핀" @@ -1775,6 +1823,7 @@ msgstr "돌핀 에뮬된 위모트 환경설정" msgid "Dolphin FIFO" msgstr "돌핀 FIFO" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1799,6 +1848,14 @@ msgstr "돌핀 GC패드 환경설정" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "돌핀 GC패드 환경설정" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "돌핀 TAS 동영상 (*.dtm)" @@ -1831,11 +1888,11 @@ msgstr "" msgid "Down" msgstr "아래" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "코드(WiiRD 데이터베이스) 다운로드" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "%lu 코드들이 다운로드됨. (추가된 %lu)" @@ -1844,23 +1901,23 @@ msgstr "%lu 코드들이 다운로드됨. (추가된 %lu)" msgid "Drums" msgstr "드럼" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "더미" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "오디오 덤프" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "EFB 타겟 덤프" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "프레임들 덤프" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "텍스처들 덤프" @@ -1894,6 +1951,7 @@ msgstr "" "\n" "모르겠으면, 이것을 언체크로 두세요." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1909,6 +1967,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "네덜란드어" @@ -1932,7 +1995,7 @@ msgstr "" "-- 당신이 최근에 당신의 돌핀 배포를 업그레이드했다면, 윈도우즈가 새로운 드라" "이버를 알게 하려는 시점에서 아마도 재부팅이 필요합니다." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "유럽" @@ -1948,7 +2011,7 @@ msgstr "편집" msgid "Edit ActionReplay Code" msgstr "액션리플레이 코드 편집" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "환경 편집" @@ -1960,8 +2023,8 @@ msgstr "패치 편집" msgid "Edit current perspective" msgstr "현재 관점 편집" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "편집..." @@ -2011,7 +2074,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "에뮬된 위모트" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "에뮬레이션 상태:" @@ -2039,23 +2102,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "AR 로깅 활성" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "오디오 병목 활성" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "BAT 활성" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "블록 합치기 활성" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "바운딩 박스 계산 켜기" @@ -2068,6 +2131,7 @@ msgstr "바운딩 박스 계산 켜기" msgid "Enable Cache" msgstr "캐쉬 활성" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2077,51 +2141,54 @@ msgstr "캐쉬 활성" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "치트 활성" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "DTK 음악 활성" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "듀얼 코어 활성" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "듀얼 코어 활성 (속도상승)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "단축키 활성(그래픽 컨트롤)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "아이들 스킵 활성" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "아이들 스킵 활성 (속도상승)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "MMU 활성" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "프로그레시브 스캔 활성" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "스크린 세이버 활성" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "와이드스크린 활성" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "와이어프레임 활성" @@ -2139,14 +2206,14 @@ msgstr "" "\n" "모르겠으면, 1x를 선택하세요." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" msgstr "" "빠른 디스크 엑세스 활성. 일부 게임들에서 요구됨. (켬 = 빠른, 끔 = 호환성)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "페이지 활성" @@ -2174,7 +2241,7 @@ msgstr "" "\n" "모르겠으면, 이것을 언체크로 두세요." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2182,7 +2249,7 @@ msgstr "" "The Legend of Zelda: Twilight Princess를 속도를 올리려면 켬. 다른 게임을 위해" "서는 끔." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2191,7 +2258,7 @@ msgstr "" "블럭 주소 해석 (BAT); 메모리 관리 유닛 함수 활성. 하드웨어에 정확해진다, 하지" "만 에뮬레이트는 느려진다.(켬 = 호환성, 끔 = 빠름)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "사용자 지정 프로젝션 핵 활성화" @@ -2207,7 +2274,7 @@ msgstr "" "\n" "모르겠으면, 이것을 언체크로 두세요." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2227,6 +2294,7 @@ msgstr "" msgid "End" msgstr "끝" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2242,6 +2310,11 @@ msgstr "끝" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "영어" @@ -2272,6 +2345,7 @@ msgstr "같음" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "에러" @@ -2304,11 +2378,17 @@ msgstr "" "죄송합니다, Wii 녹화가 일시적으로 깨졌습니다." >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "에러" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: 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 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " @@ -2317,7 +2397,7 @@ msgstr "" "에러: \"%s\" 뒤에, %d (0x%X)를 발견 %d (0x%X) 세이브 표시 대신에. 상태저장 로" "드를 취소합니다..." -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2351,7 +2431,7 @@ msgstr "에뮬레이터와 함께 돌핀 종료" msgid "Export Failed" msgstr "내보내기 실패했습니다" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "파일 내보내기" @@ -2364,15 +2444,15 @@ msgstr "(입력) 기록 내보내기" msgid "Export Recording..." msgstr "(입력) 기록 내보내기..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "저장 내보내기" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "Wii 저장 내보내기 (실험적)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "모든 저장들을 내보내기" @@ -2388,7 +2468,7 @@ msgstr "저장을 다른 이름으로 내보내기..." msgid "Extension" msgstr "확장" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "외부 프레임 버퍼" @@ -2400,44 +2480,44 @@ msgstr "추가 매개변수" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "추가 매개변수는 ''Metroid: Other M''에서만 유용합니다." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "모든 파일들 압축풀기..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "앱로더 압축풀기..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "DOL 압축풀기..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "디렉토리 압축풀기..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "파일 압축 풀기..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "파티션 압축풀기..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "%s 압축풀기" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "모든 파일들 압축풀기" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "디렉토리 압축풀기" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "압축풀기..." @@ -2449,11 +2529,11 @@ msgstr "FIFO 바이트" msgid "FIFO Player" msgstr "FIFO 플레이어" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "프랑스" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "FST 크기:" @@ -2465,11 +2545,11 @@ msgstr "연결에 실패했습니다!" msgid "Failed to Listen!!" msgstr "듣기에 실패했습니다!!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "코드들 다운로드에 실패했습니다." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "%s로 압축풀기 실패했습니다!" @@ -2586,18 +2666,28 @@ msgstr "%s 에 대한 헤더 쓰기에 실패" msgid "Failed to write header for file %d" msgstr "%d 파일에 대한 헤더 쓰기에 실패했습니다" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "빠름" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "빠른 밉맵" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "MMU의 빠른 버전. 모든 게임에 대해 작동하지는 않는다." +#: Source/Core/Core/Src/Movie.cpp:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "FIFO 플레이어" @@ -2606,7 +2696,7 @@ msgstr "FIFO 플레이어" msgid "File Info" msgstr "파일 정보" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "파일이 코드를 지니지 않었습니다." @@ -2639,16 +2729,16 @@ msgstr "파일이 메모리카드로 인식되지 않는다" msgid "File not compressed" msgstr "파일이 압축되지 않었습니다" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: 알려지지 않은 열기 모드: 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "파일시스템" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "'ini'파일타입은 알려지지 않음! 열지 않겠습니다!" @@ -2656,7 +2746,7 @@ msgstr "'ini'파일타입은 알려지지 않음! 열지 않겠습니다!" msgid "First Block" msgstr "첫번째 블럭" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "체크섬들 고침" @@ -2668,7 +2758,7 @@ msgstr "강제 16:9" msgid "Force 4:3" msgstr "강제 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "콘솔을 NTSC-J로 강제시킴" @@ -2700,7 +2790,7 @@ msgstr "" "\n" "모르겠으면, 이것을 언체크로 두세요." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2736,7 +2826,7 @@ msgstr "프레임" msgid "Frame Advance" msgstr "프레임 진행" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "프레임 덤프가 FFV1를 사용" @@ -2748,7 +2838,7 @@ msgstr "프레임 범위" msgid "Frame S&kipping" msgstr "프레임 스킵(&k)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "프레임제한:" @@ -2756,10 +2846,11 @@ msgstr "프레임제한:" msgid "Frames To Record" msgstr "녹화할 프레임" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "자유로운 보기" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2775,6 +2866,11 @@ msgstr "자유로운 보기" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "프랑스어" @@ -2807,7 +2903,7 @@ msgstr "GCMic 환경설정" msgid "GCPad" msgstr "GC패드" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "게임 ID:" @@ -2823,15 +2919,15 @@ msgstr "게임이 구동중이지 않습니다!" msgid "Game not found!!" msgstr "게임이 찾을 수 없습니다!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "게임-상세 설정" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "게임환경" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "게임큐브" @@ -2842,6 +2938,7 @@ msgstr "게임큐브 패드 설정(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2849,6 +2946,9 @@ msgstr "게임큐브 패드 설정(&P)" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "게임큐브 메모리 카드들 (*.raw,*.gcp)" @@ -2857,15 +2957,17 @@ msgid "Gamecube Pad settings" msgstr "게임큐브 패드 설정" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Gecko 코드" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" "Gecko코드가 (CT%i CST%i) (%s) 구동에 실패했습니다\n" "(잘못된 코드이거나 코드 타입이 아직 지원않된다.)" @@ -2874,6 +2976,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 @@ -2882,6 +2985,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "일반" @@ -2890,6 +2996,7 @@ msgstr "일반" msgid "General Settings" msgstr "일반 설정" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2905,6 +3012,11 @@ msgstr "일반 설정" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "독일어" @@ -2942,7 +3054,7 @@ msgstr "" "\n" "모르겠으면, 이것을 체크로 두세요." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "그리스어" @@ -2974,7 +3086,7 @@ msgstr "핵" msgid "Header checksum failed" msgstr "헤더 체크섬 실패했습니다" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "히브리어" @@ -3044,12 +3156,16 @@ msgstr "단축키 설정" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "단축키들" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "헝가리어" @@ -3057,14 +3173,14 @@ msgstr "헝가리어" msgid "Hybrid Wiimote" msgstr "하이브리드 위모트" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS: 알려지지 않은 티켓: %08x/%08x 에서 데이터를 얻으려 시도했" "습니다" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -3077,11 +3193,11 @@ msgstr "" "TitleID %016llx.\n" " 돌핀은 이제 멈추려할 것이다" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - 잘못된 대상" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "IPL 설정" @@ -3097,15 +3213,15 @@ msgstr "IR 포인터" msgid "IR Sensitivity:" msgstr "IR 감도:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "ISO 세부사항" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "ISO 디렉토리들" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "이탈리아" @@ -3113,7 +3229,7 @@ msgstr "이탈리아" msgid "Icon" msgstr "아이콘" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -3121,17 +3237,19 @@ msgstr "" "체크하면, 바운딩 박스 레지스터들이 업데이트될 것입니다. Paper Mario 게임들에" "서 사용됩니다." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "FPS가 불규칙적이면, 이 옵션이 도움이 될 수도 있습니다. (켬 = 호환성, 끔 = 빠" "름)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy 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." +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " +"Audio to throttle using the DSP (might fix audio clicks but can also cause " +"constant noise depending on the game)." msgstr "" "프레임제한을 게임 풀 스피드 (NTSC:60, PAL:50)보다 더 높게 설정하면, DSP에서 " "오디오 병목도 꺼야 그것이 효과를 냅니다." @@ -3168,7 +3286,7 @@ msgstr "" "\n" "모르겠으면, 이것을 언체크로 두세요." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "저장을 가져오기" @@ -3217,7 +3335,7 @@ msgstr "" "\n" "모르겠으면, 이것을 언체크로 두세요." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "게임안" @@ -3226,7 +3344,7 @@ msgid "In-Game" msgstr "게임-안" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "정보" @@ -3246,7 +3364,7 @@ msgstr "삽입" msgid "Insert Encrypted or Decrypted code here..." msgstr "암호화되거나 암호해독된 코드를 여기에 삽입하세요..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "SD 카드 삽입" @@ -3258,7 +3376,7 @@ msgstr "이름을 여기에 넣으시오..." msgid "Install WAD" msgstr "WAD 설치" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Wii 메뉴에 설치" @@ -3269,6 +3387,7 @@ msgstr "" "InstallExceptionHandler 호출됨, 하지만 이 플랫폼은 아직 그것을 지원하지 않습" "니다." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3278,14 +3397,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "WAD 설치하기..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "인터페이스" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "인터페이스 설정" @@ -3310,11 +3432,11 @@ msgstr "내부 LZO 에러 - lzo_init() 실패했습니다" msgid "Internal Resolution:" msgstr "내부 해상도:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "인터프리터 (매우 느림)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "소개화면" @@ -3331,7 +3453,7 @@ msgstr "비적합 값!" msgid "Invalid bat.map or dir entry" msgstr "비적합 bat.map 혹은 디렉토리 엔트리" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "비적합 이벤트 타입 %i" @@ -3351,14 +3473,15 @@ msgstr "" "%s\n" " 당신은 이 게임을 리덤프해야할 지도." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "비적합 기록 파일" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "비적합 상태" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3374,27 +3497,32 @@ msgstr "비적합 상태" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "이탈리아어" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "일본" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT 리컴파일러 (권장)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL 실험적 리컴파일러" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "일본어" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "한국" @@ -3403,8 +3531,8 @@ msgstr "한국" msgid "Key" msgstr " [ 키 ]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "한국어" @@ -3422,7 +3550,7 @@ msgstr "L 버튼" msgid "L-Analog" msgstr "L-아날로그" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "언어:" @@ -3475,7 +3603,7 @@ msgstr "" msgid "Less Than" msgstr "보다 더 적은" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "FPS로 제한" @@ -3483,7 +3611,7 @@ msgstr "FPS로 제한" msgid "Load" msgstr "로드" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "커스텀 텍스처 로드" @@ -3531,6 +3659,7 @@ msgstr "슬롯8 상태 로드" msgid "Load State..." msgstr "상태 로드..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3552,6 +3681,13 @@ msgstr "Wii 시스템 메뉴 로드" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "Wii 시스템 메뉴 로드" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii 시스템 메뉴 %d %c 로드" @@ -3578,7 +3714,7 @@ msgstr "명시된 파일 (DOL,ELF,WAD,GCM,ISO,WAD) 로드" msgid "Local" msgstr "지역" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "코어에 쓰레드 잠그기" @@ -3590,11 +3726,11 @@ msgstr "로그" msgid "Log Configuration" msgstr "로그 환경설정" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "로그 타입" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "로거 출력" @@ -3624,7 +3760,7 @@ msgstr "" "MD5 미스매치\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU 스피드 핵" @@ -3646,11 +3782,11 @@ msgstr "MadCatz 게임샤크 파일들(*.gcs)" msgid "Main Stick" msgstr "메인 스틱" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "제작사 ID:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "제작사:" @@ -3674,6 +3810,7 @@ msgstr "메모리 바이트" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3681,6 +3818,9 @@ msgstr "메모리 바이트" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "메모리 카드" @@ -3717,7 +3857,7 @@ msgstr "메모리카드 파일크기가 헤더 크기와 불일치합니다" msgid "Menu" msgstr "메뉴" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "마이크" @@ -3726,11 +3866,11 @@ msgstr "마이크" msgid "Min" msgstr "최소값" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "기타" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "기타 설정" @@ -3751,7 +3891,7 @@ msgstr "" "\n" "모르겠으면, 이것을 언체크로 두세요." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "단일띄어쓰기 폰트" @@ -3764,7 +3904,7 @@ msgstr "모션 플러스" msgid "Motor" msgstr "모터" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3786,7 +3926,7 @@ msgstr "" msgid "Multiply" msgstr "곱하기" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3878,6 +4018,7 @@ msgstr "NP 탭" msgid "NP Up" msgstr "NP 위" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3887,6 +4028,9 @@ msgstr "NP 위" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3895,7 +4039,7 @@ msgstr "이름:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "이름:" @@ -3909,7 +4053,7 @@ msgid "New Scan" msgstr "새로운 스캔" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "다음 페이지" @@ -3921,7 +4065,7 @@ msgstr "다음 스캔" msgid "Nickname :" msgstr "별명 :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "국가 없음 (SDK)" @@ -3960,7 +4104,7 @@ msgstr "%s 타이틀에 대한 저장 폴더가 없음" msgid "None" msgstr "없음" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "노르웨이 북몰어" @@ -3968,8 +4112,8 @@ msgstr "노르웨이 북몰어" msgid "Not Equal" msgstr "같지 않음" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "설정 안함" @@ -3989,7 +4133,7 @@ msgstr "연결되지 않음" msgid "Notes" msgstr "참고 사항" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "참고:" @@ -4027,7 +4171,7 @@ msgstr "오브젝트" msgid "Object Range" msgstr "오브젝트 범위" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "끔" @@ -4053,11 +4197,11 @@ msgstr "%d 블럭들만 유용한" msgid "Open" msgstr "열기" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "담고 있는 폴더 열기(&c)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "Wii 저장 폴더 열기(&s)" @@ -4079,11 +4223,11 @@ msgstr "OpenAL: 사운드 장치들을 찾을 수 없음" msgid "OpenAL: can't open device %s" msgstr "OpenAL: %s 장치를 열 수 없음" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "OpenCL 텍스처 디코더" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "OpenMP 텍스처 디코더" @@ -4112,7 +4256,7 @@ msgid "" msgstr "파일 디렉토리안에 파일의 순서가 블럭 순서와 맞지 않습니다\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "다른 것들" @@ -4164,19 +4308,20 @@ msgstr "단락" msgid "Parameters" msgstr "매개변수들" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "파티션 %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "패치" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "경로" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4189,6 +4334,10 @@ msgstr "경로" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "일시정지" @@ -4197,7 +4346,7 @@ msgstr "일시정지" msgid "Per-Pixel Lighting" msgstr "픽셀단위 광원" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "완벽한" @@ -4210,6 +4359,7 @@ msgstr "관점 %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 ======= @@ -4220,6 +4370,10 @@ msgstr "관점 %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr " 실행 " @@ -4233,7 +4387,7 @@ msgstr "(입력) 기록 재생" msgid "Play/Pause" msgstr "실행/일시정지" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "플레이가능" @@ -4245,6 +4399,7 @@ msgstr "재생 옵션" msgid "Players" msgstr "플레이어" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4254,6 +4409,9 @@ msgstr "플레이어" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "확인해주세요..." @@ -4265,23 +4423,23 @@ msgstr "저장하기전에 관점을 생성해 주세요." msgid "Plus-Minus" msgstr "플러스-마이너스" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "폴란드어" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "포트 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "포트 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "포트 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "포트 4" @@ -4290,11 +4448,11 @@ msgstr "포트 4" msgid "Port :" msgstr "포트:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "포르투갈어" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "포르투갈어 (브라질)" @@ -4302,17 +4460,17 @@ msgstr "포르투갈어 (브라질)" msgid "Post-Processing Effect:" msgstr "후-처리 효과:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "PlayController에 영상마무리가 미완성되었습니다. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "PlayWiimote에 영상 마무리가 미완성되었습니다. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "PlayWiimote에 영상 마무리가 미완성되었습니다. %u > %u" @@ -4325,7 +4483,7 @@ msgstr "사전설정:" msgid "Prev Page" msgstr "이전 페이지" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "이전 페이지" @@ -4376,7 +4534,7 @@ msgstr "R-아날로그" msgid "RAM" msgstr "램" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "러시아" @@ -4389,7 +4547,7 @@ msgstr "범위" msgid "Read-only mode" msgstr "읽기-전용 모드" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "실제" @@ -4464,6 +4622,7 @@ msgstr "목록 새로 고침" msgid "Refresh game list" msgstr "게임 목록 새로 고침" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4482,6 +4641,12 @@ msgstr "게임 목록 새로 고침" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "제거" @@ -4534,11 +4699,11 @@ msgstr "오른쪽 스틱" msgid "Rumble" msgstr "진동" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "DSP LLE를 전용 쓰레드상에서 구동하기 (권장 안함)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "러시아어" @@ -4546,10 +4711,11 @@ msgstr "러시아어" msgid "Sa&ve State" msgstr "상태 저장(&v) " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "안전" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4559,6 +4725,9 @@ msgstr "안전" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "샘플율:" @@ -4616,12 +4785,12 @@ msgstr "슬롯8 상태 저장" msgid "Save State..." msgstr "상태 저장..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "다른 이름으로 저장..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "압축된 GCM/ISO를 저장" @@ -4629,11 +4798,11 @@ msgstr "압축된 GCM/ISO를 저장" msgid "Save current perspective" msgstr "현재 관점을 저장" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "압축풀린 GCM/ISO를 저장" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "%s 영상 상태저장이 손상되었습니다, 영상 기록 중지..." @@ -4642,6 +4811,7 @@ msgstr "%s 영상 상태저장이 손상되었습니다, 영상 기록 중지... msgid "Scaled EFB Copy" msgstr "스케일된 EFB 복사" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4651,15 +4821,18 @@ msgstr "스케일된 EFB 복사" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "스캐닝 %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "ISO들을 검사하기" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "스캐닝..." @@ -4675,12 +4848,12 @@ msgstr "스크롤 락" msgid "Search Filter" msgstr "필터 찾기" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 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:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "섹션 %s를 SYSCONF에서 찾을 수 없음" @@ -4690,6 +4863,7 @@ msgstr "섹션 %s를 SYSCONF에서 찾을 수 없음" msgid "Select" msgstr "선택" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4714,6 +4888,14 @@ msgstr "기록 파일 선택" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "기록 파일 선택" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "설치할 Wii WAD 파일 선택" @@ -4739,6 +4921,7 @@ msgstr "유동적인 윈도우즈 선택" msgid "Select the file to load" msgstr "로드할 파일 선택" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 @@ -4755,19 +4938,26 @@ msgstr "로드할 상태 선택" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "저장 파일을 선택" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "로드할 상태 선택" +<<<<<<< HEAD <<<<<<< 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. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "저장할 상태 선택" @@ -4789,7 +4979,7 @@ msgstr "" "\n" "모르겠으면, 자동을 선택하세요." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "선택된 폰트" @@ -4837,11 +5027,11 @@ msgstr "센서 바 위치:" msgid "Separator" msgstr "분리자" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "세르비아어" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "시리얼 포트 1 - 이것은 넷 어댑터같은 디바이스가 사용하는 포트이다" @@ -4850,11 +5040,11 @@ msgstr "시리얼 포트 1 - 이것은 넷 어댑터같은 디바이스가 사 msgid "Set" msgstr "설정" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "디폴트 ISO로 설정(&d)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "기본 메모리카드 %c 로 설정" @@ -4864,7 +5054,7 @@ msgstr "기본 메모리카드 %c 로 설정" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "SetARCode_IsActive: 목록이 ar 코드 목록 크기 %lu 보다 더 큽니다" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "설정..." @@ -4876,7 +5066,7 @@ msgstr "SetupWiiMem: 설정 파일을 찾을 수 없음" msgid "Shake" msgstr "흔들기" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "단축 이름:" @@ -4904,7 +5094,7 @@ msgstr "툴바 표시(&T)" msgid "Show Drives" msgstr "드라이브 표시" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "EFB 복사 영역" @@ -4920,7 +5110,7 @@ msgstr "프랑스" msgid "Show GameCube" msgstr "게임큐브" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "입력 표시 보기" @@ -4936,7 +5126,7 @@ msgstr "JAP (일본 방식)" msgid "Show Korea" msgstr "한국" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "언어 보기:" @@ -4956,7 +5146,7 @@ msgstr "플랫폼 표시" msgid "Show Regions" msgstr "지역 표시" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "통계들" @@ -4976,11 +5166,11 @@ msgstr "Wad" msgid "Show Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "게임을 멈추기 전에 확인 상자 보여주기." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 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 " @@ -4990,23 +5180,23 @@ msgstr "" "이것을 끄면 짜증나고 심각하지 않은 메시지들을 피할 수도 있다, 하지만 그것은 " "돌핀이 전혀 설명 없이 갑자기 깨진다는 것을 의미할 수도 있다." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "첫번째 블럭 보기" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "저장 블럭들 보기" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "저장 주석 보기" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "저장 아이콘 보기" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "저장 타이틀 보기" @@ -5043,7 +5233,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "사이드웨이 위모트" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "간소화 중국어" @@ -5051,11 +5241,11 @@ msgstr "간소화 중국어" msgid "Size" msgstr "크기" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "바이오스 스킵" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "목적지. 알파 패스 스킵" @@ -5097,11 +5287,11 @@ msgstr "" msgid "Slot %i" msgstr "슬롯 %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "슬롯 A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "슬롯 B" @@ -5124,7 +5314,7 @@ msgstr "" "디버깅 목적으로만 유용합니다.\n" "소프트웨어 렌더링을 활성을 정말 원합니까? 모르겠으면, '아니오'를 선택하세요." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "사운드 설정" @@ -5142,6 +5332,7 @@ msgstr "사운드 버퍼 생성 실패했습니다: %s" msgid "Space" msgstr "스페이스" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5157,6 +5348,11 @@ msgstr "스페이스" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "스페인어" @@ -5188,7 +5384,7 @@ msgstr "" msgid "Specify a video backend" msgstr "비디오 백엔드 명시" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "디스크 전송율 속도 상승" @@ -5196,7 +5392,7 @@ msgstr "디스크 전송율 속도 상승" msgid "Square Stick" msgstr "스퀘어 스틱" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "표준 컨트롤러" @@ -5293,12 +5489,12 @@ msgstr "세이브 파일들을 성공적으로 가져왔음" msgid "Swing" msgstr "스윙" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "시스템 언어:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "타이완" @@ -5337,7 +5533,7 @@ msgstr "테이블 오른쪽" msgid "Take Screenshot" msgstr "스크린샷 찍기" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "타루콩가 (봉고스)" @@ -5353,7 +5549,7 @@ msgstr "텍스처" msgid "Texture Cache" msgstr "텍스처 캐쉬" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "텍스처 포멧 오버레이" @@ -5369,13 +5565,13 @@ msgstr "그 주소는 비적합 입니다" msgid "The checksum was successfully fixed" msgstr "체크섬이 성공적으로 고쳐졌습니다" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "선택된 디렉토리는 이미 리스트에 있다" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5398,7 +5594,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "%s 파일이 이미 열려 있었습니다, 파일 헤더는 기록되지 않을 것입니다." -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "당신이 기술한 파일 (%s)는 존재하지 않습니다" @@ -5416,11 +5612,12 @@ msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "해독된 AR 코드 결과가 없습니다." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#, fuzzy msgid "" "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." +"If unsure, use the rightmost value." msgstr "" "이것을 안전하게 정할 수록, 에뮬레이터가 램으로 부터 텍스처 업데이트들을 덜 놓" "치는 경향이 있습니다.\n" @@ -5463,7 +5660,7 @@ msgstr "기술된 \"%s\" 파일은 존재하지 않는다" msgid "The value is invalid" msgstr "값이 비적합 합니다" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "테마" @@ -5471,7 +5668,7 @@ msgstr "테마" msgid "Theme selection went wrong" msgstr "테마 선택이 잘못되었다" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5479,7 +5676,7 @@ msgstr "" "00000001/00000002에 대한 티켓이 있어야한다. 당신의 NAND 덤프는 아마도 미완성" "이다." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5495,7 +5692,7 @@ msgstr "" "이 액션 리플레이 시뮬레이터는 액션 리플레이 스스로 수정한 코드를 지원하지 않" "는다." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "이것은 Wii 메뉴와 일부 게임들에서 느려짐을 유발할 수 있다." @@ -5518,23 +5715,10 @@ msgstr "" "모르겠으면. 이것을 언체크로 두세요." #: 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" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" -"이것은 사운드 병목으로 게임 스피드를 컨트롤하는 데에 쓰인다.\n" -"이것을 끄는 것은 비정상적인 게임스피드를 유발할 수 있다, 너무 빠르다던지.\n" -"\n" -"키보드 단축키 : 병목을 즉각 끄려면 눌러라." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "이것은 BGM같은 음악 트랙들을 재생하는 데에 쓰입니다." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5546,7 +5730,7 @@ msgstr "" "두개 이상의 코어를 가진 PC들 상에서 주요 속도 향상들을 유발한다, 하지만 갑작" "스런 깨짐/결함들을 일으킬 수도 있다." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "이것은 수동으로 INI 환경파일을 수정하게 해줄겁니다" @@ -5569,7 +5753,7 @@ msgstr " 제목" msgid "To" msgstr "To" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "모든 로그 타입 토글" @@ -5589,6 +5773,7 @@ msgstr "전체화면 토글" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5596,14 +5781,17 @@ msgstr "전체화면 토글" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "위" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "전통 중국어" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "알려지지 않은 파일 타입을 로드시도했다." @@ -5611,7 +5799,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:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "비적합 SYSCONF로 부터 읽기 시도" @@ -5623,7 +5811,7 @@ msgstr "" "효한 SYSCONF에서 읽기 시도\n" "위모트 bt id들은 유용하지 않습니다" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "터키어" @@ -5644,11 +5832,11 @@ msgstr "UDP 포트:" msgid "UDP Wiimote" msgstr "UDP 위모트" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "알려지지 않음" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "미국" @@ -5734,7 +5922,7 @@ msgstr "업데이트" msgid "Upright Wiimote" msgstr "업라이트 위모트" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 모드 (PAL60) 사용" @@ -5746,7 +5934,7 @@ msgstr "전체화면 사용" msgid "Use Hex" msgstr "16진수 사용" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "패닉 핸들러 사용" @@ -5776,7 +5964,7 @@ msgstr "" "\n" "모르겠으면, 이것을 언체크로 두세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "유틸리티" @@ -5800,25 +5988,29 @@ msgstr "값:" msgid "Verbosity" msgstr "상세설명" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "비디오" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "가상" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "볼륨" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "WAD 설치 실패했습니다: 에러 생성 %s" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "WAD 설치 실패했습니다: 에러 생성 %s" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5837,15 +6029,15 @@ msgstr "" msgid "Warning" msgstr "경고" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "경고 - 잘못된 콘솔 모드에서 DOL을 시작!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "경고 - 잘못된 콘솔 모드에서 ELF 시작!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "경고 - 잘못된 콘솔 모드에서 ISO 시작!" @@ -5873,7 +6065,7 @@ msgstr "" "그리고 당신의 메모리카드에 파일로 같은 이름을 가집니다\n" "계속합니까?" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5884,7 +6076,7 @@ msgstr "" "%u > %u). You should load another save before continuing, or load this state " "with read-only mode off." -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5895,7 +6087,7 @@ msgstr "" "전에 다른 세이브를 로드해야합니다, 혹은 읽기-전용 모드를 끄고 로드하세요. 그" "렇지 않으면 아마도 싱크 어긋남이 생길겁니다." -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5937,7 +6129,7 @@ msgstr "WaveFileWriter - 파일이 열리지 않습니다." msgid "Whammy" msgstr "훼미" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "와이드스크린 핵" @@ -5945,15 +6137,15 @@ msgstr "와이드스크린 핵" msgid "Width" msgstr "너비" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Wii 콘솔" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Wii NAND 루트:" @@ -5961,6 +6153,7 @@ msgstr "Wii NAND 루트:" msgid "Wii Save Import" msgstr "Wii 저장 가져오기" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5970,6 +6163,9 @@ msgstr "Wii 저장 가져오기" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 저장 파일들 (*.bin)|*.bin" @@ -6036,10 +6232,11 @@ msgstr "윈도우즈 메뉴" msgid "Windows Right" msgstr "윈도우즈 오른쪽" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "자동 줄바꿈" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -6055,6 +6252,11 @@ msgstr "자동 줄바꿈" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "작동중..." @@ -6062,6 +6264,11 @@ msgstr "작동중..." msgid "Write to Console" msgstr "콘솔에 쓰기" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "파일에 쓰기" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "파일에 쓰기" @@ -6117,7 +6324,7 @@ msgstr "적합한 10진수나 16진수나 8진수 값을 넣어야 합니다." msgid "You must enter a valid profile name." msgstr "적합한 프로파일 이름을 넣어야 합니다." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "변경이 적용되려면 돌핀을 재시작 해야 합니다." @@ -6140,7 +6347,7 @@ msgstr "" "0x%04x 이어야합니다 (하지만 0x%04llx 임) \n" "새로 생성하시겠습니까?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "ZTP 핵" @@ -6210,7 +6417,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "앱로더 (.img)" @@ -6241,12 +6448,12 @@ msgstr "wii 저장이 아니거나 파일 헤더 크기 %x에 대한 읽기 실 msgid "s" msgstr "들" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "알려지지 않은 명령 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "애플리케이션 구동상에서 wxExecute가 -1을 반환했습니다!" @@ -6455,6 +6662,9 @@ msgstr "| OR" #~ msgid "Emulator Display Settings" #~ msgstr "에뮬레이터 화면표시 설정" +#~ msgid "Enable Audio Throttle" +#~ msgstr "오디오 병목 활성" + #~ msgid "Enable CPU Access" #~ msgstr "CPU 엑세스 활성" @@ -6511,6 +6721,13 @@ msgstr "| OR" #~ msgid "Error allocating buffer" #~ msgstr "버퍼 할당하기 에러" +#~ msgid "" +#~ "Error in PlayWiimote. %u != %u, byte %d.\n" +#~ "Sorry, Wii recording is temporarily broken." +#~ msgstr "" +#~ "PlayWiimote에 에러발생. %u != %u, byte %d.\n" +#~ "죄송합니다, Wii 녹화가 일시적으로 깨졌습니다." + #~ msgid "Error loading %s: can't read info" #~ msgstr "%s 로딩 에러: 정보를 읽을 수 없음" @@ -6790,6 +7007,19 @@ msgstr "| OR" #~ msgid "The file " #~ msgstr "그 파일" +#~ msgid "" +#~ "This is used to control game speed by sound throttle.\n" +#~ "Disabling this could cause abnormal game speed, such as too fast.\n" +#~ "But sometimes enabling this could cause constant noise.\n" +#~ "\n" +#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." +#~ msgstr "" +#~ "이것은 사운드 병목으로 게임 스피드를 컨트롤하는 데에 쓰인다.\n" +#~ "이것을 끄는 것은 비정상적인 게임스피드를 유발할 수 있다, 너무 빠르다던" +#~ "지.\n" +#~ "\n" +#~ "키보드 단축키 : 병목을 즉각 끄려면 눌러라." + #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "이것은 보통 음성과 소리 효과들 재생에 사용된다." diff --git a/Languages/po/nb.po b/Languages/po/nb.po index d321d1dde5..d2fa9aa314 100644 --- a/Languages/po/nb.po +++ b/Languages/po/nb.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -16,6 +17,9 @@ msgstr "" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Update from master branch. +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-06-06 20:15+0100\n" "Last-Translator: Knut \n" "Language-Team: Norwegian \n" @@ -60,9 +64,9 @@ msgstr "\"%s\" er en ugyldig GCM/ISO-fil, eller ikke en GC/Wii ISO." msgid "%1$sCopy%1$s" msgstr "%1$sKopier%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -154,7 +158,7 @@ msgstr "%sEksporter GCI%s" msgid "%sImport GCI%s" msgstr "%sImporter GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u Ledige Blokker; %u Ledige Dir Entries" @@ -187,11 +191,11 @@ msgstr "Jukse&kode-manager" msgid "&DSP Settings" msgstr "Innstillinger for &DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&Slett ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&Slett valgte ISO-filer..." @@ -255,7 +259,7 @@ msgstr "&Pause" msgid "&Play" msgstr "&Spill" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&Egenskaper" @@ -299,7 +303,7 @@ msgstr "Vi&s" msgid "&Wiimote Settings" msgstr "Innstillinger for Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "&Wiki" @@ -343,7 +347,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -352,7 +356,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -409,13 +413,13 @@ msgstr "" "\n" "Du må fremme TCP-porten til verten!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "" @@ -427,11 +431,11 @@ msgstr "Om Dolphin" msgid "Acceleration" msgstr "Aksellerasjon" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "Nøyaktighet:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Nøyaktig VBeam-emulering" @@ -551,11 +555,11 @@ msgstr "Adapter:" msgid "Add" msgstr "Legg Til" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "Legg til Action Replay Kode" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "Legg til Patch" @@ -563,6 +567,7 @@ msgstr "Legg til Patch" msgid "Add new pane" msgstr "Legg til ny rute" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -578,6 +583,11 @@ msgstr "Legg til ny rute" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Legg til..." @@ -625,11 +635,11 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "Juster analogkontrolltrykket som kreves for å aktivere knapper." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "Avansert" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Avanserte Innstillinger" @@ -637,14 +647,15 @@ msgstr "Avanserte Innstillinger" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Alle GC/Wii-filer (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Alle GC/Wii-bildefiler (gcm, iso, ciso, wad)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "Alle GameCube GCM-filer (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -657,18 +668,22 @@ msgstr "Alle GameCube GCM-filer (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Alle Save States (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "Alle Wii ISO-filer (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Alle komprimerte GC/Wii-filer (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "Alle filer (*.*)|*.*" @@ -684,7 +699,7 @@ msgstr "" "\n" "Hvis usikker, la stå avslått." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "Emulert Wiimote" @@ -707,7 +722,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "Applikasjonlaster klarte ikke å laste fra fil" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Applikasjonslaster:" @@ -725,7 +740,7 @@ msgstr "" "\n" "Hvis usikker, la stå avslått." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Arabisk" @@ -734,7 +749,7 @@ msgstr "Arabisk" msgid "Are you sure you want to delete \"%s\"?" msgstr "Er du sikker på at du vil slette \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -742,12 +757,13 @@ msgstr "" "Er du sikker på at du vil slette disse filene?\n" "De vil bli borte for alltid!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Er du sikker på at du vil slette denne filen?\n" "Den vil bli borte for alltid!" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -757,6 +773,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Aspektforhold:" @@ -765,18 +784,20 @@ msgstr "Aspektforhold:" msgid "At least one pane must remain open." msgstr "Minst en rute må stå åpen." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Audio Backend:" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Feil ved åpning av AO-device.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -786,6 +807,9 @@ msgstr "AudioCommon: Feil ved åpning av AO-device.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automatisk" @@ -828,7 +852,7 @@ msgstr "" msgid "Back" msgstr "Tilbake" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Backend-innstillinger" @@ -855,11 +879,11 @@ msgstr "Dårlig Fil-header" msgid "Banner" msgstr "Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "Bannerdetaljer" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "Banner:" @@ -871,7 +895,7 @@ msgstr "Bar" msgid "Basic" msgstr "Grunnleggende" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Grunnleggende Innstillinger" @@ -902,6 +926,7 @@ msgstr "Blå Høyre" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -909,6 +934,9 @@ msgstr "Blå Høyre" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Bunn" @@ -917,7 +945,7 @@ msgstr "Bunn" msgid "Bound Controls: %lu" msgstr "Bundede Kontroller: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Ødelagt" @@ -933,7 +961,7 @@ msgstr "Bla etter en mappe å legge til" msgid "Browse for an ISO directory..." msgstr "Bla etter en ISO-mappe..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "Bla etter lagringssted" @@ -964,11 +992,11 @@ msgstr "C-joystick" msgid "C-Stick" msgstr "C-joystick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "CPU-emulatormotor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "Cacher Display-lister" @@ -1017,7 +1045,7 @@ msgstr "Kan ikke åpne %s" msgid "Cannot unregister events with events pending" msgstr "Kan ikke avregistrere events med events under behandling" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1027,7 +1055,7 @@ msgstr "" "Kan ikke bruke den filen som et minnekort.\n" "Prøver du å bruke samme fil i begge slotter?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1045,8 +1073,6 @@ msgstr "Kan ikke finne Wiimote med bd: %02x:%02x:%02x:%02x:%02x:%02x" msgid "Cant find WiiMote by connection handle %02x" msgstr "Kan ikke finne Wiimote med tilkoblingshandler %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1056,7 +1082,7 @@ msgstr "Kan ikke lese fra DVD_Plugin - DVD-Interface: Fatal Feil" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "Katalansk" @@ -1081,7 +1107,7 @@ msgstr "Endre Disk" msgid "Change Game" msgstr "Endre Spill" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1097,8 +1123,8 @@ msgstr "Endringer signeres til zFar-parameteren (etter korreksjon)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Endringer signeres til zNear-parameteren (etter korreksjon)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "Å endre dette vil ikke ha noen effekt mens emulatoren kjører!" @@ -1118,31 +1144,31 @@ msgstr "Juksekodesøk" msgid "Cheats Manager" msgstr "Juksekode Manager" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Kinesisk (Simplifisert)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Kinesisk (Tradisjonell)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "Velg en DVD-rotmappe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "Velg en NAND-rotmappe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Velg en standard-ISO:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "Velg en mappe å legge til" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Velg en fil å åpne" @@ -1150,7 +1176,7 @@ msgstr "Velg en fil å åpne" msgid "Choose a memory card:" msgstr "Velg et minnekort:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1158,8 +1184,8 @@ msgstr "" "Velg fil til å bruke som applikasjonslaster: (gjelder kun for disker laget " "fra mapper)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Velg mappen å ekstrahere til" @@ -1171,14 +1197,14 @@ msgstr "Sirkel-joystick" msgid "Classic" msgstr "Klassisk" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "Tøm" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "Klarering feilet." @@ -1194,6 +1220,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 @@ -1202,6 +1229,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Lukk" @@ -1225,20 +1256,20 @@ msgstr "Kommando" msgid "Comment" msgstr "Kommentar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Kommentar:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "Komprimer ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Komprimer valgte ISO-er..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "Komprimerer ISO" @@ -1265,13 +1296,13 @@ msgstr "Konfigurer Kontrollere" msgid "Configure..." msgstr "Konfigurer..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "Bekreft filoverskriving" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "Bekreft ved Stans" @@ -1280,7 +1311,7 @@ msgstr "Bekreft ved Stans" msgid "Connect" msgstr "Koble til" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "Koble til USB-tastatur" @@ -1337,12 +1368,12 @@ msgstr "Konverter til GCI" msgid "Copy failed" msgstr "Kopi feilet" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "Kopier til Minnekort %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "Kjerne" @@ -1372,7 +1403,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Kunne ikke gjennkjenne ISO-fil %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "Kunne ikke lagre %s" @@ -1386,7 +1417,7 @@ msgstr "" "spillet kjører ikke!\n" "(Å stille inn kontrollere mens spillet kjøret er foreløpig ikke støttet)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1398,7 +1429,7 @@ msgstr "" "\n" "Kjører du Dolphin fra en CD/DVD, eller er lagringsfilen kanskje beskyttet?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "Kunne ikke finne åpningskommandoen for utvidelsen 'ini'!" @@ -1415,7 +1446,7 @@ msgstr "" msgid "Count:" msgstr "Antall:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "Land:" @@ -1429,25 +1460,25 @@ msgstr "Lag AR-kode" msgid "Create new perspective" msgstr "Lag nytt perspektiv" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "Laget av KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Laget av Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "Laget av VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "Laget av black_rider og publisert på ForumW.org > Web Developments" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "Skaper:" @@ -1455,7 +1486,7 @@ msgstr "Skaper:" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "Krum" @@ -1478,7 +1509,7 @@ msgstr "Kryssutfase" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Nåværende mappesti endret fra %s til %s etter wxFilVelger!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "Selvdefinert Projeksjons-hack" @@ -1486,11 +1517,11 @@ msgstr "Selvdefinert Projeksjons-hack" msgid "Custom Projection Hack Settings" msgstr "Innstillinger for Selvdefinerte Projeksjons-hack" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "Selvdefiner noen Ortografisk Projeksjons-parametere." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Tsjekkisk" @@ -1502,10 +1533,11 @@ msgstr "D-Pad" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "CPU Emulatormotor" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1516,18 +1548,22 @@ msgstr "CPU Emulatormotor" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE-emulering (raskt)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE interpreter (tregt)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "DSP LLE på CPU-tråd" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP LLE re-kompilering" @@ -1535,15 +1571,23 @@ msgstr "DSP LLE re-kompilering" msgid "DSP settings" msgstr "Innstillinger for DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "DVD-rot:" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "Datastørrelse" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "Dato:" @@ -1564,7 +1608,7 @@ msgstr "Dødsone" msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "Debugging" @@ -1572,16 +1616,16 @@ msgstr "Debugging" msgid "Decimal" msgstr "Desimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "Dekomprimer ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "Dekomprimer valgte ISO-filer..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "Dekomprimerer ISO" @@ -1589,11 +1633,11 @@ msgstr "Dekomprimerer ISO" msgid "Default" msgstr "Standard" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "Standard-ISO:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "Standard tekst-font" @@ -1602,7 +1646,7 @@ msgstr "Standard tekst-font" msgid "Delete" msgstr "Slett" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "Slett Lagringsfil" @@ -1611,7 +1655,7 @@ msgstr "Slett Lagringsfil" msgid "Delete the existing file '%s'?" msgstr "Slett den eksiterende filen '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "Beskrivelse" @@ -1619,8 +1663,8 @@ msgstr "Beskrivelse" msgid "Detect" msgstr "Finn automatisk" -#: 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 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." @@ -1633,8 +1677,8 @@ msgstr "" msgid "Device" msgstr "Device" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Innstillinger for device" @@ -1659,23 +1703,23 @@ msgstr "" " og mappesti backup-sjekksummen mislyktes" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "Deaktiver" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "Deaktiver tåke (fog)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "Deaktiver lyseffekter" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "Deaktiver Per-Pikseldybde" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "Deaktiver teksturer" @@ -1719,7 +1763,7 @@ msgstr "" "\n" "Hvis usikker, la stå avslått." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Disk" @@ -1746,6 +1790,7 @@ msgstr "" msgid "Divide" msgstr "Del" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1755,10 +1800,13 @@ msgstr "Del" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Vil du stoppe pågående emulering?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1783,6 +1831,7 @@ msgstr "Dolphin Emulert Wiimote Konfigurasjon" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1807,6 +1856,14 @@ msgstr "Dolphin GC-kontroll konfigurasjon" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GC-kontroll konfigurasjon" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS-Filmer (*.dtm)" @@ -1839,11 +1896,11 @@ msgstr "" msgid "Down" msgstr "Ned" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "Last ned juksekoder (WiiRD Database)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Lastet ned %lu koder. (la til %lu)" @@ -1852,23 +1909,23 @@ msgstr "Lastet ned %lu koder. (la til %lu)" msgid "Drums" msgstr "Trommer" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "Juksedukke" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "Dump Audio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "Dump EFB Target" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "Skjermdumping" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "Dump teksturer" @@ -1902,6 +1959,7 @@ msgstr "" "\n" "Hvis usikker, la stå avslått." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1917,6 +1975,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Nederlansk" @@ -1940,7 +2003,7 @@ msgstr "" "versjon %d.%d -- Hvis du nylig oppgraderte din Dolphin-distribusjon, kreves " "sannsynligvis en restart for at Windows skal se den nye driveren." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "EUROPA" @@ -1956,7 +2019,7 @@ msgstr "Endre" msgid "Edit ActionReplay Code" msgstr "Endre ActionReplay-kode" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Endre Konfigurasjon" @@ -1968,8 +2031,8 @@ msgstr "Endre Patch" msgid "Edit current perspective" msgstr "Endre nåværende perspektiv" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "Endre..." @@ -2019,7 +2082,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Emulert Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "Emulasjonsstatus:" @@ -2047,23 +2110,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "Aktiver AR-logging" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "Aktiver Audio Throttle" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "Aktiver BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Aktiver Block Merging" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -2076,6 +2139,7 @@ msgstr "" msgid "Enable Cache" msgstr "Aktiver cache" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2085,51 +2149,54 @@ msgstr "Aktiver cache" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Aktiver Juksekoder" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "Aktiver DTK-musikk" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Aktiver Dobbelkjerne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Aktiver Dobbelkjerne (for bedre ytelse)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "Aktiver Snarveistaster" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Aktiver Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Aktiver Idle Skipping (for bedre ytelse)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Aktiver MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "Aktiver Progressiv Skanning" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "Aktiver Skjermsparer" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "Aktiver Widescreen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "Aktiver WireFrame" @@ -2146,7 +2213,7 @@ msgstr "" "\n" "Hvis usikker, velg 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2154,7 +2221,7 @@ msgstr "" "Aktiver rask disktilgang. Trengs for noen få spill. (PÅ = Raskt, AV = " "Kompitabelt)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "Aktiver sider" @@ -2182,7 +2249,7 @@ msgstr "" "\n" "Hvis usikker, la stå avslått." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2190,7 +2257,7 @@ msgstr "" "Aktiver dette for å bedre ytelsen i The Legend Of Zelda: Twillight Princess. " "Deaktiver for andre spill." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2200,7 +2267,7 @@ msgstr "" "Unit (MMU). Nøyaktig for maskinvaren, men treg å emulere. (PÅ = Kompitabelt, " "AV = Raskt)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "Tillater Selvdefinerte Projeksjons-hack" @@ -2217,7 +2284,7 @@ msgstr "" "\n" "Hvis usikker, la stå avslått." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2239,6 +2306,7 @@ msgstr "" msgid "End" msgstr "Slutt" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2254,6 +2322,11 @@ msgstr "Slutt" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Engelsk" @@ -2284,6 +2357,7 @@ msgstr "Lik" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Feil" @@ -2314,18 +2388,24 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "Feil" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: 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." -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, 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 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2359,7 +2439,7 @@ msgstr "Avslutt Dolphin med emulator" msgid "Export Failed" msgstr "Eksportering mislyktes" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "Eksporter Fil" @@ -2372,15 +2452,15 @@ msgstr "Eksporter Opptak" msgid "Export Recording..." msgstr "Eksporter Opptak..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "Eksporter Lagringsfil" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "Eksporter Wii-lagringsfil (Eksperimentiell)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "Eksporter alle lagringsfiler" @@ -2396,7 +2476,7 @@ msgstr "Eksporter lagringsfil som..." msgid "Extension" msgstr "Utvidelse" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "Ekstern Bildebuffer (EFB)" @@ -2408,44 +2488,44 @@ msgstr "Ekstra Parameter" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Ekstra Parameter nyttig kun i ''Metroid: Other M\"." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "Ekstraher Alle Filer..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "Ekstraher Applikasjonslaster..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "Ekstraher DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "Ekstraher Mappe..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "Ekstraher Fil..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "Ekstraher Partisjon..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "Ekstraherer %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "Ekstraherer Alle Filer" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "Ekstraherer Mappe" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "Ekstraherer..." @@ -2457,11 +2537,11 @@ msgstr "FIFO-Byte" msgid "FIFO Player" msgstr "FIFO-spiller" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "FRANKRIKE" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "FST-størrelse:" @@ -2473,11 +2553,11 @@ msgstr "Tilkobling Mislyktes!" msgid "Failed to Listen!!" msgstr "Lytting Mislyktes!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "Nedlasting av koder mislyktes." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Ekstrahering til %s mislyktes!" @@ -2594,18 +2674,28 @@ msgstr "Kunne ikke skrive header for %s" msgid "Failed to write header for file %d" msgstr "Kunne ikke skrive header for filen %d" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "Rask" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "Raske Mipmaps" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "Rask versjon av MMU. Fungerer ikke for alle spill." +#: Source/Core/Core/Src/Movie.cpp:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "Fifo-spiller" @@ -2614,7 +2704,7 @@ msgstr "Fifo-spiller" msgid "File Info" msgstr "Filinformasjon" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "Filen inneholder ingen koder." @@ -2647,16 +2737,16 @@ msgstr "Filen kjennes ikke igjen som et minnekort" msgid "File not compressed" msgstr "Filen ikke komprimert" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Ukjent åpenmodus: 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "Filsystem" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Filtypen 'ini' er ukjent! kan ikke åpnes!" @@ -2664,7 +2754,7 @@ msgstr "Filtypen 'ini' er ukjent! kan ikke åpnes!" msgid "First Block" msgstr "Første Blokk" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "Fiks Sjekksummer" @@ -2676,7 +2766,7 @@ msgstr "Tving 16:9" msgid "Force 4:3" msgstr "Tving 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "Tving Konsoll til NTSC-J" @@ -2709,7 +2799,7 @@ msgstr "" "\n" "Hvis usikker, la stå avslått." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2745,7 +2835,7 @@ msgstr "Stillbilde" msgid "Frame Advance" msgstr "Bilde-for-bilde Modus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "Spillopptak bruker FFV1" @@ -2757,7 +2847,7 @@ msgstr "Bilderekkevidde" msgid "Frame S&kipping" msgstr "Frame S&kipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Framelimit:" @@ -2765,10 +2855,11 @@ msgstr "Framelimit:" msgid "Frames To Record" msgstr "Bilder Til Opptak" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "Fri Utkikk" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2784,6 +2875,11 @@ msgstr "Fri Utkikk" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Fransk" @@ -2817,7 +2913,7 @@ msgstr "Konfigurer Logg" msgid "GCPad" msgstr "GC-kontroll" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "Spill-ID:" @@ -2833,15 +2929,15 @@ msgstr "Et spill kjører ikke!" msgid "Game not found!!" msgstr "Spill ikke funnet!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "Spill-spesifikke Innstillinger" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "SpillKonfigurasjon" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "GameCube" @@ -2852,6 +2948,7 @@ msgstr "Innstillinger for &GameCube-kontroll" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2859,6 +2956,9 @@ msgstr "Innstillinger for &GameCube-kontroll" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "GameCube-minnekort (*.raw,*.gcp)" @@ -2867,15 +2967,17 @@ msgid "Gamecube Pad settings" msgstr "Innstillinger for GameCube-kontroll" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Gecko-juksekoder" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" "GeckoKode mislyktes i å kjøre (CT%i CST%i) (%s)\n" "(Enten en dårlig kode, eller så støttes ikke kodeformatet.)" @@ -2884,6 +2986,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 @@ -2892,6 +2995,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Generelt" @@ -2900,6 +3006,7 @@ msgstr "Generelt" msgid "General Settings" msgstr "Generelle Innstillinger" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2915,6 +3022,11 @@ msgstr "Generelle Innstillinger" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Tysk" @@ -2953,7 +3065,7 @@ msgstr "" "\n" "Hvis usikker, la stå på." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Gresk" @@ -2985,7 +3097,7 @@ msgstr "Hacks" msgid "Header checksum failed" msgstr "Header-sjekksum feilet" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Hebraisk" @@ -3054,12 +3166,16 @@ msgstr "Konfigurer Snarveistaster" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Snarveistaster" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Ungarsk" @@ -3067,12 +3183,12 @@ msgstr "Ungarsk" msgid "Hybrid Wiimote" msgstr "Hybrid Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "IOCTL_ES_GETVIEWS: Forsøkte å få data fra en ukjent billett: %08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -3085,11 +3201,11 @@ msgstr "" "TitleID %016llx.\n" "Dolphin vil sannsynligvis krasje nå" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - dårlig destinasjon" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "Innstillinger for IPL" @@ -3105,15 +3221,15 @@ msgstr "IR-peker" msgid "IR Sensitivity:" msgstr "IR-sensitivitet:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "ISO-detaljer" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "ISO-mapper" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "ITALIA" @@ -3121,23 +3237,25 @@ msgstr "ITALIA" msgid "Icon" msgstr "Ikon" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "Hvis bilderatioen er erratisk, kan denne innstillingen hjelpe. (PÅ = " "Kompitabelt, AV = Raskt)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy 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." +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " +"Audio to throttle using the DSP (might fix audio clicks but can also cause " +"constant noise depending on the game)." msgstr "" "Hvis du setter Framelimit høyere enn spillets fulle hastighet (NTSC:60, " "PAL:50), må du også deaktivere Audio Throttle i DSP-innstillingene for å " @@ -3175,7 +3293,7 @@ msgstr "" "\n" "Hvis usikker, la stå avslått." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "Importer Lagringsfil" @@ -3224,7 +3342,7 @@ msgstr "" "\n" "Hvis usikker, la stå avslått." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "I spillet" @@ -3233,7 +3351,7 @@ msgid "In-Game" msgstr "I spillet" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info" @@ -3253,7 +3371,7 @@ msgstr "Sett Inn" msgid "Insert Encrypted or Decrypted code here..." msgstr "Sett Inn Kryptert eller Dekryptert kode her..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Sett inn SD-kort" @@ -3265,7 +3383,7 @@ msgstr "Sett inn navn her..." msgid "Install WAD" msgstr "Installer WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Installer til Wii Meny" @@ -3274,6 +3392,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "InstallExceptionHandler kalt, men denne plattformen støtter den ikke." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3283,14 +3402,17 @@ msgstr "InstallExceptionHandler kalt, men denne plattformen støtter den ikke." ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Installer WAD..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "Kontrollpanel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "Innstillinger for kontrollpanel" @@ -3315,11 +3437,11 @@ msgstr "Intern LZO-feil - lzo_init() mislyktes" msgid "Internal Resolution:" msgstr "Intern Oppløsning:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Interpreter (VELDIG treg)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "Intro" @@ -3336,7 +3458,7 @@ msgstr "Ugyldig verdi!" msgid "Invalid bat.map or dir entry" msgstr "Ugyldig bat.map eller mappesti" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "Ugyldig event-type %i" @@ -3356,14 +3478,15 @@ msgstr "" "%s\n" " Det kan hende du må re-dumpe dette spillet." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "Ugyldig opptaksfil" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "Ugyldig save state" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3379,27 +3502,32 @@ msgstr "Ugyldig save state" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italiensk" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "JAPAN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT Rekompilerer (anbefalt)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL eksperimentiell rekompilerer" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japansk" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "KOREA" @@ -3408,8 +3536,8 @@ msgstr "KOREA" msgid "Key" msgstr "Tast" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Koreansk" @@ -3427,7 +3555,7 @@ msgstr "L-Knappen" msgid "L-Analog" msgstr "Venstre-Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "Språk:" @@ -3480,7 +3608,7 @@ msgstr "" msgid "Less Than" msgstr "Mindre Enn" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "Begrens med FPS (bilder-per-sekund)" @@ -3488,7 +3616,7 @@ msgstr "Begrens med FPS (bilder-per-sekund)" msgid "Load" msgstr "Last inn" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "Last inn Kustomiserte Teksturer" @@ -3536,6 +3664,7 @@ msgstr "Last Inn Save State Slot 8" msgid "Load State..." msgstr "Last Inn Save State..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3557,6 +3686,13 @@ msgstr "Last inn Wii System Meny" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "Last inn Wii System Meny" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Last inn Wii System Meny %d %c" @@ -3583,7 +3719,7 @@ msgstr "Laster den spesifiserte filen (DOL,ELF,WAD,GCM,ISO)" msgid "Local" msgstr "Lokal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Lås CPU-tråder til Kjerner" @@ -3595,11 +3731,11 @@ msgstr "Logg" msgid "Log Configuration" msgstr "Konfigurer Logg" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Loggtyper" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Logger utdata" @@ -3629,7 +3765,7 @@ msgstr "" "MD5 mismatch\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "Ytelses-hack for MMU" @@ -3651,11 +3787,11 @@ msgstr "MadCatz Gameshark-filer(*.gcs)" msgid "Main Stick" msgstr "Hoved-joystick" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "Skaper-ID:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "Skaper:" @@ -3679,6 +3815,7 @@ msgstr "Memory Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3686,6 +3823,9 @@ msgstr "Memory Byte" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Minnekort" @@ -3722,7 +3862,7 @@ msgstr "" msgid "Menu" msgstr "Meny" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "Mic" @@ -3731,11 +3871,11 @@ msgstr "Mic" msgid "Min" msgstr "Minimum" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "Diverse" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Diverse Innstillinger" @@ -3756,7 +3896,7 @@ msgstr "" "\n" "Hvis usikker, la stå avslått." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "Mono-mellomrom tekst-font" @@ -3769,7 +3909,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3791,7 +3931,7 @@ msgstr "" msgid "Multiply" msgstr "Multipliser" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3883,6 +4023,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Opp" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3892,6 +4033,9 @@ msgstr "NP Opp" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3900,7 +4044,7 @@ msgstr "Navn:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Navn:" @@ -3914,7 +4058,7 @@ msgid "New Scan" msgstr "Nytt Søk" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "Neste Side" @@ -3926,7 +4070,7 @@ msgstr "Neste Søk" msgid "Nickname :" msgstr "Brukernavn :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "Intet Land (SDK)" @@ -3965,7 +4109,7 @@ msgstr "Ingen lagringsmappe funnet for tittel %s" msgid "None" msgstr "Ingen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Norsk Bokmål" @@ -3973,8 +4117,8 @@ msgstr "Norsk Bokmål" msgid "Not Equal" msgstr "Ikke Lik" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "Ikke Satt" @@ -3994,7 +4138,7 @@ msgstr "Ikke tilkoblet" msgid "Notes" msgstr "Notater" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "Notater:" @@ -4032,7 +4176,7 @@ msgstr "Objekt" msgid "Object Range" msgstr "Objekt Radius" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Av" @@ -4058,11 +4202,11 @@ msgstr "Kun %d blokker tilgjengelig" msgid "Open" msgstr "Åpne" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "Åpne &tilholdsmappe" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "Åpne Wii-&lagringsfil-mappe" @@ -4084,11 +4228,11 @@ msgstr "OpenAL: Kan ikke finne lyd-device" msgid "OpenAL: can't open device %s" msgstr "OpenAL: Kan ikke åpne device %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "OpenCL Teksturdekoder" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "OpenMP Teksturdekoder" @@ -4120,7 +4264,7 @@ msgstr "" "og importer lagringsfilene til et nytt minnekort\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "Annet" @@ -4172,19 +4316,20 @@ msgstr "Paragraf" msgid "Parameters" msgstr "Parametere" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partisjon %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Patcher" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Mappestier" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4197,6 +4342,10 @@ msgstr "Mappestier" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -4205,7 +4354,7 @@ msgstr "Pause" msgid "Per-Pixel Lighting" msgstr "Per-Pikselbelysning" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Perfekt" @@ -4218,6 +4367,7 @@ msgstr "Perspektiv %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 ======= @@ -4228,6 +4378,10 @@ msgstr "Perspektiv %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Spill" @@ -4241,7 +4395,7 @@ msgstr "Spill Opptak" msgid "Play/Pause" msgstr "Spill/Pause" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "Spillbar" @@ -4253,6 +4407,7 @@ msgstr "Avspillingsalterntiver" msgid "Players" msgstr "Spillere" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4262,6 +4417,9 @@ msgstr "Spillere" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Vennligst bekreft..." @@ -4273,23 +4431,23 @@ msgstr "Vennligst lag et persektiv før du lagrer" msgid "Plus-Minus" msgstr "Pluss-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Polsk" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Port 4" @@ -4298,11 +4456,11 @@ msgstr "Port 4" msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portugisisk" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portugisisk (Brasilsk)" @@ -4310,17 +4468,17 @@ msgstr "Portugisisk (Brasilsk)" msgid "Post-Processing Effect:" msgstr "postprosesseringseffekt:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4333,7 +4491,7 @@ msgstr "Forhåndssatte:" msgid "Prev Page" msgstr "Forrige Side" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "Forrige Side" @@ -4384,7 +4542,7 @@ msgstr "Høyre-analog" msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "RUSSLAND" @@ -4397,7 +4555,7 @@ msgstr "Rekkevidde" msgid "Read-only mode" msgstr "Les-kun-modus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "Ekte" @@ -4474,6 +4632,7 @@ msgstr "Oppdater liste" msgid "Refresh game list" msgstr "Oppdater spilliste" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4492,6 +4651,12 @@ msgstr "Oppdater spilliste" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Fjern" @@ -4544,11 +4709,11 @@ msgstr "Høyre Joystick" msgid "Rumble" msgstr "Rumble" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Kjør DSP LLE på en dedikert CPU-tråd (ikke anbefalt)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Russisk" @@ -4556,10 +4721,11 @@ msgstr "Russisk" msgid "Sa&ve State" msgstr "Lagre Sa&ve State" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "Sikker" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4569,6 +4735,9 @@ msgstr "Sikker" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Samplingsratio:" @@ -4626,12 +4795,12 @@ msgstr "Lagre Save State Slot 8" msgid "Save State..." msgstr "Lagre Save State..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Lagre som..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Lagre komprimert GCM/ISO" @@ -4639,11 +4808,11 @@ msgstr "Lagre komprimert GCM/ISO" msgid "Save current perspective" msgstr "Lagre nåværende perspektiv" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "Lagre dekomprimert GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Save State-film %s er korrupt, opptak avsluttes..." @@ -4652,6 +4821,7 @@ msgstr "Save State-film %s er korrupt, opptak avsluttes..." msgid "Scaled EFB Copy" msgstr "Skalert EFB-kopi" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4661,15 +4831,18 @@ msgstr "Skalert EFB-kopi" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Søker i %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "Søker etter ISO-filer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "Søker..." @@ -4685,12 +4858,12 @@ msgstr "Scroll Lock" msgid "Search Filter" msgstr "Søkefilter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Søk i Undermapper" -#: 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:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "Seksjon %s ikke funnet i SYSCONF" @@ -4700,6 +4873,7 @@ msgstr "Seksjon %s ikke funnet i SYSCONF" msgid "Select" msgstr "Velg" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4724,6 +4898,14 @@ msgstr "Velg Opptaksfil" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Velg Opptaksfil" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Velg en Wii WAD-fil å innstallere" @@ -4749,6 +4931,7 @@ msgstr "Velg flytvindu" msgid "Select the file to load" msgstr "Velg fil å laste" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 @@ -4765,19 +4948,26 @@ msgstr "Velg en save state å laste" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Velg lagringsfil" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Velg en save state å laste" +<<<<<<< HEAD <<<<<<< 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. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Velg en save state å lagre" @@ -4799,7 +4989,7 @@ msgstr "" "\n" "Hvis usikker, velg Automatisk." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Valgt font" @@ -4847,11 +5037,11 @@ msgstr "Sensorbarposisjon:" msgid "Separator" msgstr "Separatør" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Serbisk" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "Serieport 1 - Dette er porten enheter som nettadapter bruker" @@ -4860,11 +5050,11 @@ msgstr "Serieport 1 - Dette er porten enheter som nettadapter bruker" msgid "Set" msgstr "Sett" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "Sett som &standard-ISO" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "Sett som standard Minnekort %c" @@ -4874,7 +5064,7 @@ msgstr "Sett som standard Minnekort %c" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "SetARCode_IsActive: indeks er større enn AR-kodelistestørrelsen %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "Innstillinger..." @@ -4886,7 +5076,7 @@ msgstr "SetupWiiMem: Kan ikke finne konfigurasjonsfilen" msgid "Shake" msgstr "Rist" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "Kortnavn:" @@ -4915,7 +5105,7 @@ msgstr "Vis &Verktøylinje" msgid "Show Drives" msgstr "Vis DVD-stasjoner" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "Vis Kopieringsregioner for EFB" @@ -4931,7 +5121,7 @@ msgstr "Vis Frankrike" msgid "Show GameCube" msgstr "Vis GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "Vis Inndata" @@ -4947,7 +5137,7 @@ msgstr "Vis JAP" msgid "Show Korea" msgstr "Vis Korea" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "Vis Språk:" @@ -4967,7 +5157,7 @@ msgstr "Vis Plattformer" msgid "Show Regions" msgstr "Vis Regioner" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "Vis Statistikker" @@ -4987,11 +5177,11 @@ msgstr "Vis WAD" msgid "Show Wii" msgstr "Vis Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "Vis en bekreftelsesboks før spill stoppes." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 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 " @@ -5002,23 +5192,23 @@ msgstr "" "men det kan også forårsake\n" "at Dolphin plutselig krasjer uten noen forklaring." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "Vis første blokk" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "Vis lagringsblokker" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "Vis lagringskommentar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "Vis lagringsikon" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "Vis lagringstittel" @@ -5055,7 +5245,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Sideveis-pekende Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Simplifisert Kinesisk" @@ -5063,11 +5253,11 @@ msgstr "Simplifisert Kinesisk" msgid "Size" msgstr "Størrelse" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "Dropp BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "Dropp Dest. Alpha Pass" @@ -5109,11 +5299,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Slot B" @@ -5136,7 +5326,7 @@ msgstr "" "Det er kun nyttig for å debugge.\n" "Vil du virkelig benytte programvarerendering? Hvis usikker, velg 'nei'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "Innstillinger for Audio" @@ -5154,6 +5344,7 @@ msgstr "Laging av lydbuffer mislyktes: %s" msgid "Space" msgstr "Mellomrom" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5169,6 +5360,11 @@ msgstr "Mellomrom" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Spansk" @@ -5199,7 +5395,7 @@ msgstr "" msgid "Specify a video backend" msgstr "Spesifiser en programvareutvidelse for video" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Øk diskoverføringshatighet" @@ -5207,7 +5403,7 @@ msgstr "Øk diskoverføringshatighet" msgid "Square Stick" msgstr "Kvadrat-joystick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "Standardkontroller" @@ -5305,12 +5501,12 @@ msgstr "Importering av lagringsfiler vellykket" msgid "Swing" msgstr "Sving" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Systemspråk:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "TAIWAN" @@ -5350,7 +5546,7 @@ msgstr "Tabell Høyre" msgid "Take Screenshot" msgstr "Ta Skjermbilde" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -5366,7 +5562,7 @@ msgstr "Tekstur" msgid "Texture Cache" msgstr "Tekstur-cache" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "Teksturformat Overlegg" @@ -5382,13 +5578,13 @@ msgstr "Adressen er ugyldig" msgid "The checksum was successfully fixed" msgstr "Fiksing av sjekksummen var vellykket" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "Den valgte mappen finnes allerede i listen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5411,7 +5607,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "Filen %s er allerede åpen, fil-headeren vil ikke bli skrevet." -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Filen du spesifiserte (%s) eksisterer ikke" @@ -5429,11 +5625,12 @@ msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "Den dekrypterte AR-koden inneholder ingen linjer." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#, fuzzy msgid "" "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." +"If unsure, use the rightmost value." msgstr "" "Jo tryggere du setter denne, jo mindre sannsynlig er det at emulatoren " "mangler noen teksturoppdateringer fra RAM.\n" @@ -5476,7 +5673,7 @@ msgstr "Den spesifiserte filen \"%s\" eksisterer ikke" msgid "The value is invalid" msgstr "Verdien er ugyldig" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Tema" @@ -5484,14 +5681,14 @@ msgstr "Tema" msgid "Theme selection went wrong" msgstr "Velging av tema gikk feil" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." msgstr "" "Det må være en billett for 00000001/00000002. Din NAND-dump er ukomplett." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5507,7 +5704,7 @@ msgstr "" "Denne Action Replay-simulatoren støtter ikke koder som modifiserer selve " "Action Replay." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "Dette kan føre til ytelsesreduksjon i Wii Meny og noen spill." @@ -5530,25 +5727,11 @@ msgstr "" "Hvis usikker, la stå avslått." #: 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" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" -"Dette brukes for å kontrollere spillets bildefrekvens via Audio Throttle.\n" -"Deaktivering av denne kan forårsake unormal bildefrekvens, kanskje for høy.\n" -"Men å aktivere den kan noen ganger foråsake konstant bråk.\n" -"\n" -"Tastatursnarvei : Hold nede for å deaktivere Audio Throttle." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "" "Dette formatet brukes for å spille musikkspor, som bakgrunnsmusikk (BGM)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5560,7 +5743,7 @@ msgstr "" "Øker ytelsen på datamaskiner med mer enn én kjerne,\n" "men kan også føre til feil/krasj." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "Dette lar deg manuelt endre INI-konfigurasjonsfilen" @@ -5583,7 +5766,7 @@ msgstr "Tittel" msgid "To" msgstr "Til" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "Vipp Alle Loggtyper" @@ -5603,6 +5786,7 @@ msgstr "Vipp Mellom Vindu/Fullskjerm" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5610,14 +5794,17 @@ msgstr "Vipp Mellom Vindu/Fullskjerm" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Topp" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Tradisjonell Kinesisk" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "Forsøkte å laste en ukjent filtype." @@ -5625,7 +5812,7 @@ msgstr "Forsøkte å laste en ukjent filtype." msgid "Triggers" msgstr "Triggere" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Forsøker å lese fra ugyldig SYSCONF" @@ -5637,7 +5824,7 @@ msgstr "" "Forsøker å lese fra ugyldig SYSCONF\n" "Wiimote bt ids er ikke tilgjengelig" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Tyrkisk" @@ -5658,11 +5845,11 @@ msgstr "UDP Port:" msgid "UDP Wiimote" msgstr "UDP Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "UKJENT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "USA" @@ -5745,7 +5932,7 @@ msgstr "Oppdater" msgid "Upright Wiimote" msgstr "Mot-skjerm-pekende Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Bruk EuRGB60-modus (PAL60)" @@ -5757,7 +5944,7 @@ msgstr "Bruk Fullskjerm" msgid "Use Hex" msgstr "Bruk Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Bruk Panikkadvarslere" @@ -5788,7 +5975,7 @@ msgstr "" "\n" "Hvis usikker, la stå avslått." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "Verktøyet" @@ -5812,25 +5999,29 @@ msgstr "Verdi:" msgid "Verbosity" msgstr "Verbøsitet" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Video" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Virtuell" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Volum" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "WAD-installasjon feilet: Skaper feil %s" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "WAD-installasjon feilet: Skaper feil %s" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5849,15 +6040,15 @@ msgstr "" msgid "Warning" msgstr "Advarsel" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "Advarsel - starter DOL i feil konsollmodus!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Advarsel - starter ELF i feil konsollmodus!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Advarsel - starter ISO i feil konsollmodus!" @@ -5885,7 +6076,7 @@ msgstr "" "og har samme navn som en fil på ditt minnekort\n" "Fortsette?" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5893,7 +6084,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5901,7 +6092,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5929,7 +6120,7 @@ msgstr "WaveFileWriter - fil ikke åpen." msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "Widescreen Hack" @@ -5937,15 +6128,15 @@ msgstr "Widescreen Hack" msgid "Width" msgstr "Bredde" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Wii-konsoll" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Wii NAND-rot:" @@ -5953,6 +6144,7 @@ msgstr "Wii NAND-rot:" msgid "Wii Save Import" msgstr "Importer Wii-lagringsfil" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5962,6 +6154,9 @@ msgstr "Importer Wii-lagringsfil" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii-lagringsfiler (*.bin)|*.bin" @@ -6029,10 +6224,11 @@ msgstr "Windows Meny" msgid "Windows Right" msgstr "Windows Høyre" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "Ordkrumning" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -6048,6 +6244,11 @@ msgstr "Ordkrumning" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Arbeider..." @@ -6055,6 +6256,11 @@ msgstr "Arbeider..." msgid "Write to Console" msgstr "Skriv til Konsoll" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "Skriv til Fil" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "Skriv til Fil" @@ -6108,7 +6314,7 @@ msgstr "Du må skrive inn en gyldig desimal, hexadesimal eller octal verdi." msgid "You must enter a valid profile name." msgstr "Du må skrive inn et gyldig profilnavn." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Du må restarte Dolphin for at endringen skal tre i kraft." @@ -6131,7 +6337,7 @@ msgstr "" "Den skal være 0x%04x (men er 0x%04llx)\n" "Ønsker du å generere en ny en?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "ZTP-hack" @@ -6201,7 +6407,7 @@ msgstr "" msgid "^ ADD" msgstr "^ LEGG TIL" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "applikasjonslaster (.img)" @@ -6232,12 +6438,12 @@ msgstr "ikke en Wii-lagringsfil eller lesefeil for fil-header-størrelse %x" msgid "s" msgstr "s" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "ukjent cmd 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute returnerte -1 på applikasjonskjøring!" @@ -6401,6 +6607,9 @@ msgstr "| ELLER" #~ msgid "Emulator Display Settings" #~ msgstr "Innstillinger for Emulasjonsvisning" +#~ msgid "Enable Audio Throttle" +#~ msgstr "Aktiver Audio Throttle" + #~ msgid "Enable CPU Access" #~ msgstr "Aktiver CPU Access" @@ -6714,6 +6923,21 @@ msgstr "| ELLER" #~ msgid "The file " #~ msgstr "Filen" +#~ msgid "" +#~ "This is used to control game speed by sound throttle.\n" +#~ "Disabling this could cause abnormal game speed, such as too fast.\n" +#~ "But sometimes enabling this could cause constant noise.\n" +#~ "\n" +#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." +#~ msgstr "" +#~ "Dette brukes for å kontrollere spillets bildefrekvens via Audio " +#~ "Throttle.\n" +#~ "Deaktivering av denne kan forårsake unormal bildefrekvens, kanskje for " +#~ "høy.\n" +#~ "Men å aktivere den kan noen ganger foråsake konstant bråk.\n" +#~ "\n" +#~ "Tastatursnarvei : Hold nede for å deaktivere Audio Throttle." + #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "" #~ "Dette formatet brukes vanligvis til å spille stemme- og lyd- effekter." diff --git a/Languages/po/nl.po b/Languages/po/nl.po index f6c2081f53..017f33c5c1 100644 --- a/Languages/po/nl.po +++ b/Languages/po/nl.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -16,6 +17,9 @@ msgstr "" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Update from master branch. +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-08-07 16:43+0100\n" "Last-Translator: Goost \n" "Language-Team: DevPro Team. \n" @@ -59,9 +63,9 @@ msgstr "\"%s\" is een onjuist GCM/ISO bestand of het is geen GC/Wii ISO." msgid "%1$sCopy%1$s" msgstr "%1$sKopieer%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -153,7 +157,7 @@ msgstr "%sExporteer GCI%s" msgid "%sImport GCI%s" msgstr "%sImporteer GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, fuzzy, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%d Vrije Blokken; %d Vrije Bestands Ingangen" @@ -186,11 +190,11 @@ msgstr "&Cheats Manager" msgid "&DSP Settings" msgstr "&DSP Instellingen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&Verwijder ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&Verwijder geselecteerde ISOs ..." @@ -254,7 +258,7 @@ msgstr "&Pauze" msgid "&Play" msgstr "&Speel " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&Eigenschappen " @@ -298,7 +302,7 @@ msgstr "&Bekijk " msgid "&Wiimote Settings" msgstr "&Wiimote Instellingen " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "" @@ -342,7 +346,7 @@ msgstr " " msgid "" msgstr " " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -351,7 +355,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -409,13 +413,13 @@ msgstr "" "\n" "Je moet de TCP poort forwarden voor het hosten!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "AR Codes" @@ -427,11 +431,11 @@ msgstr "Over Dolphin" msgid "Acceleration" msgstr "Acceleratie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Accurate VBeam emulatie" @@ -552,11 +556,11 @@ msgstr "Adapter:" msgid "Add" msgstr "Voeg toe" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "Voeg ActionReplay Code toe" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "Voeg Patch toe" @@ -564,6 +568,7 @@ msgstr "Voeg Patch toe" msgid "Add new pane" msgstr "Voeg een nieuwe paneel toe" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -579,6 +584,11 @@ msgstr "Voeg een nieuwe paneel toe" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Voeg toe..." @@ -626,11 +636,11 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "Stel de vereiste analoge control druk in om de knop te activeren." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "Geavanceerd" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Geavanceerde Instellingen" @@ -638,14 +648,15 @@ msgstr "Geavanceerde Instellingen" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Alle GC/Wii bestanden (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Alle GC/Wii images (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "Alle Gamecube GCM bestanden (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -658,18 +669,22 @@ msgstr "Alle Gamecube GCM bestanden (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Alle Opgeslagen Staten (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "Alle Wii ISO Bestanden (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Alle gecomprimeerde GC/Wii ISO-bestanden (GCZ)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "Alle Bestanden (*.*)|*.*" @@ -685,7 +700,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "Geëmuleerde Wiimote" @@ -707,7 +722,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "Applader is niet in staat om van bestand te laden" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Applader:" @@ -725,7 +740,7 @@ msgstr "" "\n" "In geval van twijfel selecteer (uit)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Arabisch" @@ -734,7 +749,7 @@ msgstr "Arabisch" msgid "Are you sure you want to delete \"%s\"?" msgstr "Weet je zeker dat je \"%s\"? wilt verwijderen?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -742,12 +757,13 @@ msgstr "" "Weet je zeker dat je dit bestand wilt verwijderen?\n" "Deze gegevens zijn niet terug te halen!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Weet je zeker dat je dit bestand wilt verwijderen? Deze gegevens zijn niet " "terug te halen!" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -757,6 +773,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Beeldverhouding:" @@ -765,18 +784,20 @@ msgstr "Beeldverhouding:" msgid "At least one pane must remain open." msgstr "Er moet tenminste één paneel open blijven." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Geluid" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Geluid Backend:" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Fout bij het openen van een AO toestel. \n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -786,6 +807,9 @@ msgstr "AudioCommon: Fout bij het openen van een AO toestel. \n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -824,7 +848,7 @@ msgstr "" msgid "Back" msgstr "Terug" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Backend Instellingen" @@ -851,11 +875,11 @@ msgstr "Verkeerde bestands header" msgid "Banner" msgstr "Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "Banner Details" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "Banner:" @@ -867,7 +891,7 @@ msgstr "Balk" msgid "Basic" msgstr "Basis" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Basis Instellingen" @@ -898,6 +922,7 @@ msgstr "Blauw Rechts" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -905,6 +930,9 @@ msgstr "Blauw Rechts" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Onder" @@ -913,7 +941,7 @@ msgstr "Onder" msgid "Bound Controls: %lu" msgstr "Gekoppelde controls: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Defect" @@ -929,7 +957,7 @@ msgstr "Zoek een folder om toe te voegen" msgid "Browse for an ISO directory..." msgstr "Zoek een ISO folder" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "Zoek een uitvoer folder" @@ -959,11 +987,11 @@ msgstr "C Stick" msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "CPU Emulatie Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "Activeer scherm lijst caching." @@ -1015,7 +1043,7 @@ msgstr "Kan %s niet openen" msgid "Cannot unregister events with events pending" msgstr "Kan geen events afmelden als er events in afwachting zijn" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1025,7 +1053,7 @@ msgstr "" "Kan dat bestand niet als geheugenkaart gebruiken. \n" "Probeer je hetzelfde bestand in beide slots te gebruiken?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1043,8 +1071,6 @@ msgstr "Kan WiiMOte niet via bd vinden: %02x:%02x:%02x:%02x:%02x:%02x" msgid "Cant find WiiMote by connection handle %02x" msgstr "Kan WiiMote met verbinding handle %02x niet vinden" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1054,7 +1080,7 @@ msgstr "Kan niet lezen van DVD_Plugin - DVD-Interface: Fatal Error" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "Catalaans" @@ -1079,7 +1105,7 @@ msgstr "Verander Schijf" msgid "Change Game" msgstr "Spel veranderen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1095,8 +1121,8 @@ msgstr "Verandert teken van zVer parameter (na correctie)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Verandert teken van zDichtbij parameter (na correctie)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "Het heeft geen effect als je dit veranderd wanneer de emulator draait!" @@ -1116,31 +1142,31 @@ msgstr "Cheat Zoeken" msgid "Cheats Manager" msgstr "Cheats Manager" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Chinees (Vereenvoudigd)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Chinees (Traditioneel)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "Kies een DVD Station:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "Kies een NAND basismap:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Kies een standaard ISO:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "Kies een folder om toe te voegen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Kies een bestand om te openen" @@ -1148,7 +1174,7 @@ msgstr "Kies een bestand om te openen" msgid "Choose a memory card:" msgstr "Kies een geheugen kaart:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1156,8 +1182,8 @@ msgstr "" "Kies Bestand te gebruiken als apploader: (geldt voor disks die alleen mappen " "uit mappen zijn opgebouwd)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Kies de folder om naar uit te pakken" @@ -1169,14 +1195,14 @@ msgstr "Cirkel Stick" msgid "Classic" msgstr "Klassiek" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "Legen" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "Legen mislukt." @@ -1192,6 +1218,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 @@ -1200,6 +1227,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Sluit" @@ -1223,20 +1254,20 @@ msgstr "Commando" msgid "Comment" msgstr "Reactie" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Reactie:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "Comprimeer ISO ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Comprimeer geselecteerde ISO's ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "ISO wordt gecomprimeerd" @@ -1263,13 +1294,13 @@ msgstr "Configureer Besturing Pads" msgid "Configure..." msgstr "Configureer..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "Bevestig om bestand over te schrijven." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 #, fuzzy msgid "Confirm on Stop" msgstr "Bevestiging om te stoppen" @@ -1279,7 +1310,7 @@ msgstr "Bevestiging om te stoppen" msgid "Connect" msgstr "Verbind" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "Verbind USB Toetsenbord" @@ -1336,12 +1367,12 @@ msgstr "Omzetten naar GCI" msgid "Copy failed" msgstr "Kopiëren mislukt" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "Kopieer naar MemKaart %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "Core" @@ -1371,7 +1402,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Kon ISO bestand %s niet herkennen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "Kon %s niet opslaan" @@ -1385,7 +1416,7 @@ msgstr "" "draait nog!\n" "(pads instellen terwijl het spel draait wordt nog niet ondersteund)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1398,7 +1429,7 @@ msgstr "" "Draai je Dolphin vanaf een CD/DVD, of is het bestand misschien beveiligd " "tegen schrijven?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "Kon geen open commando vinden voor extensie 'ini'!" @@ -1415,7 +1446,7 @@ msgstr "" msgid "Count:" msgstr "Tel:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "Land:" @@ -1429,25 +1460,25 @@ msgstr "Maak AR Code" msgid "Create new perspective" msgstr "Maak een nieuwe perspective" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "Gemaakt door KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "Gemaakt door [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "Gemaakt door VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" "Gemaakt door black_rider and published on ForumW.org > Web Developments" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "Auteur:" @@ -1455,7 +1486,7 @@ msgstr "Auteur:" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "Bijsnijden" @@ -1478,7 +1509,7 @@ msgstr "" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Huidige map veranderd van %s naar %s na wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "Aangepaste Projectie Hack" @@ -1486,11 +1517,11 @@ msgstr "Aangepaste Projectie Hack" msgid "Custom Projection Hack Settings" msgstr "Aangepaste Projectie Instellingen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "Pas sommige orthogonale projectie parameters aan." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Tsjechisch" @@ -1502,10 +1533,11 @@ msgstr "D-Pad" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "DSP Emulator Motor" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1516,18 +1548,22 @@ msgstr "DSP Emulator Motor" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulatie (snel)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE Interpreteer (Behoorlijk langzaam)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "DSP LLE op Thread" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP LLE hercompileerder" @@ -1535,15 +1571,23 @@ msgstr "DSP LLE hercompileerder" msgid "DSP settings" msgstr "DSP Instellingen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "DVD Station:" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "Data grootte" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "Datum:" @@ -1564,7 +1608,7 @@ msgstr "Dode Zone" msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 #, fuzzy msgid "Debugging" msgstr "Debug" @@ -1573,16 +1617,16 @@ msgstr "Debug" msgid "Decimal" msgstr "Decimaal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "Decomprimeer ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "Decomprimeer geselecteerde ISOs" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "Decomprimeer ISO" @@ -1590,11 +1634,11 @@ msgstr "Decomprimeer ISO" msgid "Default" msgstr "Standaard" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "Standaard ISO:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "Standaard font" @@ -1603,7 +1647,7 @@ msgstr "Standaard font" msgid "Delete" msgstr "Verwijder" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "Verwijder Save" @@ -1612,7 +1656,7 @@ msgstr "Verwijder Save" msgid "Delete the existing file '%s'?" msgstr "Verwijder het bestaande bestand '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "Beschrijving" @@ -1620,8 +1664,8 @@ msgstr "Beschrijving" msgid "Detect" msgstr "Detect" -#: 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 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." @@ -1634,8 +1678,8 @@ msgstr "" msgid "Device" msgstr "Apparaat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Apparaat Instellingen" @@ -1660,24 +1704,24 @@ msgstr "" " en map backup checksum is mislukt" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 #, fuzzy msgid "Disable" msgstr "Schakel Fog uit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "Schakel Fog uit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "Schakel Lighting uit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "Schakel Pixel Diepte uit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "Schakel Textures uit" @@ -1721,7 +1765,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Schijf" @@ -1748,6 +1792,7 @@ msgstr "" msgid "Divide" msgstr "Verdelen" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1757,10 +1802,13 @@ msgstr "Verdelen" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Wil je de emulatie stoppen?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1785,6 +1833,7 @@ msgstr "Dolphin Geëmuleerde Wiimote configuratie" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1809,6 +1858,14 @@ msgstr "Dolphin GCPad Configuratie" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GCPad Configuratie" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Film (*.dtm)" @@ -1840,11 +1897,11 @@ msgstr "" msgid "Down" msgstr "Omlaag" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "Download Codes (WiiRD Database)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "%lu codes gedownload. (%lu toegevoegd)" @@ -1853,23 +1910,23 @@ msgstr "%lu codes gedownload. (%lu toegevoegd)" msgid "Drums" msgstr "Drums" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "Pop" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "Dump Geluid" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "Dump EFB Doel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "Dump Frames" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "Dump texturen" @@ -1903,6 +1960,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1918,6 +1976,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Nederlands" @@ -1941,7 +2004,7 @@ msgstr "" "versie %d. %d -- Als je recentelijk Dolphin hebt geupgrade is het mogelijk " "dat je Windows moet herstarten om deze de driver te laten detecteren." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "EUROPA" @@ -1957,7 +2020,7 @@ msgstr "Wijzig" msgid "Edit ActionReplay Code" msgstr "Wijzig ActionReplay Code" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Wijzig Configuratie" @@ -1969,8 +2032,8 @@ msgstr "Wijzig Patch" msgid "Edit current perspective" msgstr "Wijzig het huidige perspectief" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "Wijzig..." @@ -2020,7 +2083,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Geëmuleerde Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "Emulatie Staat:" @@ -2048,23 +2111,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "Activeer AR Logging" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "Activeer Audio Throttle" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "Activeer BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Activeer Block Merging" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -2078,6 +2141,7 @@ msgstr "" msgid "Enable Cache" msgstr "Activeer Cache" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2087,51 +2151,54 @@ msgstr "Activeer Cache" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Activeer Cheats" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "Activeer DTK Muziek" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Activeer Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Activeer Dual Core (verhoogt de snelheid)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "Activeer Sneltoetsen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Activeer Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Activeer Idle Skipping (verhoogt de snelheid)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Activeer MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "Activeer Progressive Scan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "Activeer Schermbeveiliger" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "Activeer BreedBeeld" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "Activeer Wireframe" @@ -2149,7 +2216,7 @@ msgstr "" "\n" "In geval van twijfel selecteer 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2157,7 +2224,7 @@ msgstr "" "Activeer snelle schijf toegang. Nodig voor een aantal spelletjes. (AAN = " "Snel, UIT = Compatibel)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "Activeer Pagina's" @@ -2185,7 +2252,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2193,7 +2260,7 @@ msgstr "" "Activeer dit om The Legend of Zelda: Twilight Princess te versnellen. " "Uitschakelen voor elk ander spel." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2203,7 +2270,7 @@ msgstr "" "Management Unit. Nauwkeurig voor de hardware, maar langzaam te emuleren. " "(AAN = Compatibel, UIT = Snel)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "Schakelt aangepaste projectie hack in" @@ -2220,7 +2287,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2242,6 +2309,7 @@ msgstr "" msgid "End" msgstr "Einde" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2257,6 +2325,11 @@ msgstr "Einde" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Engels" @@ -2287,6 +2360,7 @@ msgstr "Gelijk" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Error (Fout)" @@ -2317,20 +2391,26 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "Error (Fout)" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "Fout bij het laden van de geselecteerde taal. Dolphin zal terugvallen op de " "systeemtaal." -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, 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 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2365,7 +2445,7 @@ msgstr "Sluit Dolphin met emulator" msgid "Export Failed" msgstr "Exporteren Mislukt" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "Exporteer Bestand" @@ -2378,15 +2458,15 @@ msgstr "Exporteer Opname..." msgid "Export Recording..." msgstr "Exporteer Opname..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "Exporteer Save" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "Exporteer Wii save (Experimenteel)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "Exporteer alle saves..." @@ -2402,7 +2482,7 @@ msgstr "Exporteer save als..." msgid "Extension" msgstr "Extensie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "Externe Frame Buffer" @@ -2414,44 +2494,44 @@ msgstr "Extra Parameter" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Extra parameter, alleen nuttig in \"Metroid: Other M\"." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "Alle Bestanden Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "Apploader Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "DOL Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "Map Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "Bestand Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "Partitie Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "%s Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "Alle Bestanden Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "Uitpakken van de map" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "Uitpakken..." @@ -2463,11 +2543,11 @@ msgstr "FIFO Byte" msgid "FIFO Player" msgstr "FIFO Speler" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "Frankrijk" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "FST Groote:" @@ -2479,11 +2559,11 @@ msgstr "Verbinden Mislukt!" msgid "Failed to Listen!!" msgstr "Luisteren Mislukt!!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "Mislukt om de codes te downloaden." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Mislukt om naar %s uit te pakken!" @@ -2601,19 +2681,29 @@ msgstr "Het schrijven van header voor %s is mislukt" msgid "Failed to write header for file %d" msgstr "Het schrijven van header voor bestanden %d is mislukt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "Snel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 #, fuzzy msgid "Fast Mipmaps" msgstr "Laad Native Mipmaps" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "Snelle versie van de MMU. Werkt niet voor elk spel." +#: Source/Core/Core/Src/Movie.cpp:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "Fifo Speler" @@ -2622,7 +2712,7 @@ msgstr "Fifo Speler" msgid "File Info" msgstr "Bestands Info" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "Bestand bevat geen codes." @@ -2655,16 +2745,16 @@ msgstr "Bestand is niet herkend als geheugenkaart" msgid "File not compressed" msgstr "Bestand niet gecompressed" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Onbekende open mode: 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "Bestand systeem" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Bestandstype 'ini' is onbekend! Kan niet openen!" @@ -2672,7 +2762,7 @@ msgstr "Bestandstype 'ini' is onbekend! Kan niet openen!" msgid "First Block" msgstr "Eerste Blok" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "Herstel Checksums" @@ -2684,7 +2774,7 @@ msgstr "Forceer 16:9" msgid "Force 4:3" msgstr "Forceer 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 #, fuzzy msgid "Force Console as NTSC-J" msgstr "Stel Console in als NTSC-J" @@ -2718,7 +2808,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2755,7 +2845,7 @@ msgstr "" msgid "Frame Advance" msgstr "Frame Geavanceerd" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "Frame Dumps gebruiken FFV1" @@ -2767,7 +2857,7 @@ msgstr "Frame Bereik" msgid "Frame S&kipping" msgstr "Frame O&verslaan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Framelimiet:" @@ -2775,10 +2865,11 @@ msgstr "Framelimiet:" msgid "Frames To Record" msgstr "Frames om op te nemen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "Vrije kijk" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2794,6 +2885,11 @@ msgstr "Vrije kijk" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Frans" @@ -2828,7 +2924,7 @@ msgstr "Logboek configuratie" msgid "GCPad" msgstr "GCPad" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "Spel ID:" @@ -2844,15 +2940,15 @@ msgstr "Het spel draait niet!" msgid "Game not found!!" msgstr "Spel niet gevonden!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "Spel Specifieke Instellingen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Spel Config" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" @@ -2863,6 +2959,7 @@ msgstr "Gamecube &Pad Instellingen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2870,6 +2967,9 @@ msgstr "Gamecube &Pad Instellingen" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube Memory Kaarten (*.raw,*.gcp)" @@ -2878,15 +2978,17 @@ msgid "Gamecube Pad settings" msgstr "Gamecube Pad Instellingen" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Gecko Codes" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" "GeckoCode kon niet draaien (CT%i CST%i) (%s)\n" "(ofwel een onjuiste code of het type code is nog niet ondersteund.)" @@ -2901,8 +3003,12 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Algemeen" @@ -2911,6 +3017,7 @@ msgstr "Algemeen" msgid "General Settings" msgstr "Algemene Instellingen" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2926,6 +3033,11 @@ msgstr "Algemene Instellingen" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Duits" @@ -2964,7 +3076,7 @@ msgstr "" "\n" "In geval van twijfel ingevuld laten." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Grieks" @@ -2996,7 +3108,7 @@ msgstr "" msgid "Header checksum failed" msgstr "Header checksum is mislukt" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Hebreeuws" @@ -3065,12 +3177,16 @@ msgstr "Sneltoets Configuratie" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Hotkeys" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Hongaarse" @@ -3078,14 +3194,14 @@ msgstr "Hongaarse" msgid "Hybrid Wiimote" msgstr "Hybride Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS: Poging tot verkrijgen van data van een onbekende ticket: " "%08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -3098,11 +3214,11 @@ msgstr "" "TitleID %016llx.\n" "Dolphin zal waarschijnlijk blijven hangen." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - onjuiste bestemming" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "IPL Instellingen" @@ -3118,15 +3234,15 @@ msgstr "IR Aanwijzer" msgid "IR Sensitivity:" msgstr "IR Gevoeligheid:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "ISO Details" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "ISO Map" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "ITALIË" @@ -3134,23 +3250,25 @@ msgstr "ITALIË" msgid "Icon" msgstr "Icoon" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "Als de FPS onregelmatig is dan kan deze optie helpen. (AAN = Veilig, UIT = " "Snel)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy 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." +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " +"Audio to throttle using the DSP (might fix audio clicks but can also cause " +"constant noise depending on the game)." msgstr "" "Als je de Framelimiet hoger zet dan de snelheid van het spel (NTSC: 60, PAL: " "50),\n" @@ -3188,7 +3306,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "Importeer Save" @@ -3239,7 +3357,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "In Game" @@ -3248,7 +3366,7 @@ msgid "In-Game" msgstr "In-Game" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info" @@ -3268,7 +3386,7 @@ msgstr "Toevoegen" msgid "Insert Encrypted or Decrypted code here..." msgstr "Voer Gecodeerde of Gedecodeerde code hier in..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Schakel SD Card in" @@ -3280,7 +3398,7 @@ msgstr "Voeg naam hier toe" msgid "Install WAD" msgstr "Installeer WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Installeren in Wii-menu" @@ -3291,6 +3409,7 @@ msgstr "" "InstallExceptionHandler opgeroepen, maar dit platform ondersteund dit nog " "niet." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3300,15 +3419,18 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "WAD aan het installeren..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 #, fuzzy msgid "Interface" msgstr "Interface Instellingen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "Interface Instellingen" @@ -3333,11 +3455,11 @@ msgstr "Interne LZO fout - lzo_init() is mislukt" msgid "Internal Resolution:" msgstr "Interne Resolutie:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Interpreteer (Behoorlijk langzaam)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "Intro" @@ -3354,7 +3476,7 @@ msgstr "Onjuiste waarde!" msgid "Invalid bat.map or dir entry" msgstr "Onjuiste bat.map of map vermelding" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "Onjuist event type %i" @@ -3374,14 +3496,15 @@ msgstr "" "%s\n" "Wellicht moet je dit spel opnieuw dumpen" -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "Onjuist opname bestand" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "Onjuiste staat" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3397,27 +3520,32 @@ msgstr "Onjuiste staat" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italië" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "JAPAN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT Recompiler (aanbevolen)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL experimentele recompiler" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japans" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "KOREA" @@ -3426,8 +3554,8 @@ msgstr "KOREA" msgid "Key" msgstr "Toets" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Koreaans" @@ -3445,7 +3573,7 @@ msgstr "L Knop" msgid "L-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "Taal:" @@ -3498,7 +3626,7 @@ msgstr "" msgid "Less Than" msgstr "Minder dan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "Limiteer met behulp van FPS" @@ -3506,7 +3634,7 @@ msgstr "Limiteer met behulp van FPS" msgid "Load" msgstr "Laad" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "Laad Aangepaste Textures" @@ -3554,6 +3682,7 @@ msgstr "Laad staat 8" msgid "Load State..." msgstr "Laad staat..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3563,10 +3692,14 @@ msgstr "Laad staat..." ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "Laad Wii System Menu(%d %c)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 @@ -3576,6 +3709,9 @@ msgstr "Laad Wii System Menu(%d %c)" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Laad Wii System Menu(%d %c)" @@ -3602,7 +3738,7 @@ msgstr "Laad het opgegeven bestand (DOL, ELF, GCM, ISO, WAD)" msgid "Local" msgstr "Lokaal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Vergrendel Threads aan CPU cores" @@ -3614,11 +3750,11 @@ msgstr "Logboek" msgid "Log Configuration" msgstr "Logboek configuratie" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Log Types" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Logger Uitvoer" @@ -3648,7 +3784,7 @@ msgstr "" "Verkeerde MD5\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU Snelheids Hack" @@ -3670,11 +3806,11 @@ msgstr "MadCatz Gameshark bestanden(*.gcs)" msgid "Main Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "Maker ID:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "Maker:" @@ -3698,6 +3834,7 @@ msgstr "Geheugen Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3705,6 +3842,9 @@ msgstr "Geheugen Byte" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Geheugen Kaart" @@ -3741,7 +3881,7 @@ msgstr "" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "Microfoon" @@ -3750,11 +3890,11 @@ msgstr "Microfoon" msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "Overig" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Overige Instellingen" @@ -3775,7 +3915,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "Niet-proportioneel (monospace) lettertype" @@ -3788,7 +3928,7 @@ msgstr "" msgid "Motor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3811,7 +3951,7 @@ msgstr "" msgid "Multiply" msgstr "Vermenigvuldigen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3903,6 +4043,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Omhoog" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3912,6 +4053,9 @@ msgstr "NP Omhoog" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3920,7 +4064,7 @@ msgstr "Naam:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Naam:" @@ -3934,7 +4078,7 @@ msgid "New Scan" msgstr "Nieuwe Scan" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "Volgende Pagina" @@ -3946,7 +4090,7 @@ msgstr "Volgende Scan" msgid "Nickname :" msgstr "Gebruikersnaam :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "Geen land (SDK)" @@ -3985,7 +4129,7 @@ msgstr "Geen save map gevonden voor titel %s" msgid "None" msgstr "Geen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Noorweegse Bokmaal" @@ -3993,8 +4137,8 @@ msgstr "Noorweegse Bokmaal" msgid "Not Equal" msgstr "Niet gelijk" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "Niet ingesteld" @@ -4014,7 +4158,7 @@ msgstr "Niet verbonden" msgid "Notes" msgstr "Opmerkingen" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "Opmerkingen:" @@ -4052,7 +4196,7 @@ msgstr "" msgid "Object Range" msgstr "Object Bereik" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Uit" @@ -4078,11 +4222,11 @@ msgstr "Er zijn maar %d blocks beschikaarr" msgid "Open" msgstr "Open" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "Open &bevattende map" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "Open Wii &save map" @@ -4104,11 +4248,11 @@ msgstr "OpenAL: Kan geen geluids devices vinden" msgid "OpenAL: can't open device %s" msgstr "OpenAL: Kan device %s niet openen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "OpenCL Texture Decodeerder" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "OpenMP Texture Decodeerder" @@ -4141,7 +4285,7 @@ msgstr "" "en importeer de saves naar een nieuwe geheugenkaart\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "Overige" @@ -4193,19 +4337,20 @@ msgstr "Paragraaf" msgid "Parameters" msgstr "Parameters" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partitie %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Patches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Pad" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4218,6 +4363,10 @@ msgstr "Pad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pauze" @@ -4226,7 +4375,7 @@ msgstr "Pauze" msgid "Per-Pixel Lighting" msgstr "Per-Pixel Belichting" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Perfect" @@ -4239,6 +4388,7 @@ msgstr "Perspectief %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 ======= @@ -4249,6 +4399,10 @@ msgstr "Perspectief %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Speel" @@ -4262,7 +4416,7 @@ msgstr "Speel Opname" msgid "Play/Pause" msgstr "Spel/Pauze" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "Speelbaar" @@ -4274,6 +4428,7 @@ msgstr "Terugspeel Opties" msgid "Players" msgstr "Spelers" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4283,6 +4438,9 @@ msgstr "Spelers" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Bevestig alsjeblieft..." @@ -4294,23 +4452,23 @@ msgstr "Maak een perspectief voor het opslaan" msgid "Plus-Minus" msgstr "Ongeveer" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Pools" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Poort 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Poort 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Poort 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Poort 4" @@ -4319,11 +4477,11 @@ msgstr "Poort 4" msgid "Port :" msgstr "Poort :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portugees" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portugees (Braziliaans)" @@ -4331,17 +4489,17 @@ msgstr "Portugees (Braziliaans)" msgid "Post-Processing Effect:" msgstr "Post-Processing Effect:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4354,7 +4512,7 @@ msgstr "Presets: " msgid "Prev Page" msgstr "Vorige Pagina" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "Vorige Pagina" @@ -4405,7 +4563,7 @@ msgstr "" msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "RUSLAND" @@ -4418,7 +4576,7 @@ msgstr "Afstand" msgid "Read-only mode" msgstr "Alleen-lezen modus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "Echt" @@ -4495,6 +4653,7 @@ msgstr "Lijst Verversen" msgid "Refresh game list" msgstr "Ververs de speellijst" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4513,6 +4672,12 @@ msgstr "Ververs de speellijst" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Verwijder" @@ -4566,11 +4731,11 @@ msgstr "Rechter Stick" msgid "Rumble" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Zet DSP LLE op een aparte core (niet aanbevolen)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Russisch" @@ -4578,10 +4743,11 @@ msgstr "Russisch" msgid "Sa&ve State" msgstr "S&la Staat Op" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "Opslaan" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4591,6 +4757,9 @@ msgstr "Opslaan" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Sample Rate:" @@ -4648,12 +4817,12 @@ msgstr "Sla Staat 8 Op" msgid "Save State..." msgstr "Sla staat op als..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Opslaan als..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Sla gecomprimeerde GCM / ISO op" @@ -4661,11 +4830,11 @@ msgstr "Sla gecomprimeerde GCM / ISO op" msgid "Save current perspective" msgstr "Sla huidige perspectief op" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "Sla gedecomprimeerd GCM / ISO op" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Save staat film %s is corrupt, het opnemen van de film is gestopt..." @@ -4675,6 +4844,7 @@ msgstr "Save staat film %s is corrupt, het opnemen van de film is gestopt..." msgid "Scaled EFB Copy" msgstr "EFB Verkleinde Kopie" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4684,15 +4854,18 @@ msgstr "EFB Verkleinde Kopie" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Scannen van %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "Scannen voor ISO's" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "Scannen..." @@ -4708,12 +4881,12 @@ msgstr "Scroll Slot" msgid "Search Filter" msgstr "Zoekfilter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Zoeken in submappen" -#: 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:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "Sectie %s niet gevonden in SYSCONF" @@ -4723,6 +4896,7 @@ msgstr "Sectie %s niet gevonden in SYSCONF" msgid "Select" msgstr "Selecteer" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4747,6 +4921,14 @@ msgstr "Selecteer de opname Bestand" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Selecteer de opname Bestand" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Selecteer een Wii WAD bestand om te installeren" @@ -4772,16 +4954,21 @@ msgstr "Selecteer zwevende vensters" msgid "Select the file to load" msgstr "Selecteer het bestand om het te laden" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Selecteer het save - bestand" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Selecteer de Staat om te laden" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 @@ -4801,6 +4988,9 @@ msgstr "Selecteer de Staat om te laden" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Selecteer de Staat om op te slaan" @@ -4820,7 +5010,7 @@ msgstr "" "Force 4:3: Strek de afbeelding naar een beeldverhouding van 4:3\n" "Stretch naar het venster: Stretch de afbeelding naar je venster grootte." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Geselecteerde font" @@ -4869,11 +5059,11 @@ msgstr "Sensor Bar Positie:" msgid "Separator" msgstr "Scheidingsteken" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Servisch" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4883,11 +5073,11 @@ msgstr "" msgid "Set" msgstr "Stel" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "Ingesteld als &standaard ISO" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "Ingesteld als standaard memcard% c" @@ -4898,7 +5088,7 @@ msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" "SetARCode_IsActive: Index is groter dan de grootte van de AR Code lijst %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "Instellingen..." @@ -4910,7 +5100,7 @@ msgstr "SetupWiiMem: Kan het instellingen bestand niet vinden" msgid "Shake" msgstr "Schudden" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "Korte Naam:" @@ -4938,7 +5128,7 @@ msgstr "Toon &Toolbar" msgid "Show Drives" msgstr "Toon Schijven" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "Weergeef EFB Kopie Regios" @@ -4954,7 +5144,7 @@ msgstr "Toon Frans" msgid "Show GameCube" msgstr "Toon Gamecube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "Toon Input Venster" @@ -4970,7 +5160,7 @@ msgstr "Toon JAP" msgid "Show Korea" msgstr "Toon Korea" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "Toon Taal:" @@ -4990,7 +5180,7 @@ msgstr "Toon Platformen" msgid "Show Regions" msgstr "Toon Regio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "Weergeef statistieken" @@ -5010,11 +5200,11 @@ msgstr "Toon Wad" msgid "Show Wii" msgstr "Toon Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "Toon een bevestigingsvenster voordat u stopt met een spel." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 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 " @@ -5024,23 +5214,23 @@ msgstr "" "Als je dit uitschakeld zie je geen irritante berichten, maar het betekend " "ook dat Dolphin spontaan uit kan vallen zonder enige reden." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "Toon eerste blok" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "Toon save blocks" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "Toon save commentaar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "Toon save icon" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "Toon save titel" @@ -5078,7 +5268,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Zijdelings Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Vereenvoudigd Chinees" @@ -5086,11 +5276,11 @@ msgstr "Vereenvoudigd Chinees" msgid "Size" msgstr "Grootte" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "Sla BIOS Over" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 #, fuzzy msgid "Skip Dest. Alpha Pass" msgstr "Schakel Dest. Alpha Pass uit" @@ -5127,11 +5317,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Slot B" @@ -5155,7 +5345,7 @@ msgstr "" "Weet je zeker dat je software rendering aan wil zetten? In geval van " "twijfel, selecteer 'Nee'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "Geluids Instellingen" @@ -5173,6 +5363,7 @@ msgstr "Het aanmaken van de geluids buffer is mislukt: %s" msgid "Space" msgstr "Ruimte" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5188,6 +5379,11 @@ msgstr "Ruimte" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Spaans" @@ -5219,7 +5415,7 @@ msgstr "" msgid "Specify a video backend" msgstr "Geef een video-plugin aan" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Versnel Disc Transfer Rate" @@ -5227,7 +5423,7 @@ msgstr "Versnel Disc Transfer Rate" msgid "Square Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "" @@ -5320,12 +5516,12 @@ msgstr "Succesvol save games geimporteerd" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Systeem Taal:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "TAIWAN" @@ -5364,7 +5560,7 @@ msgstr "Rechter Tabel" msgid "Take Screenshot" msgstr "Neem een Schermafdruk" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -5381,7 +5577,7 @@ msgstr "Textuur" msgid "Texture Cache" msgstr "Zuiveren van de Cache" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "Textuur Formaat Overlay" @@ -5397,13 +5593,13 @@ msgstr "Het adres is onjuist" msgid "The checksum was successfully fixed" msgstr "De checksum was met succes gefixt" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "De gekozen map is al in de lijst" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5427,7 +5623,7 @@ msgid "The file %s was already open, the file header will not be written." msgstr "" "Het bestand %s was al open, de bestands header zal niet worden weggeschreven." -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Het opgegeven bestand(%s) bestaat niet" @@ -5449,7 +5645,7 @@ msgid "" "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." +"If unsure, use the rightmost value." msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 @@ -5491,7 +5687,7 @@ msgstr "Het opgegeven bestand \"%s\" bestaat niet" msgid "The value is invalid" msgstr "De waarde is onjuist" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Thema" @@ -5499,7 +5695,7 @@ msgstr "Thema" msgid "Theme selection went wrong" msgstr "Thema selectie ging fout" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5507,7 +5703,7 @@ msgstr "" "Er moet een ticket zijn voor 00000001/00000002. Je NAND dump is " "waarschijnlijk incompleet." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5523,7 +5719,7 @@ msgstr "" "Deze action replay simulator ondersteund geen codes die de Action Replay " "zelf aanpassen." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "Dit kan leiden tot vertraging van het Wii-menu en een aantal games." @@ -5546,26 +5742,10 @@ msgstr "" "In geval van twijfel leeg laten." #: 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" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" -"Dit wordt gebruikt om de snelheid van het spel te bepalen via geluids " -"throttle. \n" -"Als je dit uitschakelt kan het abnormale snelheden veroorzaken, waardoor het " -"spel te snel afspeelt. \n" -"Maar soms veroorzaakt dit constante noise.\n" -"\n" -"Sneltoets : Houd ingedrukt om throttle gelijk uit te zetten." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "Dit wordt gebruikt om muziek af te spelen, zoals achtergrondmuziek." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5577,7 +5757,7 @@ msgstr "" "Leidt tot grote snelheid verbeteringen op pc's met meer dan een kern, maar " "kan ook leiden tot crashes / glitches zo nu en dan." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "Dit laat je handmatig het INI configuratie bestand wijzigen" @@ -5600,7 +5780,7 @@ msgstr "Titel" msgid "To" msgstr "Naar" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "Zet Alle Log Types Aan" @@ -5620,6 +5800,7 @@ msgstr "Volledig Scherm Inschakelen" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5627,14 +5808,17 @@ msgstr "Volledig Scherm Inschakelen" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Boven" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Chinees (Traditioneel)" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "Poging tot het laden van een onbekend bestands type." @@ -5642,7 +5826,7 @@ msgstr "Poging tot het laden van een onbekend bestands type." msgid "Triggers" msgstr "" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Poging tot het inlezen van een ongeldige SYSCONF" @@ -5654,7 +5838,7 @@ msgstr "" "Poging tot het inlezen van een ongeldige SYSCONF\n" "Wiimote bt ids zijn niet beschikbaar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Turks" @@ -5675,11 +5859,11 @@ msgstr "UDP Port:" msgid "UDP Wiimote" msgstr "UDP Wiimote " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "ONBEKEND" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "USA" @@ -5765,7 +5949,7 @@ msgstr "Update" msgid "Upright Wiimote" msgstr "Wiimote rechtop" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Gebruik EuRGB60 Mode (PAL60)" @@ -5777,7 +5961,7 @@ msgstr "Gebruik &Volledig Scherm" msgid "Use Hex" msgstr "Gebruik Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Gebruik Panic Handlers" @@ -5808,7 +5992,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "Hulpprogramma" @@ -5832,25 +6016,29 @@ msgstr "Waarde:" msgid "Verbosity" msgstr "Breedsprakigheid" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Video" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Virtueel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Volume" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "WAD installatie mislukt: fout bij het creëren van %s" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "WAD installatie mislukt: fout bij het creëren van %s" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5869,15 +6057,15 @@ msgstr "" msgid "Warning" msgstr "Waarschuwing" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "Waarschuwing - DOL wordt in de verkeerde console mode gestart!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Waarschuwing - ELF wordt in de verkeerde console mode gestart!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Waarschuwing - ISO wordt in de verkeerde console mode gestart!" @@ -5906,7 +6094,7 @@ msgstr "" "en heeft dezelfde naam als een bestand op je geheugenkaart\n" "Doorgaan?" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5914,7 +6102,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5922,7 +6110,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5950,7 +6138,7 @@ msgstr "WaveFileWriter - bestand niet open." msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "Breedbeeld Hack" @@ -5958,15 +6146,15 @@ msgstr "Breedbeeld Hack" msgid "Width" msgstr "Breedte" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Wii Console " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Wii NAND basismap:" @@ -5974,6 +6162,7 @@ msgstr "Wii NAND basismap:" msgid "Wii Save Import" msgstr "Wii Save Importeren" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5983,6 +6172,9 @@ msgstr "Wii Save Importeren" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii save bestanden (*.bin)|*.bin" @@ -6050,10 +6242,11 @@ msgstr "Venster Menu" msgid "Windows Right" msgstr "Venster Rechts" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "Regelafbreking" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -6069,6 +6262,11 @@ msgstr "Regelafbreking" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Werken..." @@ -6076,6 +6274,11 @@ msgstr "Werken..." msgid "Write to Console" msgstr "Schrijf naar Console" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "Schrijf naar Bestand" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "Schrijf naar Bestand" @@ -6129,7 +6332,7 @@ msgstr "Je moet een juiste decimale, hexadecimale of octale waarde opgeven" msgid "You must enter a valid profile name." msgstr "Je moet een geldige profiel naam invoeren!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Je moet Dolphin herstarten voordat deze optie effect zal hebben." @@ -6152,7 +6355,7 @@ msgstr "" "Het zou 0x%04x moet zijn, maar is 0x%04llx \n" "Wil je een nieuwe genereren?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "ZTP hack" @@ -6221,7 +6424,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ERBIJ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "applader (.img)" @@ -6253,12 +6456,12 @@ msgstr "" msgid "s" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "onbekend commando 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute retourneerde -1 bij het draaien van de applicatie!" @@ -6405,6 +6608,9 @@ msgstr "| OF" #~ msgid "Emulator Display Settings" #~ msgstr "Emulator Scherm Instellingen" +#~ msgid "Enable Audio Throttle" +#~ msgstr "Activeer Audio Throttle" + #~ msgid "Enable CPU Access" #~ msgstr "Activeer CPU Toegang" @@ -6675,6 +6881,21 @@ msgstr "| OF" #~ msgid "The file " #~ msgstr "Het bestand" +#~ msgid "" +#~ "This is used to control game speed by sound throttle.\n" +#~ "Disabling this could cause abnormal game speed, such as too fast.\n" +#~ "But sometimes enabling this could cause constant noise.\n" +#~ "\n" +#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." +#~ msgstr "" +#~ "Dit wordt gebruikt om de snelheid van het spel te bepalen via geluids " +#~ "throttle. \n" +#~ "Als je dit uitschakelt kan het abnormale snelheden veroorzaken, waardoor " +#~ "het spel te snel afspeelt. \n" +#~ "Maar soms veroorzaakt dit constante noise.\n" +#~ "\n" +#~ "Sneltoets : Houd ingedrukt om throttle gelijk uit te zetten." + #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "" #~ "Dit wordt meestal gebruikt om spraak-en geluidseffecten af te spelen." diff --git a/Languages/po/pl.po b/Languages/po/pl.po index 1da1a68e37..b4a21374be 100644 --- a/Languages/po/pl.po +++ b/Languages/po/pl.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -16,6 +17,9 @@ msgstr "" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Update from master branch. +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-08-12 17:04+0100\n" "Last-Translator: Krzysztof Baszczok \n" "Language-Team: Polish \n" @@ -57,9 +61,9 @@ msgstr "\"%s\" jest niewłaściwym plikiem GMC/ISO lub to nie jest GC/Wii ISO" msgid "%1$sCopy%1$s" msgstr "%1$sKopiuj%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -155,7 +159,7 @@ msgstr "%sEksportuj GCI%s" msgid "%sImport GCI%s" msgstr "%sImportuj GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u wolnych bloków; %u wolnych wejść katalogowych" @@ -188,11 +192,11 @@ msgstr "&Menadżer cheatów" msgid "&DSP Settings" msgstr "&Ustawienia DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&Usuń ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&Usuń wybrane ISO..." @@ -256,7 +260,7 @@ msgstr "&Wstrzymaj" msgid "&Play" msgstr "&Play" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&Właściwości" @@ -300,7 +304,7 @@ msgstr "&Widok" msgid "&Wiimote Settings" msgstr "&Ustawienia Wiilota" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "&Wiki" @@ -344,7 +348,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -353,7 +357,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -408,13 +412,13 @@ msgstr "" "\n" "Wymagane jest przekierowanie portu TCP do hosta!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "Kody AR" @@ -426,11 +430,11 @@ msgstr "O Dolphin" msgid "Acceleration" msgstr "Przyspieszenie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "Dokładność:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Emulacja Accurate VBeam" @@ -550,11 +554,11 @@ msgstr "Adapter:" msgid "Add" msgstr "Dodaj" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "Dodaj kod ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "Dodaj łatkę" @@ -562,6 +566,7 @@ msgstr "Dodaj łatkę" msgid "Add new pane" msgstr "Dodaj nowy panel" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -577,6 +582,11 @@ msgstr "Dodaj nowy panel" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Dodaj..." @@ -624,11 +634,11 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "Reguluje siłę nacisku wymaganego do aktywacji przycisków." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "Zaawansowane" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Ustawienia zaawansowane" @@ -636,14 +646,15 @@ msgstr "Ustawienia zaawansowane" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Wszystkie pliki GC/Wii (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Wszystkie obrazy GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "Pliki GCM" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -656,18 +667,22 @@ msgstr "Pliki GCM" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Stany zapisu (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "Wszystkie obrazy Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Spakowane obrazy GC/Wii (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "Wszystkie pliki (*.*)|*.*" @@ -683,7 +698,7 @@ msgstr "" "\n" "W razie wątpliwości, pozostaw wyłączone." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "Emulowany Wiilot" @@ -704,7 +719,7 @@ msgstr "Apploader niewłaściwego rozmiaru... Czy to rzeczywiście apploader?" msgid "Apploader unable to load from file" msgstr "Apploader nie mógł wczytać z pliku" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Apploader:" @@ -722,7 +737,7 @@ msgstr "" "\n" "W razie wątpliwości, wybierz (wyłączone)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Arabski" @@ -731,7 +746,7 @@ msgstr "Arabski" msgid "Are you sure you want to delete \"%s\"?" msgstr "Czy jesteś pewny by usunąc \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -739,10 +754,11 @@ msgstr "" "Czy jesteś pewny by usunąc te pliki?\n" "Przepadną na zawsze!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 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 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -752,6 +768,9 @@ msgstr "Czy jesteś pewny by usunąc ten plik? Przepadnie na zawsze!" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Proporcje ekranu:" @@ -760,18 +779,20 @@ msgstr "Proporcje ekranu:" msgid "At least one pane must remain open." msgstr "Przynajmniej jeden manel musi pozostać otwarty." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Audio Backend :" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Błąd otwarcia urządzenia AO.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -781,6 +802,9 @@ msgstr "AudioCommon: Błąd otwarcia urządzenia AO.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -823,7 +847,7 @@ msgstr "" msgid "Back" msgstr "Wstecz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Ustawienia Backend'u" @@ -850,11 +874,11 @@ msgstr "Zły nagłówek pliku" msgid "Banner" msgstr "Baner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "Szczegóły banera" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "Baner:" @@ -866,7 +890,7 @@ msgstr "Wajcha" msgid "Basic" msgstr "Podstawowy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Ustawienia podstawowe" @@ -897,6 +921,7 @@ msgstr "Niebieski prawo" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -904,6 +929,9 @@ msgstr "Niebieski prawo" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Dół" @@ -912,7 +940,7 @@ msgstr "Dół" msgid "Bound Controls: %lu" msgstr "Bound Controls: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Zepsuty" @@ -928,7 +956,7 @@ msgstr "Szukaj folder do dodania" msgid "Browse for an ISO directory..." msgstr "Szukaj folder ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "Szukaj folderu wyjściowego" @@ -958,11 +986,11 @@ msgstr "C Stick" msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "Silnik emulacji CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "Cache Display Lists" @@ -1010,7 +1038,7 @@ msgstr "Nie moża otworzyć %s" msgid "Cannot unregister events with events pending" msgstr "Nie można wyrejestrować zdarzeń podczas ich wykonywania" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1021,7 +1049,7 @@ msgstr "" "%s\n" "nie jest właściwym plikiem karty pamięci GC" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1039,8 +1067,6 @@ msgstr "Nie można odnaleźć Wiilota po bd: %02x:%02x:%02x:%02x:%02x:%02x" msgid "Cant find WiiMote by connection handle %02x" msgstr "Nie można odnaleźć Wiilota przez handle połączenia %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1050,7 +1076,7 @@ msgstr "Nie można odczytać z wtyczki DVD - Interfejs DVD: Poważny błąd" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "Kataloński" @@ -1075,7 +1101,7 @@ msgstr "Zmień dysk" msgid "Change Game" msgstr "Zmień grę" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1091,8 +1117,8 @@ msgstr "Zmienia symbol do parametru zFar (po poprawce)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Zmienia symbol do parametru zNear (po poprawce)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "" "Zmiana tego nie będzie miała wpływu jeśli emulator jest w trakcie pracy!" @@ -1113,31 +1139,31 @@ msgstr "Szukaj cheatów" msgid "Cheats Manager" msgstr "Menadżer cheatów" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Chiński uproszczony" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Chinski (Tradycyjny)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "Wybierz folder źródłowy DVD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "Wybierz folder źródłowy NAND" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Wybierz domyślne ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "Wybierz folder do dodania" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Wybierz plik do otwarcia" @@ -1145,6 +1171,7 @@ msgstr "Wybierz plik do otwarcia" msgid "Choose a memory card:" msgstr "Wybierz kartę pamięci:" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 @@ -1154,6 +1181,9 @@ msgstr "Wybierz kartę pamięci:" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1161,8 +1191,8 @@ msgstr "" "Wybierz plik używany jako apploader: (dotyczy dysków stworzonych tylko z " "folderów)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Wypakuj do" @@ -1174,14 +1204,14 @@ msgstr "Circle Stick" msgid "Classic" msgstr "Classic" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "Wyczyść" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "Czyszczenie nie powiodło się." @@ -1197,6 +1227,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 @@ -1205,6 +1236,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Zamknij" @@ -1228,20 +1263,20 @@ msgstr "Polecenie" msgid "Comment" msgstr "Komentarz" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Komentarz:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "Kompresuj ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Kompresuj wybrane ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "Kompresowanie ISO" @@ -1268,13 +1303,13 @@ msgstr "Konfiguracja padów" msgid "Configure..." msgstr "Konfiguruj..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "Potwierdź nadpis pliku" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "Potwierdź przy zatrzymaniu" @@ -1283,7 +1318,7 @@ msgstr "Potwierdź przy zatrzymaniu" msgid "Connect" msgstr "Połącz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "Podłącz klawiaturę USB" @@ -1340,12 +1375,12 @@ msgstr "Konwertuj do GCI" msgid "Copy failed" msgstr "Kopiowanie nie powiodło się" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "Kopiuj do Memcard %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "Rdzeń" @@ -1375,7 +1410,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Nie rozpoznao pliku ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "Nie można zapisać %s" @@ -1388,7 +1423,7 @@ msgstr "" "Nie można ustawić pada. Gracz odszedł lub gra jest uruchomiona!\n" "(Ustawienie padów podczas uruchomionej gry, nie jest jeszcze wspierane)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1401,7 +1436,7 @@ msgstr "" "Uruchamiasz program z CD/DVD albo plik zapisu jest zabezpieczony przed " "zapisem?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "Nie odnaleziono polecenia otwarcia dla rozszerzenia 'ini'!" @@ -1418,7 +1453,7 @@ msgstr "" msgid "Count:" msgstr "Ilość:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "Kraj:" @@ -1432,10 +1467,11 @@ msgstr "Utwórz kod AR" msgid "Create new perspective" msgstr "Utwórz nową perspektywę" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "Utworzone przez KDE-Look.org" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 @@ -1445,22 +1481,25 @@ msgstr "Utworzone przez KDE-Look.org" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Utworzone przez Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart." "com]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "Utworzone przez VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" "Utworzone przez black_rider and published on ForumW.org > Web Developments" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "Twórca:" @@ -1468,7 +1507,7 @@ msgstr "Twórca:" msgid "Critical" msgstr "Krytyczny" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "Obcięcie" @@ -1491,7 +1530,7 @@ msgstr "Suwak" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Actualny folder zmieniono z %s na %s po wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "Custom Projection Hack" @@ -1499,11 +1538,11 @@ msgstr "Custom Projection Hack" msgid "Custom Projection Hack Settings" msgstr "Ustawienia Custom Projection Hack" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "Własne parametry Orthographic Projection" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Czeski" @@ -1515,10 +1554,11 @@ msgstr "D-Pad" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "DSP Emulator Engine" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1529,18 +1569,22 @@ msgstr "DSP Emulator Engine" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulacja (szybkie)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE interpreter (wolne)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "Wątek dla DSPLLE" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP LLE rekompilator" @@ -1548,15 +1592,23 @@ msgstr "DSP LLE rekompilator" msgid "DSP settings" msgstr "Ustawienia DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "Źródło DVD:" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "Rozmiar danych" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "Data:" @@ -1577,7 +1629,7 @@ msgstr "Dead Zone" msgid "Debug" msgstr "Debuguj" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "Debugowanie" @@ -1585,16 +1637,16 @@ msgstr "Debugowanie" msgid "Decimal" msgstr "Dziesiętnie" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "Wypakuj ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "Wypakuj wybrane ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "Wypakowywanie ISO" @@ -1602,11 +1654,11 @@ msgstr "Wypakowywanie ISO" msgid "Default" msgstr "Domyślne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "Domyślne ISO:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "Domyślna czcionka" @@ -1615,7 +1667,7 @@ msgstr "Domyślna czcionka" msgid "Delete" msgstr "Usuń" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "Usuń zapis" @@ -1624,7 +1676,7 @@ msgstr "Usuń zapis" msgid "Delete the existing file '%s'?" msgstr "Usunąć istniejący plik '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "Opis" @@ -1632,8 +1684,8 @@ msgstr "Opis" msgid "Detect" msgstr "Wykryj" -#: 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 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." @@ -1646,8 +1698,8 @@ msgstr "" msgid "Device" msgstr "Urządzenie" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Ustawienia urządzenia" @@ -1672,23 +1724,23 @@ msgstr "" "folderu zapasowego nie powiodła się" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "Wyłącz" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "Wyłącz mgłę" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "Wyłącz światła" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "Wyłącz Per-Pixel Depth" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "Wyłącz tekstury" @@ -1732,7 +1784,7 @@ msgstr "" "\n" "W razie wątpliwości, pozostaw wyłączone." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Dysk" @@ -1759,6 +1811,7 @@ msgstr "" msgid "Divide" msgstr "Podziel" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1768,10 +1821,13 @@ msgstr "Podziel" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Zatrzymać aktualną emulację?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1796,6 +1852,7 @@ msgstr "Konfiguracja emulowanego Wiilota" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1820,6 +1877,14 @@ msgstr "Konfiguracja GCPad'a" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Konfiguracja GCPad'a" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmy TAS (*.dtm)" @@ -1868,11 +1933,11 @@ msgstr "" msgid "Down" msgstr "Dół" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "Ściągnij kody (baza WiiRD)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Pobrano %lu kodów. (dodano %lu)" @@ -1881,23 +1946,23 @@ msgstr "Pobrano %lu kodów. (dodano %lu)" msgid "Drums" msgstr "Perkusja" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "Atrapa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "Zrzut Audio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "Zrzut EFB Target" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "Zrzut ramek" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "Zrzut tekstur" @@ -1931,6 +1996,7 @@ msgstr "" "\n" "W razie wątpliwości, pozostaw wyłączone." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1946,6 +2012,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Holenderski" @@ -1969,7 +2040,7 @@ msgstr "" "%d -- Jeśli ostatnio aktualizowałeś program, ponowne uruchomienie systemu " "jest wymagane by sterownik zaczął działać." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "Europa" @@ -1985,7 +2056,7 @@ msgstr "Edycja" msgid "Edit ActionReplay Code" msgstr "Edytuj kody ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Edytuj konfigurację" @@ -1997,8 +2068,8 @@ msgstr "Edytuj patch" msgid "Edit current perspective" msgstr "Edytuj bierzącą perspektywę" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "Edytuj..." @@ -2049,7 +2120,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Emulowany Wiilot" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "Stan emulacji:" @@ -2077,23 +2148,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "Włącz log AR" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "Włącz Audio Throttle" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "Włącz BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Włącz łączenie bloków" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -2106,6 +2177,7 @@ msgstr "" msgid "Enable Cache" msgstr "Włącz cache" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2115,51 +2187,54 @@ msgstr "Włącz cache" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Włącz kody" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "Włącz muzykę DTK" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Włącz 2 rdzenie" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Włącz 2 rdzenie (przyspieszenie)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "Włącz skróty klawiszowe" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Włącz Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Włącz Idle Skipping (przyspieszenie)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Włącz MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "Włącz Progressive Scan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "Włącz wygaszacz ekranu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "Włącz WideScreen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "Włącz Wireframe" @@ -2177,7 +2252,7 @@ msgstr "" "\n" "W razie wątpliwości, wybierz 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2185,7 +2260,7 @@ msgstr "" "Włącz szybki dostęp do dysku. Wymagane dla kilku gier. (ON = szybko, OFF = " "kompatybilne)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "Włącz strony" @@ -2213,6 +2288,7 @@ msgstr "" "\n" "W razie wątpliwości, pozostaw wyłączone." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 @@ -2222,6 +2298,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2229,7 +2308,7 @@ msgstr "" "Włącz to by przyspieszyć The Legend of Zelda: Twilight Princess. Wyłącz dla " "KAŻDEJ innej gry." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2239,7 +2318,7 @@ msgstr "" "Dokładne dla sprzetu, lecz powolne do emulacji. (ON = kompatybilne, OFF = " "szybko)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "Włącza Custom Projection Hack" @@ -2255,7 +2334,7 @@ msgstr "" "\n" "W razie wątpliwości, pozostaw wyłączone." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2277,6 +2356,7 @@ msgstr "" msgid "End" msgstr "Koniec" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2292,6 +2372,11 @@ msgstr "Koniec" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Angielski" @@ -2322,6 +2407,7 @@ msgstr "Równy" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Błąd" @@ -2352,11 +2438,17 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "Błąd" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: 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." -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format msgid "" <<<<<<< HEAD @@ -2367,7 +2459,7 @@ msgid "" "Aborting savestate load..." msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" ======= @@ -2403,7 +2495,7 @@ msgstr "Wyjście z Dolphina" msgid "Export Failed" msgstr "Eksportuj nieudany" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "Eksportuj plik" @@ -2416,15 +2508,15 @@ msgstr "Eksportuj nagranie" msgid "Export Recording..." msgstr "Eksportuj nagranie..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "Eksportuj zapis" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "Eksportuj zapis Wii (eksperymentalne)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "Eksportuj wszystkie zapisy" @@ -2440,7 +2532,7 @@ msgstr "Eksportuj zapis jako..." msgid "Extension" msgstr "Rozszerzenie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "External Frame Buffer" @@ -2452,44 +2544,44 @@ msgstr "Parametr Dodatkowy" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Parametr Dodatkowy przydatny tylko w ''Metroid: Other M\"." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "Wypakuj wszystkie pliki..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "Wypakuj Apploader'a..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "Wypakuj DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "Wypakuj folder..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "Wypakuj plik..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "Wypakuj partycję..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "Wypakowywanie %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "Wypakowywanie wszystkich plików" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "Wypakowywanie folderu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "Wypakowywanie..." @@ -2501,11 +2593,11 @@ msgstr "Bajt FIFO" msgid "FIFO Player" msgstr "FIFO Player" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "Francja" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "Rozmiar FST:" @@ -2517,11 +2609,11 @@ msgstr "Połączenie nieudane!" msgid "Failed to Listen!!" msgstr "Nasłuchiwanie nieudane!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "Pobieranie kodów nieudane!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Wypakowanie do %s nie udało się!" @@ -2638,18 +2730,28 @@ msgstr "Zapis nagłówka do %s nie powiódł się" msgid "Failed to write header for file %d" msgstr "Błąd zapisu nagłówka do pliku %d" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "Szybki" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "Fast Mipmaps" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "Szybka wersja MMU. Nie funkcjonuje dla każdej gry." +#: Source/Core/Core/Src/Movie.cpp:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "Fifo Player" @@ -2658,7 +2760,7 @@ msgstr "Fifo Player" msgid "File Info" msgstr "Informacja o pliku" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "Plik nie zawiera kodów." @@ -2691,16 +2793,16 @@ msgstr "Plik nierozpoznany jako karta pamięci" msgid "File not compressed" msgstr "Plik nie skompresowany" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Nieznany tryb otwarcia: 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "System plików" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Nieznany plik typu 'ini'! Nie otworzy się!" @@ -2708,7 +2810,7 @@ msgstr "Nieznany plik typu 'ini'! Nie otworzy się!" msgid "First Block" msgstr "Blok pierwszy" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "Napraw sumy kontrolne" @@ -2720,7 +2822,7 @@ msgstr "Wymuś 16:9" msgid "Force 4:3" msgstr "Wymuś 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "Wymuś konsolę jako NTSC-J" @@ -2752,7 +2854,7 @@ msgstr "" "\n" "W razie wątpliwości, pozostaw wyłączone." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2788,7 +2890,7 @@ msgstr "Ramka" msgid "Frame Advance" msgstr "Frame Advance" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "Zrzuty ramek używają FFV1" @@ -2800,7 +2902,7 @@ msgstr "Zasięg ramki" msgid "Frame S&kipping" msgstr "Frame S&kipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Limit ramek:" @@ -2808,10 +2910,11 @@ msgstr "Limit ramek:" msgid "Frames To Record" msgstr "Ramki do nagrania" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "Free Look" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2827,6 +2930,11 @@ msgstr "Free Look" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Francuski" @@ -2860,7 +2968,7 @@ msgstr "Konfiguracja Logu" msgid "GCPad" msgstr "GCPad" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "ID gry:" @@ -2876,15 +2984,15 @@ msgstr "Gra nie jest uruchomiona!" msgid "Game not found!!" msgstr "Gry nie odnaleziono!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "Specyficzne ustawienia gry" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Konfiguracja gry" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" @@ -2895,6 +3003,7 @@ msgstr "Ustawienia &pada GC" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2902,6 +3011,9 @@ msgstr "Ustawienia &pada GC" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Karty pamięci GC (*.raw,*.gcp)" @@ -2910,15 +3022,17 @@ msgid "Gamecube Pad settings" msgstr "Ustawienia pada GC" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Kody Gecko" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" "Błąd uruchomienia GeckoCode (CT%i CST%i) (%s)\n" "(zły kod albo typ kodu nie jest jeszcze wspierany)" @@ -2927,6 +3041,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 @@ -2935,6 +3050,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Główne" @@ -2943,6 +3061,7 @@ msgstr "Główne" msgid "General Settings" msgstr "Ustawienia ogólne" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2958,6 +3077,11 @@ msgstr "Ustawienia ogólne" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Niemiecki" @@ -2995,7 +3119,7 @@ msgstr "" "\n" "W razie wątpliwości, pozostaw włączone." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Grecki" @@ -3027,7 +3151,7 @@ msgstr "Hacki" msgid "Header checksum failed" msgstr "Suma kontrolna nagłówka nie powiodła się" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Hebrajski" @@ -3095,12 +3219,16 @@ msgstr "Konfiguracja skrótów klawiszowych" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Skróty klawiszowe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Węgierski" @@ -3108,13 +3236,13 @@ msgstr "Węgierski" msgid "Hybrid Wiimote" msgstr "Hybrydowy Wiilot" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS: Próba otrzymania danych z nieznanego ticket'u: %08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -3127,11 +3255,11 @@ msgstr "" "TitleID %016llx.\n" "Program teraz chyba się zawiesi :C" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - zła ścieżka" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "Ustawienia IPL" @@ -3147,15 +3275,15 @@ msgstr "Wskaźnik IR" msgid "IR Sensitivity:" msgstr "Czułość IR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "Szczegóły ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "Foldery ISO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "Włochy" @@ -3163,19 +3291,20 @@ msgstr "Włochy" msgid "Icon" msgstr "Ikona" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "Jeśli FPS jest niezrównoważony, ta opcja może pomóc. (ON = kompatybilny, OFF " "= szybko)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 @@ -3185,9 +3314,14 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy +>>>>>>> Update the pot file to reflect recent changes in the code. 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." +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " +"Audio to throttle using the DSP (might fix audio clicks but can also cause " +"constant noise depending on the game)." msgstr "" "Jeśli ustawisz limit ramek większy niż pełna szybkość gry (NTSC:60, PAL:50), " "musisz także wyłączyc Audio Throttle w DSP dla pełnego efektu." @@ -3224,7 +3358,7 @@ msgstr "" "\n" "W razie wątpliwości, pozostaw wyłączone." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "Importuj zapis" @@ -3274,7 +3408,7 @@ msgstr "" "\n" "W razie wątpliwości, pozostaw wyłączone." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "W grze" @@ -3283,7 +3417,7 @@ msgid "In-Game" msgstr "W grze" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info" @@ -3303,7 +3437,7 @@ msgstr "Wstaw" msgid "Insert Encrypted or Decrypted code here..." msgstr "Wprowadź zaszyfrowany/zdeszyfrowany kod tutaj..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Włóż kartę SD" @@ -3315,7 +3449,7 @@ msgstr "Wprowadź nazwę tutaj..." msgid "Install WAD" msgstr "Zainstaluj WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Zainstaluj do Wii Menu" @@ -3325,6 +3459,7 @@ msgid "" msgstr "" "InstallExceptionHandler wywołany, ale ta platforma nie wspiera go jeszcze." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3334,14 +3469,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Instalacja WAD..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "Interfejs" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "Ustawienia interfejsu" @@ -3366,11 +3504,11 @@ msgstr "Wewnętrzny błąd LZO - lzo_init() nie powiodło się" msgid "Internal Resolution:" msgstr "Wewnętrzna rozdzielczość:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Interpreter (BARDZO wolny)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "Intro" @@ -3387,7 +3525,7 @@ msgstr "Niewłaściwa wartość!" msgid "Invalid bat.map or dir entry" msgstr "Niewłaściwe bat.map lub wejście folderu" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "Niewłaściwy typ zdarzenia %i" @@ -3407,14 +3545,15 @@ msgstr "" "%s\n" "Będziesz musiał ponownie zrzucić grę." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "Newłaściwy plik nagrania" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "Niewłaściwy stan" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3430,27 +3569,32 @@ msgstr "Niewłaściwy stan" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Włoski" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "Japonia" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "Rekompilator JIT (zalecany)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "Eksperymentalny rekompilator JITIL" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japoński" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "Korea" @@ -3459,8 +3603,8 @@ msgstr "Korea" msgid "Key" msgstr "Klawisz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Koreański" @@ -3478,7 +3622,7 @@ msgstr "L Button" msgid "L-Analog" msgstr "L-Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "Język:" @@ -3531,7 +3675,7 @@ msgstr "" msgid "Less Than" msgstr "Mniej niż" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "Limit FPS" @@ -3539,7 +3683,7 @@ msgstr "Limit FPS" msgid "Load" msgstr "Wczytaj" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "Wczytaj własne tekstury" @@ -3587,6 +3731,7 @@ msgstr "Wczytaj stan Slot 8" msgid "Load State..." msgstr "Wczytaj stan..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3608,6 +3753,13 @@ msgstr "Wczytaj Wii System Menu" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "Wczytaj Wii System Menu" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wczytaj Wii System Menu %d %c" @@ -3634,7 +3786,7 @@ msgstr "Wczytuje określony plik (DOL, ELF, GCM, ISO, WAD)" msgid "Local" msgstr "Lokalny" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Przypisz wątki do rdzeni" @@ -3646,11 +3798,11 @@ msgstr "Log" msgid "Log Configuration" msgstr "Konfiguracja Logu" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Typy logów" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Logger Outputs" @@ -3680,7 +3832,7 @@ msgstr "" "MD5 niepoprawne\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU Speed Hack" @@ -3702,11 +3854,11 @@ msgstr "Pliki MadCatz Gameshark(*.gcs)" msgid "Main Stick" msgstr "Główna gałka" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "ID twórcy:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "Twórca:" @@ -3730,6 +3882,7 @@ msgstr "Bajt pamięci" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3737,6 +3890,9 @@ msgstr "Bajt pamięci" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Karta pamięci" @@ -3773,7 +3929,7 @@ msgstr "Wielkość pliku karty pamięci nie odpowiada wielkości nagłówka" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "Mikrofon" @@ -3782,11 +3938,11 @@ msgstr "Mikrofon" msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "Różne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Ustawienia różne" @@ -3807,7 +3963,7 @@ msgstr "" "\n" "W razie wątpliwości, pozostaw wyłączone." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "Nieproporcjonalna czcionka" @@ -3820,7 +3976,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3842,7 +3998,7 @@ msgstr "" msgid "Multiply" msgstr "Pomnóż" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3934,6 +4090,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3943,6 +4100,9 @@ msgstr "NP Up" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3951,7 +4111,7 @@ msgstr "Nazwa:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Nazwa:" @@ -3965,7 +4125,7 @@ msgid "New Scan" msgstr "Nowe skanowanie" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "Następna strona" @@ -3977,7 +4137,7 @@ msgstr "Następne skanowanie" msgid "Nickname :" msgstr "Ksywa:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "No Country (SDK)" @@ -4016,7 +4176,7 @@ msgstr "Nie odnaleziono folderu zapisu dla tytułu %s" msgid "None" msgstr "Żadne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Norweski" @@ -4024,8 +4184,8 @@ msgstr "Norweski" msgid "Not Equal" msgstr "Nie równe" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "Nie ustawiono" @@ -4045,7 +4205,7 @@ msgstr "Nie połączono" msgid "Notes" msgstr "Notatki" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "Notatki:" @@ -4083,7 +4243,7 @@ msgstr "Objekt" msgid "Object Range" msgstr "Zasięg objektu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Wyłączone" @@ -4109,11 +4269,11 @@ msgstr "Dostępnych tylko %d bloków" msgid "Open" msgstr "Otwórz" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "Otwórz &folder zawartości" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "Otwórz folder &zapisów Wii" @@ -4135,11 +4295,11 @@ msgstr "OpenAL: nie można odnaleźć urządzeń dźwiękowych" msgid "OpenAL: can't open device %s" msgstr "OpenAL: nie można otworzyć urządzenia %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "OpenCL Texture Decoder" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "OpenMP Texture Decoder" @@ -4171,7 +4331,7 @@ msgstr "" "następnie zaimportuj te zapisy do nowej karty pamięci\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "Pozostałe" @@ -4223,19 +4383,20 @@ msgstr "Paragraf" msgid "Parameters" msgstr "Paramerty" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partycja %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Patche" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Ścieżki" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4248,6 +4409,10 @@ msgstr "Ścieżki" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -4256,7 +4421,7 @@ msgstr "Pause" msgid "Per-Pixel Lighting" msgstr "Per-Pixel Lighting" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Perfekcyjny" @@ -4269,6 +4434,7 @@ msgstr "Perspekrtywa %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 ======= @@ -4279,6 +4445,10 @@ msgstr "Perspekrtywa %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Play" @@ -4292,7 +4462,7 @@ msgstr "Odtwórz nagranie" msgid "Play/Pause" msgstr "Play/Pause" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "Grywalny" @@ -4304,6 +4474,7 @@ msgstr "Opcje playback'u" msgid "Players" msgstr "Gracze" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4313,6 +4484,9 @@ msgstr "Gracze" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Potwierdź..." @@ -4324,23 +4498,23 @@ msgstr "Proszę utworzyć perspektywę przed zapisem" msgid "Plus-Minus" msgstr "Plus-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Polski" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Port 4" @@ -4349,11 +4523,11 @@ msgstr "Port 4" msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portugalski" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portugalski (Brazylijski)" @@ -4361,17 +4535,17 @@ msgstr "Portugalski (Brazylijski)" msgid "Post-Processing Effect:" msgstr "Post-Processing Effect:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4384,7 +4558,7 @@ msgstr "Presets: " msgid "Prev Page" msgstr "Poprzednia strona" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "Poprzednia strona" @@ -4435,7 +4609,7 @@ msgstr "R-Analog" msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "Rosja" @@ -4448,7 +4622,7 @@ msgstr "Zasięg" msgid "Read-only mode" msgstr "Tryb tylko do odczytu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "Prawdziwy" @@ -4523,6 +4697,7 @@ msgstr "Odśwież listę" msgid "Refresh game list" msgstr "Odśwież listę gier" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4541,6 +4716,12 @@ msgstr "Odśwież listę gier" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Usuń" @@ -4593,11 +4774,11 @@ msgstr "Gałka prawa" msgid "Rumble" msgstr "Wibracje" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Wykonuj DSPLLE na dedykowanym wątku (niezalecane)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Rosyjski" @@ -4605,10 +4786,11 @@ msgstr "Rosyjski" msgid "Sa&ve State" msgstr "Zapisz &stan" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "Bezpieczny" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4618,6 +4800,9 @@ msgstr "Bezpieczny" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Wskaźnik próbkowania:" @@ -4675,12 +4860,12 @@ msgstr "Zapisz stan Slot 9" msgid "Save State..." msgstr "Zapisz stan..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Zapisz jako..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Zapisz spakowany GCM/ISO" @@ -4688,11 +4873,11 @@ msgstr "Zapisz spakowany GCM/ISO" msgid "Save current perspective" msgstr "Zapisz bierzącą perspektywę" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "Zapisz wypakowany GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Stan zapisu filmu %s jest uszkodzony, nagrywanie zatrzymane..." @@ -4701,6 +4886,7 @@ msgstr "Stan zapisu filmu %s jest uszkodzony, nagrywanie zatrzymane..." msgid "Scaled EFB Copy" msgstr "Scaled EFB Copy" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4710,15 +4896,18 @@ msgstr "Scaled EFB Copy" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Sknauję %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "Przeszukuję obrazy ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "Przeszukuję" @@ -4734,12 +4923,12 @@ msgstr "Scroll Lock" msgid "Search Filter" msgstr "Filtr wyszukiwania" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Przeszukuj podfoldery" -#: 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:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "Nie odnaleziono sekcji %s w SYSCONF" @@ -4749,6 +4938,7 @@ msgstr "Nie odnaleziono sekcji %s w SYSCONF" msgid "Select" msgstr "Select" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4773,6 +4963,14 @@ msgstr "Wybierz plik nagrania" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Wybierz plik nagrania" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Wybierz plik Wii WAD do zainstalowania" @@ -4798,16 +4996,21 @@ msgstr "Select floating windows" msgid "Select the file to load" msgstr "Wybierz plik do wczytania" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Wybierz plik do zapisu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Wybierz stan do wczytania" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 @@ -4827,6 +5030,9 @@ msgstr "Wybierz stan do wczytania" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Wybierz stan do zapisu" @@ -4848,7 +5054,7 @@ msgstr "" "\n" "W razie wątpliwości, wybierz Auto." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Wybrana czcionka" @@ -4895,10 +5101,11 @@ msgstr "Pozycja Sensor Bar'a" msgid "Separator" msgstr "Separator" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Serbski" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 @@ -4908,6 +5115,9 @@ msgstr "Serbski" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +>>>>>>> Update the pot file to reflect recent changes in the code. 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" @@ -4916,11 +5126,11 @@ msgstr "Serial Port 1 - Port używany przez urządzenia takie jak net adapter" msgid "Set" msgstr "Ustaw" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "Ustaw jako domyślne ISO" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "Ustaw jako domyślną kartę pamięci %c" @@ -4930,7 +5140,7 @@ msgstr "Ustaw jako domyślną kartę pamięci %c" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "SetARCode_IsActive: Indeks jest większy niz rozmiar listy kodu AR %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "Ustawienia..." @@ -4942,7 +5152,7 @@ msgstr "SetupWiiMem: Nie można odnaleźć pliku konfiguracyjnego" msgid "Shake" msgstr "Wstrząs" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "Krótka nazwa:" @@ -4970,7 +5180,7 @@ msgstr "Pokaż pasek &narzędzi" msgid "Show Drives" msgstr "Pokaż napędy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "Pokaż EFB Copy Regions" @@ -4986,7 +5196,7 @@ msgstr "Pokaż Francję" msgid "Show GameCube" msgstr "Pokaż GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "Pokaż Input Display" @@ -5002,7 +5212,7 @@ msgstr "Pokaż Japonię" msgid "Show Korea" msgstr "Pokaż Koreę" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "Pokaż język:" @@ -5022,7 +5232,7 @@ msgstr "Pokaż platformy" msgid "Show Regions" msgstr "Pokaż regiony" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "Pokaż statystyki" @@ -5042,11 +5252,11 @@ msgstr "Pokaż WAD" msgid "Show Wii" msgstr "Pokaż Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "Pokazuje okno potwierdzenia przed zatrzymaniem gry." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 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 " @@ -5056,23 +5266,23 @@ msgstr "" "Wyłączenie tego pozwoli uniknąć denerwujących i mało ważnych wiadomości, ale " "może spowodować zamknięcie programu bez żadnego ostrzeżenia." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "Pokaż pierwszy blok" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "Pokaż bloki zapisu" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "Pokaż komentarz zapisu" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "Pokaż ikonę zapisu" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "Pokaż tytuł zapisu" @@ -5109,7 +5319,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Willot bokiem" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Chiński uproszczony" @@ -5117,11 +5327,11 @@ msgstr "Chiński uproszczony" msgid "Size" msgstr "Rozmiar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "Pomiń BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "Pomiń Dest. Alpha Pass" @@ -5163,11 +5373,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Slot B" @@ -5191,7 +5401,7 @@ msgstr "" "Czy na pewno chcesz włączyć renderowanie programowe? W razie wątpliwości, " "wybierz 'Nie'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "Ustawienia dźwięku" @@ -5209,6 +5419,7 @@ msgstr "Utworzenie bufora dźwięku nie powiodło się: %s" msgid "Space" msgstr "Space" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5224,6 +5435,11 @@ msgstr "Space" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Hiszpański" @@ -5255,7 +5471,7 @@ msgstr "" msgid "Specify a video backend" msgstr "Wybierz video backend" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Przyspiesz Disc Transfer Rate" @@ -5263,7 +5479,7 @@ msgstr "Przyspiesz Disc Transfer Rate" msgid "Square Stick" msgstr "Square Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "Standard Controller" @@ -5361,12 +5577,12 @@ msgstr "Importowanie zapisów zakończone powodzeniem" msgid "Swing" msgstr "Zamach" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Język systemu:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "Taiwan" @@ -5405,7 +5621,7 @@ msgstr "Talerz prawo" msgid "Take Screenshot" msgstr "Zrób zdjęcie" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -5421,7 +5637,7 @@ msgstr "Tekstura" msgid "Texture Cache" msgstr "Cache tekstur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "Format pokrycia tekstur" @@ -5437,13 +5653,13 @@ msgstr "Nieprawidłowy adres" msgid "The checksum was successfully fixed" msgstr "Suma kontrolna poprawnie naprawiona" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "Wybrany folder jest już na liście" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5466,7 +5682,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "Plik %s jest już otwarty, nagłówek pliku nie zostanie zapisany." -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Plik, który wybrałeś (%s) nie istnieje" @@ -5484,11 +5700,12 @@ msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "Wynikowy odszyfrowany kod AR nie zawiera żadnych linii." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#, fuzzy msgid "" "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." +"If unsure, use the rightmost value." msgstr "" "Im bezpieczniejsze dasz ustawienia, tym mniej prawdopodobne, że emulator " "pominie aktualizacje tekstur z RAMu.\n" @@ -5531,7 +5748,7 @@ msgstr "Wskazany plik \"%s\" nie istnieje." msgid "The value is invalid" msgstr "Niewłaściwa wartość" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Styl" @@ -5539,7 +5756,7 @@ msgstr "Styl" msgid "Theme selection went wrong" msgstr "Wybór stylu nieudany" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5547,7 +5764,7 @@ msgstr "" "Tutaj musi być ticket dla 00000001/00000002. Twój zrzut NAND jes " "prawdopodobnie niekompletny." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5563,7 +5780,7 @@ msgstr "" "Ten symulator action replay nie wspiera kodów, które modyfikują Action " "Replay'a." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "Może powodować spowolnienie w Wii Menu i niektórych grach." @@ -5586,27 +5803,10 @@ msgstr "" "W razie wątpliwości, pozostaw wyłączone." #: 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" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" -"Ustawienia te wykorzystywane są do kontrolowania szybkości gry przez sound " -"throttle(spowalnianie dźwięku).\n" -"Wyłączenie tego może spowodować nienormalne działanie gry, np. zbyt szybkie " -"działanie.\n" -"Czasami powoduje stały szum.\n" -"\n" -"Skrót klawiszowy : Przytrzymaj by natychmiastowo wyłączyc Audio " -"Throttle." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "Jest to używane do odtwarzania muzyki, BGM." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5617,7 +5817,7 @@ msgstr "" "Znacznie zwiększa wydajność na komputerach z więcej niż jednym rdzeniem, ale " "powoduje także okazjonalne błedy." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "Pozwala na ręczną edycję pliku konfiguracyjnego." @@ -5640,7 +5840,7 @@ msgstr "Tytuł" msgid "To" msgstr "Do" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "Przełącz wszystkie typy logów" @@ -5660,6 +5860,7 @@ msgstr "Przełącz na pełny ekran" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5667,14 +5868,17 @@ msgstr "Przełącz na pełny ekran" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Góra" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Chiński tradycyjny" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "Próbowano odczytać nieznany typ pliku." @@ -5682,7 +5886,7 @@ msgstr "Próbowano odczytać nieznany typ pliku." msgid "Triggers" msgstr "Spusty" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Próba odczytu z niewłaściwego SYSCONF" @@ -5694,7 +5898,7 @@ msgstr "" "Próba odczytu z niewłaściwego SYSCONF\n" "bt id Wiilota niedostępne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Turecki" @@ -5715,11 +5919,11 @@ msgstr "Port UDP:" msgid "UDP Wiimote" msgstr "UDP Wiilot" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "Nieznany" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "USA" @@ -5804,7 +6008,7 @@ msgstr "Aktualizuj" msgid "Upright Wiimote" msgstr "Willot pionowo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Użyj trybu EuRGB60 (PAL60)" @@ -5816,7 +6020,7 @@ msgstr "Użyj trybu pełnoekranowego" msgid "Use Hex" msgstr "Użyj HEX" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Użyj Panic Handlers" @@ -5847,7 +6051,7 @@ msgstr "" "\n" "W razie wątpliwości, pozostaw wyłączone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "Narzędzie" @@ -5871,25 +6075,29 @@ msgstr "Wartość:" msgid "Verbosity" msgstr "Verbosity" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Wideo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Wirtualny" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Poziom" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "Instalacja WAD nie powiodła się: błąd tworzenia %s" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "Instalacja WAD nie powiodła się: błąd tworzenia %s" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5908,15 +6116,15 @@ msgstr "" msgid "Warning" msgstr "Ostrzeżenie" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "Ostrzeżenie - uruchomienie DOL w złym trybie konsoli!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Ostrzeżenie - uruchomienie ELF w złym trybie konsoli!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Ostrzeżenie - uruchomienie ISO w złym trybie konsoli!" @@ -5944,7 +6152,7 @@ msgstr "" "i mają taką samą nazwę jak plik na Twojej karcie pamięci\n" "Kontynuować?" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5952,7 +6160,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5960,7 +6168,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5988,7 +6196,7 @@ msgstr "WaveFileWriter - plik nie jest otwarty." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "Widescreen Hack" @@ -5996,15 +6204,15 @@ msgstr "Widescreen Hack" msgid "Width" msgstr "Szerokość" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Konsola Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Źródło Wii NAND:" @@ -6012,6 +6220,7 @@ msgstr "Źródło Wii NAND:" msgid "Wii Save Import" msgstr "Import zapisów Wii" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -6021,6 +6230,9 @@ msgstr "Import zapisów Wii" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Pliki zapisu Wii (*.bin)|*.bin" @@ -6087,10 +6299,11 @@ msgstr "Windows Menu" msgid "Windows Right" msgstr "Windows Right" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "Zawijanie wierszy" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -6106,6 +6319,11 @@ msgstr "Zawijanie wierszy" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Pracuję..." @@ -6113,6 +6331,11 @@ msgstr "Pracuję..." msgid "Write to Console" msgstr "Wpisz do konsoli" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "Wpisz do pliku" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "Wpisz do pliku" @@ -6169,7 +6392,7 @@ msgstr "" msgid "You must enter a valid profile name." msgstr "Musisz wprowadzić poprawną nazwę profilu." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Musisz ponownie uruchomić program w celu zaaplikowania zmian." @@ -6192,7 +6415,7 @@ msgstr "" "Powinno być 0x%04x (jest 0x%04llx)\n" "Czy chcesz wygenerować nowy?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "ZTP hack" @@ -6263,7 +6486,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -6294,12 +6517,12 @@ msgstr "to nie jest zapis Wii lub błąd odczytu rozmiaru nagłówka pliku %x" msgid "s" msgstr "s" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "nieznane polecenie 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute zwrócił -1 przy uruchamianiu programu!" @@ -6508,6 +6731,9 @@ msgstr "| OR" #~ msgid "Emulator Display Settings" #~ msgstr "Ustawienia ekranu emulatora" +#~ msgid "Enable Audio Throttle" +#~ msgstr "Włącz Audio Throttle" + #~ msgid "Enable CPU Access" #~ msgstr "Włącz dostęp CPU" @@ -6830,6 +7056,22 @@ msgstr "| OR" #~ msgid "The file " #~ msgstr "Plik" +#~ msgid "" +#~ "This is used to control game speed by sound throttle.\n" +#~ "Disabling this could cause abnormal game speed, such as too fast.\n" +#~ "But sometimes enabling this could cause constant noise.\n" +#~ "\n" +#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." +#~ msgstr "" +#~ "Ustawienia te wykorzystywane są do kontrolowania szybkości gry przez " +#~ "sound throttle(spowalnianie dźwięku).\n" +#~ "Wyłączenie tego może spowodować nienormalne działanie gry, np. zbyt " +#~ "szybkie działanie.\n" +#~ "Czasami powoduje stały szum.\n" +#~ "\n" +#~ "Skrót klawiszowy : Przytrzymaj by natychmiastowo wyłączyc Audio " +#~ "Throttle." + #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "To zazwyczaj jest używane do odtwarza głosów i efektów dźwiękowych." diff --git a/Languages/po/pt.po b/Languages/po/pt.po index 89c344c8b5..1cee620d50 100644 --- a/Languages/po/pt.po +++ b/Languages/po/pt.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -16,6 +17,9 @@ msgstr "" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Update from master branch. +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-07-23 15:53-0000\n" "Last-Translator: Zilaan \n" "Language-Team: Zilaan \n" @@ -59,9 +63,9 @@ msgstr "\"%s\" Ficheiro GCM/ISO inválido, ou não é um ISO de GC/Wii." msgid "%1$sCopy%1$s" msgstr "%1$sCopiar%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -154,7 +158,7 @@ msgstr "%sExportar GCI%s" msgid "%sImport GCI%s" msgstr "%sImportar GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u Blocos livres; %u Entradas de directórios livres" @@ -187,11 +191,11 @@ msgstr "&Gestor de Cheats" msgid "&DSP Settings" msgstr "&Definições de DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&Eliminar ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&Eliminar ISOs seleccionados..." @@ -255,7 +259,7 @@ msgstr "&Pausa" msgid "&Play" msgstr "&Começar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&Propriedades" @@ -299,7 +303,7 @@ msgstr "&Ver" msgid "&Wiimote Settings" msgstr "&Definições Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "&Wiki" @@ -343,7 +347,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -352,7 +356,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -409,13 +413,13 @@ msgstr "" "\n" "Tem que fazer forward TCP para ser host!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "Códigos AR" @@ -427,11 +431,11 @@ msgstr "Sobre o Dolphin" msgid "Acceleration" msgstr "Aceleração" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "Precisão:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Emulação VBeam precisa" @@ -552,11 +556,11 @@ msgstr "Adaptador:" msgid "Add" msgstr "Adicionar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "Adicionar Código ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "Adicionar Patch" @@ -564,6 +568,7 @@ msgstr "Adicionar Patch" msgid "Add new pane" msgstr "Adicionar novo painel" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -579,6 +584,11 @@ msgstr "Adicionar novo painel" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Adicionar..." @@ -627,11 +637,11 @@ msgid "Adjust the analog control pressure required to activate buttons." msgstr "" "Ajustar a pressão de controlo analógico necessária para activar os botões." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "Avançadas" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Definições avançadas" @@ -639,14 +649,15 @@ msgstr "Definições avançadas" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Todos os ficheiros GC/Wii (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Todas as imagens GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "Todos os ficheiros Gamecube GCM (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -659,18 +670,22 @@ msgstr "Todos os ficheiros Gamecube GCM (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Todos os Estados Guardados (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "Todos os ficheiros Wii ISO (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Todos os ficheiros GC/Wii ISO comprimidos (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "Todos os ficheiros (*.*)|*.*" @@ -686,7 +701,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "Wiimote Emulado" @@ -707,7 +722,7 @@ msgstr "Apploader é do tamanho errado...é mesmo uma apploader?" msgid "Apploader unable to load from file" msgstr "Apploader impossibilitada de carregar através do ficheiro" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Apploader:" @@ -725,7 +740,7 @@ msgstr "" "\n" "Em caso de dúvida, seleccione (off)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Árabe" @@ -734,7 +749,7 @@ msgstr "Árabe" msgid "Are you sure you want to delete \"%s\"?" msgstr "Tem a certeza que quer apagar \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -742,12 +757,13 @@ msgstr "" "Tem a certeza que quer apagar estes ficheiros?\n" "Serão eliminados permanentemente!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Tem a certeza que quer eliminar este ficheiro? Será eliminado " "permanentemente!" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -757,6 +773,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Proporção de ecrã:" @@ -765,18 +784,20 @@ msgstr "Proporção de ecrã:" msgid "At least one pane must remain open." msgstr "Pelo menos um painel deve manter-se aberto." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Áudio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Áudio Backend :" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Erro ao abrir dispositivo AO.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -786,6 +807,9 @@ msgstr "AudioCommon: Erro ao abrir dispositivo AO.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automático" @@ -829,7 +853,7 @@ msgstr "" msgid "Back" msgstr "Trás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Definições Backend" @@ -856,11 +880,11 @@ msgstr "Cabeçalho de ficheiro inválido" msgid "Banner" msgstr "Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "Detalhes de Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "Banner:" @@ -872,7 +896,7 @@ msgstr "Barra" msgid "Basic" msgstr "Básico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Definições Básicas" @@ -903,6 +927,7 @@ msgstr "Azul Direita" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -910,6 +935,9 @@ msgstr "Azul Direita" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Inferior" @@ -918,7 +946,7 @@ msgstr "Inferior" msgid "Bound Controls: %lu" msgstr "Controlos agregados: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Inactivo" @@ -934,7 +962,7 @@ msgstr "Procurar por uma pasta para adicionar" msgid "Browse for an ISO directory..." msgstr "Procurar por uma pasta de ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "Procurar por pasta de destino" @@ -964,11 +992,11 @@ msgstr "C Stick" msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "Motor de emulador de CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "Cache de listas de Visualização" @@ -1021,7 +1049,7 @@ msgstr "Impossível abrir %s" msgid "Cannot unregister events with events pending" msgstr "Impossível retirar registo de eventos quando há eventos pendentes" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1031,7 +1059,7 @@ msgstr "" "Não é possível utilizar o ficheiro como cartão de memória.\n" "Está a tentar utilizar o mesmo ficheiro nas duas slots?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1050,8 +1078,6 @@ msgstr "" msgid "Cant find WiiMote by connection handle %02x" msgstr "Não foi possível encontrar WiiMote por esta conexão %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1061,7 +1087,7 @@ msgstr "Não foi possível ler através do DVD_Plugin - DVD-Interface: Erro fata msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "Catalão" @@ -1086,7 +1112,7 @@ msgstr "Mudar Disco" msgid "Change Game" msgstr "Mudar de Jogo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1102,8 +1128,8 @@ msgstr "Alterações assinaladas a parâmetro zFar (após correcção)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Mudanças assinaladas a parâmetro zNear (após correcção)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "" "Alterações não vão surtir efeito enquanto o emulador estiver em execução!" @@ -1124,31 +1150,31 @@ msgstr "Procura de Cheats" msgid "Cheats Manager" msgstr "Gestor de Cheats" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Chinês (Simplificado)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Chinês (Tradicional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "Escolha uma pasta de raiz do DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "Escolha uma pasta de raiz NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Escolha um ISO padrão:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "Escolha uma pasta para adicionar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Escolha um ficheiro para abrir" @@ -1156,7 +1182,7 @@ msgstr "Escolha um ficheiro para abrir" msgid "Choose a memory card:" msgstr "Escolha um cartão de memória:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1164,8 +1190,8 @@ msgstr "" "Escolha o ficheiro a usar como apploader: (aplica-se a apenas a discos " "construídos através de pastas)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Escolha a pasta para extrair" @@ -1177,14 +1203,14 @@ msgstr "Stick circular" msgid "Classic" msgstr "Clássico" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "Limpar" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "Limpeza falhou" @@ -1200,6 +1226,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 @@ -1208,6 +1235,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Fechar" @@ -1231,20 +1262,20 @@ msgstr "Comando" msgid "Comment" msgstr "Comentário" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Comentar:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "Comprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Comprimir ISOs seleccionados..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "A comprimir ISO" @@ -1271,13 +1302,13 @@ msgstr "Configuração de Comandos" msgid "Configure..." msgstr "Configurar..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "Confirmar Substituição de Ficheiro" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "Confirmar Ao Parar" @@ -1286,7 +1317,7 @@ msgstr "Confirmar Ao Parar" msgid "Connect" msgstr "Conectar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "Conectar Teclado USB" @@ -1343,12 +1374,12 @@ msgstr "Converter para GCI" msgid "Copy failed" msgstr "Cópia Falhou" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "Copiar para o Cartão de memória %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "Core" @@ -1378,7 +1409,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Não foi possível reconhecer ficheiro ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "Não foi possível guardar %s" @@ -1392,7 +1423,7 @@ msgstr "" "execução!\n" "(definir os controlos enquanto o jogo está em execução ainda não é suportado)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1405,7 +1436,7 @@ msgstr "" "Está a correr o Dolphin através de CD/DVD, ou o ficheiro de jogo guardado " "está com protecção contra escrita?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "Não foi possível encontrar comando aberto para a extensão 'ini'!" @@ -1422,7 +1453,7 @@ msgstr "" msgid "Count:" msgstr "Contador:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "País" @@ -1436,25 +1467,25 @@ msgstr "Criar um código AR" msgid "Create new perspective" msgstr "Criar nova perspectiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "Criado por KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Criado por Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "Criado por VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "Criado por black_rider e publicado em ForumW.org > Web Developments" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "Criador:" @@ -1462,7 +1493,7 @@ msgstr "Criador:" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "Recortar" @@ -1485,7 +1516,7 @@ msgstr "Desvanecimento cruzado" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "A pasta actual mudou de %s para %s depois wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "Hack de projecção personalizada" @@ -1493,11 +1524,11 @@ msgstr "Hack de projecção personalizada" msgid "Custom Projection Hack Settings" msgstr "Definições de Hack de projecção customizada" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "Personalizar alguns parâmetros de Projecção Ortogonal." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Checo" @@ -1509,10 +1540,11 @@ msgstr "D-Pad" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "Motor de Emulador DSP" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1523,18 +1555,22 @@ msgstr "Motor de Emulador DSP" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulação de DSP HLE (rápido)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "Interpretador DSP LLE (lento)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "DSP LLE em thread" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "Recompilador de DSP LLE" @@ -1542,15 +1578,23 @@ msgstr "Recompilador de DSP LLE" msgid "DSP settings" msgstr "Definições de DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "Raiz de DVD:" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "Dimensão de Dados" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "Data:" @@ -1571,7 +1615,7 @@ msgstr "Zona morta" msgid "Debug" msgstr "Depuração" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "Depuração" @@ -1579,16 +1623,16 @@ msgstr "Depuração" msgid "Decimal" msgstr "Decimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "Descomprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "Descomprimir ISOs seleccionados..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "A descomprimir ISO" @@ -1596,11 +1640,11 @@ msgstr "A descomprimir ISO" msgid "Default" msgstr "Padrão" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "ISO Padrão:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "Tipo de letra Padrão" @@ -1609,7 +1653,7 @@ msgstr "Tipo de letra Padrão" msgid "Delete" msgstr "Apagar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "Apagar Jogo Guardado" @@ -1618,7 +1662,7 @@ msgstr "Apagar Jogo Guardado" msgid "Delete the existing file '%s'?" msgstr "Apagar o ficheiro existente '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "Descrição" @@ -1626,8 +1670,8 @@ msgstr "Descrição" msgid "Detect" msgstr "Detectar" -#: 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 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." @@ -1640,8 +1684,8 @@ msgstr "" msgid "Device" msgstr "Dispositivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Definições de Dispositivo" @@ -1666,23 +1710,23 @@ msgstr "" " e verificação da cópia de segurança de pasta falhou" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "Desactivar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "Desactivar Nevoeiro" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "Desactivar Luminosidade" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "Desactivar Profundidade por Pixel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "Desactivar Texturas" @@ -1726,7 +1770,7 @@ msgstr "" "\n" "Em caso de duvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Disco" @@ -1753,6 +1797,7 @@ msgstr "" msgid "Divide" msgstr "Dividir" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1762,10 +1807,13 @@ msgstr "Dividir" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Deseja parar a emulação actual?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1790,6 +1838,7 @@ msgstr "Configuração da emulação de Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1814,6 +1863,14 @@ msgstr "Configuração de GCPad " #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Configuração de GCPad " + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS filmes (*.dtm)" @@ -1846,11 +1903,11 @@ msgstr "" msgid "Down" msgstr "Baixo" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "Download de Códigos (Base de dados WiiRD)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Descarregados %lu códigos. (adicionados %lu)" @@ -1859,23 +1916,23 @@ msgstr "Descarregados %lu códigos. (adicionados %lu)" msgid "Drums" msgstr "Tambores" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "Dummy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "Depositar Áudio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "Depositar Alvo EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "Depositar Quadros" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "Depositar Texturas" @@ -1910,6 +1967,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1925,6 +1983,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Holandês" @@ -1949,7 +2012,7 @@ msgstr "" "reiniciar o computador para que o Windows possa reconhecer o novo " "controlador." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "EUROPA" @@ -1965,7 +2028,7 @@ msgstr "Editar" msgid "Edit ActionReplay Code" msgstr "Editar Código ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Editar Configuração" @@ -1977,8 +2040,8 @@ msgstr "Editar Patch" msgid "Edit current perspective" msgstr "Editar perspectiva actual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "Editar..." @@ -2028,7 +2091,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Wiimote Emulado" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "Estado da Emulação:" @@ -2056,23 +2119,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "Activar Execução de relatórios AR" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "Activar Regulador Áudio" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "Activar BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Activar Fusão de blocos" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -2085,6 +2148,7 @@ msgstr "" msgid "Enable Cache" msgstr "Activar Cache" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2094,51 +2158,54 @@ msgstr "Activar Cache" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Activar Cheats" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "Activar Música DTK" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Activar Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Activar Dual Core (aumento de desempenho)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "Activar Teclas de Atalho" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Activar Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Activar Idle Skipping (aumento de desempenho)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Activar MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "Activar Progressive Scan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "Activar Protector de Ecrã" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "Activar Ecrã Panorâmico" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "Activar Wireframe" @@ -2156,7 +2223,7 @@ msgstr "" "\n" "Em caso de dúvida, seleccione 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2164,7 +2231,7 @@ msgstr "" "Activar acesso rápido ao disco. Necessário para alguns jogos. (ON = Rápido, " "OFF = Compatível)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "Activar Páginas" @@ -2193,7 +2260,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2201,7 +2268,7 @@ msgstr "" "Activar isto para aumentar desempenho no The Legend of Zelda: Twilight " "Princess. Desactive para qualquer outro jogo." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2211,7 +2278,7 @@ msgstr "" "Gestão de Memória. Precisa para o hardware, mas lenta para emular. (ON = " "Compatível, OFF = Rápida)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "Hack de projecção customizada" @@ -2227,7 +2294,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2249,6 +2316,7 @@ msgstr "" msgid "End" msgstr "Fim" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2264,6 +2332,11 @@ msgstr "Fim" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Inglês" @@ -2294,6 +2367,7 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Erro" @@ -2324,20 +2398,26 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "Erro" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "Erro ao carregar o idioma seleccionado. Será revertido para o idioma padrão " "do sistema." -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, 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 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2372,7 +2452,7 @@ msgstr "Sair do Dolphin com emulador" msgid "Export Failed" msgstr "A Exportação Falhou" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "Exportar Ficheiro" @@ -2385,15 +2465,15 @@ msgstr "Exportar Gravação" msgid "Export Recording..." msgstr "Exportar Gravação..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "Exportar Jogo Guardado" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "Exportar jogo guardado Wii (Experimental)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "Exportar todos os jogos guardados" @@ -2409,7 +2489,7 @@ msgstr "Exportar guardar como..." msgid "Extension" msgstr "Extensão" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "Frame Buffer externo" @@ -2421,44 +2501,44 @@ msgstr "Parâmetro Extra" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Parâmetro Extra apenas útil em \"Metroid: Other M\"." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "Extrair Todos os Ficheiros..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "Extrair Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "Extrair DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "Extrair Pasta..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "Extrair Ficheiro..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "Extrair Partição..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "A Extrair %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "A Extrair Todos os Ficheiros" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "A Extrair Pasta" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "A Extrair..." @@ -2470,11 +2550,11 @@ msgstr "FIFO Byte" msgid "FIFO Player" msgstr "Reprodutor FIFO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "FRANÇA" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "Tamanho FST:" @@ -2486,11 +2566,11 @@ msgstr "A Conexão Falhou!" msgid "Failed to Listen!!" msgstr "A Escuta Falhou!!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "Falha ao descarregar códigos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Falha ao extrair para %s!" @@ -2609,18 +2689,28 @@ msgstr "Falha ao escrever cabeçalho para %s" msgid "Failed to write header for file %d" msgstr "Falha ao escrever cabeçalho para o ficheiro %d" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "Rápido" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "Mipmaps rápidos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "Versão rápida do MMU. Não funciona em todos os jogos." +#: Source/Core/Core/Src/Movie.cpp:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "Reprodutor Fifo" @@ -2629,7 +2719,7 @@ msgstr "Reprodutor Fifo" msgid "File Info" msgstr "Informação de Ficheiro" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "O ficheiro não continha códigos." @@ -2662,16 +2752,16 @@ msgstr "Ficheiros não são reconhecidos como sendo de cartão de memória" msgid "File not compressed" msgstr "Ficheiro não comprimido" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Modo aberto desconhecido : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "Sistema de ficheiros" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Tipo de ficheiro 'ini' é desconhecido! Não será aberto!" @@ -2679,7 +2769,7 @@ msgstr "Tipo de ficheiro 'ini' é desconhecido! Não será aberto!" msgid "First Block" msgstr "Primeiro Bloco" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "Corrigir Checksums" @@ -2691,7 +2781,7 @@ msgstr "Forçar 16:9" msgid "Force 4:3" msgstr "Forçar 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "Definir a consola como NTSC-J" @@ -2724,7 +2814,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2760,7 +2850,7 @@ msgstr "Quadro" msgid "Frame Advance" msgstr "Avançar Quadro" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "Depósitos de Quadros usam FFV1" @@ -2772,7 +2862,7 @@ msgstr "Alcance de Quadros" msgid "Frame S&kipping" msgstr "S&altar Quadros" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Limite de Quadros:" @@ -2780,10 +2870,11 @@ msgstr "Limite de Quadros:" msgid "Frames To Record" msgstr "Quadros para Gravar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "Vista Livre" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2799,6 +2890,11 @@ msgstr "Vista Livre" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Francês" @@ -2832,7 +2928,7 @@ msgstr "Configuração de Relatório" msgid "GCPad" msgstr "ComandoGC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "ID do Jogo:" @@ -2848,15 +2944,15 @@ msgstr "O jogo não está a correr!" msgid "Game not found!!" msgstr "Jogo não encontrado" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "Definições específicas por jogo" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Configuração de Jogo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" @@ -2867,6 +2963,7 @@ msgstr "Definições de Comando &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 @@ -2874,6 +2971,9 @@ msgstr "Definições de Comando &Gamecube" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Cartões de memória Gamecube (*.raw,*.gcp)" @@ -2882,15 +2982,17 @@ msgid "Gamecube Pad settings" msgstr "Definições de Comando Gamecube" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Códigos Gecko" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" "GeckoCode falhou ao executar (CT%i CST%i) (%s)\n" "(Ou é um código com erros ou o tipo de código não é suportado.)" @@ -2899,6 +3001,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 @@ -2907,6 +3010,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Geral" @@ -2915,6 +3021,7 @@ msgstr "Geral" msgid "General Settings" msgstr "Definições Gerais" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2930,6 +3037,11 @@ msgstr "Definições Gerais" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Alemão" @@ -2967,7 +3079,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção activada." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Grego" @@ -2999,7 +3111,7 @@ msgstr "Hacks" msgid "Header checksum failed" msgstr "Verificação de Cabeçalho falhou" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Hebraico" @@ -3068,12 +3180,16 @@ msgstr "Configuração de Teclas de atalho" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Teclas de Atalho" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Húngaro" @@ -3081,14 +3197,14 @@ msgstr "Húngaro" msgid "Hybrid Wiimote" msgstr "Wiimote Hibrido" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS:Tentativa de obter dados de um ticket desconhecido: %08x/" "%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -3101,11 +3217,11 @@ msgstr "" "TitleID %016llx.\n" " O Dolphin irá provavelmente bloquear agora" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - destino inválido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "Definições IPL" @@ -3121,15 +3237,15 @@ msgstr "Ponteiro Infra Vermelho" msgid "IR Sensitivity:" msgstr "Sensibilidade de Infra Vermelhos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "Detalhes ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "Pastas ISO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "Itália" @@ -3137,23 +3253,25 @@ msgstr "Itália" msgid "Icon" msgstr "Ícone" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "Se os FPS são erráticos, esta opção poderá ajudar. (ON = Compatível, OFF = " "Rápido)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy 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." +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " +"Audio to throttle using the DSP (might fix audio clicks but can also cause " +"constant noise depending on the game)." msgstr "" "Se definir o limite de Quadros, superior à velocidade completa do jogo " "(NTSC:60, PAL:50), também terá que desactivar o Regulador Áudio em DSP para " @@ -3191,7 +3309,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "Importar Jogo Guardado" @@ -3242,7 +3360,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "Em Jogo" @@ -3251,7 +3369,7 @@ msgid "In-Game" msgstr "Em-Jogo" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Informação" @@ -3271,7 +3389,7 @@ msgstr "Inserir" msgid "Insert Encrypted or Decrypted code here..." msgstr "Insira o código criptográfado ou \"descriptografado\" aqui..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Inserir Cartão SD" @@ -3283,7 +3401,7 @@ msgstr "Introduza o nome aqui..." msgid "Install WAD" msgstr "Instalar WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Instalar para o Menu Wii" @@ -3293,6 +3411,7 @@ msgid "" msgstr "" "InstallExceptionHandler chamado, mas esta plataforma ainda não a suporta." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3302,14 +3421,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "A Instalar WAD..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "Iinterface" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "Definições de interface" @@ -3334,11 +3456,11 @@ msgstr "Erro interno de LZO - lzo_init() falhou" msgid "Internal Resolution:" msgstr "Resolução Interna:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Interpretador (Muito lento)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "Intro" @@ -3355,7 +3477,7 @@ msgstr "Valor inválido!" msgid "Invalid bat.map or dir entry" msgstr "bat.map inválido ou entrada de pasta" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "Tipo de evento inválido %i" @@ -3375,14 +3497,15 @@ msgstr "" "%s\n" " Poderá ter que refazer o depósito deste jogo." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "Ficheiro de Gravação inválido" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "Estado Inválido" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3398,27 +3521,32 @@ msgstr "Estado Inválido" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italiano" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "JAPÃO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "Recompilador JIT (recomendado)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "Recompilador experimental JITIL" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japonês" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "COREIA" @@ -3427,8 +3555,8 @@ msgstr "COREIA" msgid "Key" msgstr "Tecla" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Coreano" @@ -3446,7 +3574,7 @@ msgstr "Botão L" msgid "L-Analog" msgstr "L-Analógico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "Idioma:" @@ -3499,7 +3627,7 @@ msgstr "" msgid "Less Than" msgstr "Inferior que" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "Limitar por FPS" @@ -3507,7 +3635,7 @@ msgstr "Limitar por FPS" msgid "Load" msgstr "Carregar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "Carregar Texturas Personalizadas" @@ -3555,6 +3683,7 @@ msgstr "Carregar Estado Slot 8" msgid "Load State..." msgstr "Carregar Estado..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3576,6 +3705,13 @@ msgstr "Carregar Sistema de Menu Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "Carregar Sistema de Menu Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar Sistema de Menu Wii %d%c" @@ -3602,7 +3738,7 @@ msgstr "Carrega o ficheiro especifico (DOL,ELF,GCM,ISO,WAD)" msgid "Local" msgstr "Local" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Bloqueia as threads aos núcleos" @@ -3614,11 +3750,11 @@ msgstr "Relatório" msgid "Log Configuration" msgstr "Configuração de Relatório" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Tipos de Relatório" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Saídas de Gerador de Relatórios" @@ -3648,7 +3784,7 @@ msgstr "" "MD5 não combina\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU Hack de velocidade" @@ -3670,11 +3806,11 @@ msgstr "ficheiros MadCatz Gameshark(*.gcs)" msgid "Main Stick" msgstr "Stick Principal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "ID do autor:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "Fabricante:" @@ -3698,6 +3834,7 @@ msgstr "Byte de Memória" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3705,6 +3842,9 @@ msgstr "Byte de Memória" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Cartão de memória" @@ -3741,7 +3881,7 @@ msgstr "" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "Mic" @@ -3750,11 +3890,11 @@ msgstr "Mic" msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "Diversos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Configurações Diversas" @@ -3775,7 +3915,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "Tipo de letra monoespaçada" @@ -3788,7 +3928,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3811,7 +3951,7 @@ msgstr "" msgid "Multiply" msgstr "Multiplicar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3903,6 +4043,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Cima" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3912,6 +4053,9 @@ msgstr "NP Cima" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3920,7 +4064,7 @@ msgstr "Nome:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Nome:" @@ -3934,7 +4078,7 @@ msgid "New Scan" msgstr "Nova procura" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "Próxima Página" @@ -3946,7 +4090,7 @@ msgstr "Próxima Procura" msgid "Nickname :" msgstr "Alcunha :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "Sem País (SDK)" @@ -3985,7 +4129,7 @@ msgstr "Não foi encontrada a pasta de jogo guardado para o título %s" msgid "None" msgstr "Nenhum" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Bokmaal Norueguês" @@ -3993,8 +4137,8 @@ msgstr "Bokmaal Norueguês" msgid "Not Equal" msgstr "Não igual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "Não definido" @@ -4014,7 +4158,7 @@ msgstr "Não conectado" msgid "Notes" msgstr "Notas" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "Notas:" @@ -4052,7 +4196,7 @@ msgstr "Objecto" msgid "Object Range" msgstr "Alcance de Objecto" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Desligado" @@ -4078,11 +4222,11 @@ msgstr "Apenas %d blocos disponíveis" msgid "Open" msgstr "Abrir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "Abrir &Pasta" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "Abrir Pasta de &Jogo guardado Wii " @@ -4104,11 +4248,11 @@ msgstr "OpenAL: não foram encontrados dispositivos de som" msgid "OpenAL: can't open device %s" msgstr "OpenAL: não foi possível abrir dispositivo %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "Descodificador de Textura OpenCL" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "Descodificador de Textura OpenMP" @@ -4140,7 +4284,7 @@ msgstr "" "e importe os jogos guardados para um novo cartão de memória\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "Outro" @@ -4192,19 +4336,20 @@ msgstr "Parágrafo" msgid "Parameters" msgstr "Parâmetros" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partição %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Patches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Caminhos" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4217,6 +4362,10 @@ msgstr "Caminhos" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -4225,7 +4374,7 @@ msgstr "Pausa" msgid "Per-Pixel Lighting" msgstr "Iluminação por Pixel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Perfeito" @@ -4238,6 +4387,7 @@ msgstr "Perspectiva %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 ======= @@ -4248,6 +4398,10 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Começar" @@ -4261,7 +4415,7 @@ msgstr "Tocar Gravação" msgid "Play/Pause" msgstr "Começar/Pausar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "Jogável" @@ -4273,6 +4427,7 @@ msgstr "Opções de Reprodução" msgid "Players" msgstr "Jogadores" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4282,6 +4437,9 @@ msgstr "Jogadores" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Por favor confirme..." @@ -4293,23 +4451,23 @@ msgstr "Por favor crie uma perspectiva antes de guardar" msgid "Plus-Minus" msgstr "Mais-Menos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Polaco" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Port 4" @@ -4318,11 +4476,11 @@ msgstr "Port 4" msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Português" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Português (Brasileiro)" @@ -4330,17 +4488,17 @@ msgstr "Português (Brasileiro)" msgid "Post-Processing Effect:" msgstr "Efeito de Pós-Processamento" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4353,7 +4511,7 @@ msgstr "Predefinições:" msgid "Prev Page" msgstr "Pág Anterior" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "Página Anterior" @@ -4404,7 +4562,7 @@ msgstr "R-Analógico" msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "RUSSIA" @@ -4417,7 +4575,7 @@ msgstr "Alcance" msgid "Read-only mode" msgstr "Modo só de leitura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "Real" @@ -4494,6 +4652,7 @@ msgstr "Actualizar Lista" msgid "Refresh game list" msgstr "Actualizar lista de Jogos" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4512,6 +4671,12 @@ msgstr "Actualizar lista de Jogos" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Remover" @@ -4564,11 +4729,11 @@ msgstr "Stick Direito" msgid "Rumble" msgstr "Vibração" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Correr DSP LLE numa thread dedicada (não recomendado)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Russo" @@ -4576,10 +4741,11 @@ msgstr "Russo" msgid "Sa&ve State" msgstr "Gua&rdar Estado" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "Seguro" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4589,6 +4755,9 @@ msgstr "Seguro" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Taxa de Amostragem:" @@ -4646,12 +4815,12 @@ msgstr "Guardar Estado Slot 8" msgid "Save State..." msgstr "Guardar Estado..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Guardar como..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Guardar GCM/ISO comprimido" @@ -4659,11 +4828,11 @@ msgstr "Guardar GCM/ISO comprimido" msgid "Save current perspective" msgstr "Guardar perspectiva actual" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "Jogo guardado descomprimido GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "O filme de Savestate %s está corrupto, gravação de filme a parar..." @@ -4672,6 +4841,7 @@ 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 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4681,15 +4851,18 @@ msgstr "Cópia EFB Escalada" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "A procurar %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "A procurar ISOs" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "Em Analise..." @@ -4705,12 +4878,12 @@ msgstr "Scroll Lock" msgid "Search Filter" msgstr "Filtro de Pesquisa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Procurar em Sub-Pastas" -#: 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:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "Selecção %s não encontrada em SYSCONF" @@ -4720,6 +4893,7 @@ msgstr "Selecção %s não encontrada em SYSCONF" msgid "Select" msgstr "Seleccionar" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4744,6 +4918,14 @@ msgstr "Seleccione o Ficheiro de Gravação" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Seleccione o Ficheiro de Gravação" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Seleccione um ficheiro Wii WAD para instalar" @@ -4769,6 +4951,7 @@ msgstr "Seleccionar janelas flutuantes" msgid "Select the file to load" msgstr "Seleccione o ficheiro para carregar" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 @@ -4785,19 +4968,26 @@ msgstr "Seleccione o estado para carregar" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Seleccione o ficheiro de jogo guardado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Seleccione o estado para carregar" +<<<<<<< HEAD <<<<<<< 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. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Seleccione o estado para gravar" @@ -4819,7 +5009,7 @@ msgstr "" "da sua proporção.\n" "Em caso de dúvida, seleccione Automático." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Tipo de letra seleccionado" @@ -4867,11 +5057,11 @@ msgstr "Posição da Barra de Sensor:" msgid "Separator" msgstr "Separador" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Sérvio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4882,11 +5072,11 @@ msgstr "" msgid "Set" msgstr "Definir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "Definir como ISO &padrão" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "Definir como cartão de memória padrão %c" @@ -4896,7 +5086,7 @@ msgstr "Definir como cartão de memória padrão %c" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "SetARCode_IsActive:O Index é maior que a lista de códigos ar %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "Definições..." @@ -4908,7 +5098,7 @@ msgstr "SetupWiiMem: Não consegue encontrar o ficheiro de definições" msgid "Shake" msgstr "Abanar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "Abreviatura:" @@ -4936,7 +5126,7 @@ msgstr "Mostrar Barra de Ferramen&tas" msgid "Show Drives" msgstr "Mostrar Unidades" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "Mostrar Regiões de Cópia EFB" @@ -4952,7 +5142,7 @@ msgstr "Mostrar França" msgid "Show GameCube" msgstr "Mostrar GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "Mostrar visualização de Entradas" @@ -4968,7 +5158,7 @@ msgstr "Mostrar Japão" msgid "Show Korea" msgstr "Mostrar Coreia" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "Mostrar Idioma:" @@ -4988,7 +5178,7 @@ msgstr "Mostrar Plataformas" msgid "Show Regions" msgstr "Mostrar Regiões" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "Mostrar Estatísticas" @@ -5008,11 +5198,11 @@ msgstr "Mostrar Wad" msgid "Show Wii" msgstr "Mostrar Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "Mostrar uma caixa de confirmação antes de parar um jogo." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 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 " @@ -5022,23 +5212,23 @@ msgstr "" "Desactivar isto poderá evitar mensagens irritantes e não-fatais, mas também " "poderá não explicar o motivo pelo qual o Dolphin crashe de repente." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "Mostrar primeiro bloco" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "Mostrar blocos de guardar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "Mostrar guardar comentário" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "Mostrar ícone de guardar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "Mostrar o título de jogo guardado" @@ -5076,7 +5266,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Wiimote na horizontal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Chinês Simplificado" @@ -5084,11 +5274,11 @@ msgstr "Chinês Simplificado" msgid "Size" msgstr "Dimensão" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "Saltar Bios" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "Saltar Dest. Alpha Pass" @@ -5131,11 +5321,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Slot B" @@ -5160,7 +5350,7 @@ msgstr "" "Tem a certeza que quer activar a renderização por software? Em caso de " "dúvida, seleccione 'Não'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "Definições de Som" @@ -5178,6 +5368,7 @@ msgstr "Criação do buffer de som falhou: %s" msgid "Space" msgstr "Espaço" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5193,6 +5384,11 @@ msgstr "Espaço" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Espanhol" @@ -5224,7 +5420,7 @@ msgstr "" msgid "Specify a video backend" msgstr "Especifique um plugin de vídeo" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Aumente a taxa de transferência do disco" @@ -5232,7 +5428,7 @@ msgstr "Aumente a taxa de transferência do disco" msgid "Square Stick" msgstr "Stick quadrado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "Comando padrão" @@ -5330,12 +5526,12 @@ msgstr "Sucesso na importação de ficheiros de jogo guardado" msgid "Swing" msgstr "Balanço" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Idioma do sistema:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "TAIWAN" @@ -5374,7 +5570,7 @@ msgstr "Table Direita" msgid "Take Screenshot" msgstr "Tirar Screenshot" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -5390,7 +5586,7 @@ msgstr "Textura" msgid "Texture Cache" msgstr "Cache de Textura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "Formato da textura" @@ -5406,13 +5602,13 @@ msgstr "O caminho é inválido" msgid "The checksum was successfully fixed" msgstr "A checksum foi reparada com sucesso" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "A pasta escolhida já está na lista" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5437,7 +5633,7 @@ msgstr "" "O ficheiro %s já estava aberto, o cabeçalho do ficheiro não poderá ser " "escrito." -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "O ficheiro que especificou (%s) não existe" @@ -5455,11 +5651,12 @@ msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "O resultado do código AR desencriptado não contém quaisquer linhas." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#, fuzzy msgid "" "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." +"If unsure, use the rightmost value." msgstr "" "Quanto mais seguro o ajuste, menos o emulador irá falhar actualizações de " "texturas através da RAM.\n" @@ -5504,7 +5701,7 @@ msgstr "O ficheiro especificado \"%s\" não existe" msgid "The value is invalid" msgstr "O valor é inválido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Tema" @@ -5512,7 +5709,7 @@ msgstr "Tema" msgid "Theme selection went wrong" msgstr "Selecção de tema correu mal" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5520,7 +5717,7 @@ msgstr "" "Tem que existir um ticket para 00000001/00000002. O seu NAND depositado está " "provavelmente incompleto." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5536,7 +5733,7 @@ msgstr "" "Este simulador de Action Replay não suporta códigos que modifiquem o próprio " "Action Replay" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "Isto poderá causar lentidão no menu Wii e em alguns jogos." @@ -5561,26 +5758,10 @@ msgstr "" "Em caso de dúvida, mantenha esta opção desactivada." #: 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" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" -"Isto é usado para controlar a velocidade do jogo através da regulação por " -"áudio.\n" -"Desactivar isto poderá causar velocidades excessivas nos jogos.\n" -"Mas por vezes activar isto poderá causar ruído constante.\n" -"\n" -"Tecla de Atalho : Pressione continuamente para desactivar " -"instantaneamente o Regulador Áudio." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "Isto é usado para tocar faixas de música, como BGM (Música de fundo)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5592,7 +5773,7 @@ msgstr "" "Provoca aumentos significativos de velocidade em PCs com mais de um núcleo, " "mas também poderá causar crashes ou falhas." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "Isto permite a edição manual do ficheiro de configuração INI" @@ -5615,7 +5796,7 @@ msgstr "Título" msgid "To" msgstr "Para" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "Alternar Todos os Tipos de Relatório" @@ -5635,6 +5816,7 @@ msgstr "Alternar Ecrã Inteiro" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5642,14 +5824,17 @@ msgstr "Alternar Ecrã Inteiro" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Topo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Chinês Tradicional" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "Tentou carregar um tipo de ficheiro desconhecido." @@ -5657,7 +5842,7 @@ msgstr "Tentou carregar um tipo de ficheiro desconhecido." msgid "Triggers" msgstr "Gatilhos" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Tentativa de leitura inválida de SYSCONF" @@ -5669,7 +5854,7 @@ msgstr "" "Tentativa de leitura inválida de SYSCONF\n" " ids bt de wiimote não estão disponíveis" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Turco" @@ -5690,11 +5875,11 @@ msgstr "Porta UDP:" msgid "UDP Wiimote" msgstr "UDP Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "DESCONHECIDO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "EUA" @@ -5779,7 +5964,7 @@ msgstr "Actualizar" msgid "Upright Wiimote" msgstr "Wiimote na vertical" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Usar modo EuRGB60 (PAL60)" @@ -5791,7 +5976,7 @@ msgstr "Utilizar Ecrã Inteiro" msgid "Use Hex" msgstr "Usar Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Usar Manipuladores de Pânico" @@ -5823,7 +6008,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "Utilidade" @@ -5847,25 +6032,29 @@ msgstr "Valor: " msgid "Verbosity" msgstr "Verbosidade" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Vídeo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Virtual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Volume" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "Instalação WAD falhou: erro ao criar %s" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "Instalação WAD falhou: erro ao criar %s" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5885,15 +6074,15 @@ msgstr "" msgid "Warning" msgstr "Aviso" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "Aviso - a começar DOL em modo errado de consola!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Aviso - A iniciar um ELF em modo errado de consola!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Aviso - A iniciar um ISO em modo errado de consola!" @@ -5922,7 +6111,7 @@ msgstr "" "e tem o mesmo nome que um ficheiro no seu cartão de memória\n" "Continuar?" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5930,7 +6119,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5938,7 +6127,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5966,7 +6155,7 @@ msgstr "WaveFileWriter - ficheiro não aberto." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "Hack de Ecrã Panorâmico" @@ -5974,15 +6163,15 @@ msgstr "Hack de Ecrã Panorâmico" msgid "Width" msgstr "Largura" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Consola Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Raiz de NAND Wii:" @@ -5990,6 +6179,7 @@ msgstr "Raiz de NAND Wii:" msgid "Wii Save Import" msgstr "Importação de Jogo Guardado Wii" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5999,6 +6189,9 @@ msgstr "Importação de Jogo Guardado Wii" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Ficheiros de jogo guardado Wii (*.bin)|*.bin" @@ -6067,10 +6260,11 @@ msgstr "Menu de Janelas" msgid "Windows Right" msgstr "Janelas Direita" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "Moldar o texto" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -6086,6 +6280,11 @@ msgstr "Moldar o texto" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "A trabalhar..." @@ -6093,6 +6292,11 @@ msgstr "A trabalhar..." msgid "Write to Console" msgstr "Escrever para Consola" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "Escrever para Ficheiro" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "Escrever para Ficheiro" @@ -6146,7 +6350,7 @@ msgstr "Tem que introduzir um valor decimal, hexadecimal ou octal válido." msgid "You must enter a valid profile name." msgstr "Tem que introduzir um nome de perfil válido." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Tem que reiniciar o Dolphin para que as alterações sejam efectuadas" @@ -6169,7 +6373,7 @@ msgstr "" "Deveria ser 0x%04x (mas é 0x%04llx)\n" "Pretende gerar um novo?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "ZTP hack" @@ -6241,7 +6445,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -6273,12 +6477,12 @@ msgstr "" msgid "s" msgstr "s" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "cmd desconhecido 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute devolveu -1 quando a aplicação executou!" @@ -6432,6 +6636,9 @@ msgstr "| OU" #~ msgid "Emulator Display Settings" #~ msgstr "Definições de Visualização do Emulador" +#~ msgid "Enable Audio Throttle" +#~ msgstr "Activar Regulador Áudio" + #~ msgid "Enable CPU Access" #~ msgstr "Activar acesso ao CPU" @@ -6702,6 +6909,21 @@ msgstr "| OU" <<<<<<< HEAD ======= >>>>>>> Update from master branch. +#~ msgid "" +#~ "This is used to control game speed by sound throttle.\n" +#~ "Disabling this could cause abnormal game speed, such as too fast.\n" +#~ "But sometimes enabling this could cause constant noise.\n" +#~ "\n" +#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." +#~ msgstr "" +#~ "Isto é usado para controlar a velocidade do jogo através da regulação por " +#~ "áudio.\n" +#~ "Desactivar isto poderá causar velocidades excessivas nos jogos.\n" +#~ "Mas por vezes activar isto poderá causar ruído constante.\n" +#~ "\n" +#~ "Tecla de Atalho : Pressione continuamente para desactivar " +#~ "instantaneamente o Regulador Áudio." + #~ msgid "" #~ "Unknown pointer %#08x\n" #~ "Continue?" diff --git a/Languages/po/pt_BR.po b/Languages/po/pt_BR.po index 6dc3dd9b7b..d12775657f 100644 --- a/Languages/po/pt_BR.po +++ b/Languages/po/pt_BR.po @@ -9,7 +9,11 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-12-18 13:38-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -60,9 +64,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sCopiar%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -157,7 +161,7 @@ msgstr "%sExportar GCI%s" msgid "%sImport GCI%s" msgstr "%sImportar GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u Blocos Livres; %u Entradas de Diretórios Livres" @@ -190,11 +194,11 @@ msgstr "Gerenciador de &Cheats" msgid "&DSP Settings" msgstr "Configurações do &DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&Deletar ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&Deletar ISOs selecionadas..." @@ -258,7 +262,7 @@ msgstr "&Pausar" msgid "&Play" msgstr "&Jogar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&Propriedades" @@ -302,7 +306,7 @@ msgstr "&Ver" msgid "&Wiimote Settings" msgstr "Configurações de &Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "&Wiki" @@ -346,7 +350,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -355,7 +359,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -413,13 +417,13 @@ msgstr "" "\n" "Você deve redirecionar as portas TCP para ser o Host!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "Códigos AR" @@ -431,11 +435,11 @@ msgstr "Sobre o Dolphin" msgid "Acceleration" msgstr "Aceleração" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "Precisão:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Emulção precisa de VBeam" @@ -556,11 +560,11 @@ msgstr "Adaptador:" msgid "Add" msgstr "Adicionar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "Adicionar Código ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "Adicionar Patch" @@ -568,6 +572,7 @@ msgstr "Adicionar Patch" msgid "Add new pane" msgstr "Adicionar novo painél" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -583,6 +588,11 @@ msgstr "Adicionar novo painél" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Adicionar..." @@ -630,11 +640,11 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "Ajustar o controle de pressão análogo requerido para ativar os botões" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "Avançado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Configurações Avançadas" @@ -642,14 +652,15 @@ msgstr "Configurações Avançadas" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Todos os arquivos de GC/WII (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Todas as imagens CG/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "Todos os arquivos Gamecube CGM (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -662,18 +673,22 @@ msgstr "Todos os arquivos Gamecube CGM (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Todos os Pontos de Jogo Salvos (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "Todos os Arquivos ISO Wii" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Todos os arquivos ISO GC/Wii comprimidos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "Todos os arquivos (*.*)|*.*" @@ -689,7 +704,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "Emular Wiimote" @@ -710,7 +725,7 @@ msgstr "O Apploader é do tamanho errado... Isso é mesmo um Apploader?" msgid "Apploader unable to load from file" msgstr "O Apploader não pôde carregar do arquivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Apploader:" @@ -728,7 +743,7 @@ msgstr "" "\n" "Se estiver em dúvida, selecione (desligado)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Árabe" @@ -737,7 +752,7 @@ msgstr "Árabe" msgid "Are you sure you want to delete \"%s\"?" msgstr "Você tem certeza de que quer apagar \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -745,12 +760,13 @@ msgstr "" "Você tem certeza que deseja apagar estes arquivos?\n" "Eles estarão perdidos para sempre!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Você tem certeza que quer deletar este arquivo? Ele ficará perdido para " "sempre!" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -760,6 +776,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Proporção:" @@ -768,18 +787,20 @@ msgstr "Proporção:" msgid "At least one pane must remain open." msgstr "Pelo menos um painél deve permanecer aberto." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Áudio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Backend de Audio" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Erro ao abrir o dispositivo AO.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -789,6 +810,9 @@ msgstr "AudioCommon: Erro ao abrir o dispositivo AO.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automático" @@ -832,7 +856,7 @@ msgstr "" msgid "Back" msgstr "Voltar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Configurações do Backend" @@ -859,11 +883,11 @@ msgstr "Header de Arquivo Ruim" msgid "Banner" msgstr "Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "Detalhes de Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "Banner:" @@ -875,7 +899,7 @@ msgstr "Alavanca" msgid "Basic" msgstr "Básico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Configurações Básicas" @@ -906,6 +930,7 @@ msgstr "Azul Direito" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -913,6 +938,9 @@ msgstr "Azul Direito" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Embaixo" @@ -921,7 +949,7 @@ msgstr "Embaixo" msgid "Bound Controls: %lu" msgstr "Controles Acoplados: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Quebrado" @@ -937,7 +965,7 @@ msgstr "Procurar por um diretório para adicionar" msgid "Browse for an ISO directory..." msgstr "Procurar por um diretório ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "Procurar por um diretório de saída" @@ -967,11 +995,11 @@ msgstr "C Stick" msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "Engine de Emulação do CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "Cache das Listas de Display" @@ -1022,7 +1050,7 @@ msgstr "Não é possível abrir %s" msgid "Cannot unregister events with events pending" msgstr "Não é possível cancelar o registro de evnetos com eventos pendentes" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1033,7 +1061,7 @@ msgstr "" "%s\n" "não é um arquivo de Memory Card válido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1053,8 +1081,6 @@ msgid "Cant find WiiMote by connection handle %02x" msgstr "" "Não foi possível encontrar o Wiimote pelo identificador de conexão %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1064,7 +1090,7 @@ msgstr "Não é possível ler de DVD_Plugin - DVD-Interface: Erro Fatal" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "Catalão" @@ -1089,7 +1115,7 @@ msgstr "Mudar o Disco" msgid "Change Game" msgstr "Mudar Jogo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1105,8 +1131,8 @@ msgstr "Muda o sinal para o parâmetro do zFar (após a correção)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Muda o sinal para o parâmetro do zNear (após a correção)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "Mudar isso não vai ter efeito enquanto o emulador estiver rodando!" @@ -1126,31 +1152,31 @@ msgstr "Procura de Cheat" msgid "Cheats Manager" msgstr "Gerenciador de Cheat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Chinês (Simplificado)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Chinês (Tradicional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "Escolher um diretório raiz de DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "Escolha um diretório raíz para o NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Escolher uma ISO padrão:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "Escolher um diretório para adicionar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Escolher um arquivo para abrir" @@ -1158,6 +1184,7 @@ msgstr "Escolher um arquivo para abrir" msgid "Choose a memory card:" msgstr "Escolher um cartão de memória:" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 @@ -1167,6 +1194,9 @@ msgstr "Escolher um cartão de memória:" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1174,8 +1204,8 @@ msgstr "" "Escolher um arquivo para ser usado como apploader: (aplicável somente para " "discos construídos de diretórios)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Escolha a pasta para extrair" @@ -1187,14 +1217,14 @@ msgstr "Analógico Circular" msgid "Classic" msgstr "Clássico" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "Limpar" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "Falha na liberação." @@ -1210,6 +1240,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 @@ -1218,6 +1249,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Fechar" @@ -1241,20 +1276,20 @@ msgstr "Comandos" msgid "Comment" msgstr "Comentar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Comentar:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "Comprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Comprimir ISOs selecionadas..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "Comprimindo ISO" @@ -1281,13 +1316,13 @@ msgstr "Configurar Controles" msgid "Configure..." msgstr "Configurar..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "Confirmar sobrescrição de arquivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "Confirmar ao Parar" @@ -1296,7 +1331,7 @@ msgstr "Confirmar ao Parar" msgid "Connect" msgstr "Conectar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "Conectar Teclado USB" @@ -1353,12 +1388,12 @@ msgstr "Converter para GCI" msgid "Copy failed" msgstr "Falha na Cópia" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "Copiar para Cartão de Memória %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "Núcleo" @@ -1388,7 +1423,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Não foi possível reconhecer o arquivo ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "Não foi possível salvar %s" @@ -1402,7 +1437,7 @@ msgstr "" "no momento!\n" "(Definir os controles durante o jogo ainda não é suportado)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1415,7 +1450,7 @@ msgstr "" "Você está executando o Dolphin de um CD/DVD, ou talvez o arquivo de salva " "seja somente-leitura?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "Não foi possível encontrar comando de abertura para a extensão 'ini'!" @@ -1432,7 +1467,7 @@ msgstr "" msgid "Count:" msgstr "Contagem:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "País:" @@ -1446,10 +1481,11 @@ msgstr "Criar Código AR" msgid "Create new perspective" msgstr "Criar nova perspectiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "Criado por KDE-Look.org" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 @@ -1459,20 +1495,23 @@ msgstr "Criado por KDE-Look.org" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Criado por Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "Criado por VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "Criado por black_rider e publicado no ForumW.org > Web Developments" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "Criador:" @@ -1480,7 +1519,7 @@ msgstr "Criador:" msgid "Critical" msgstr "Crítico" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "Cortar" @@ -1503,7 +1542,7 @@ msgstr "Crossfade" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "O diretório atual mudou de %s para %s depois do wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "Hack de Projeção Customizado" @@ -1511,11 +1550,11 @@ msgstr "Hack de Projeção Customizado" msgid "Custom Projection Hack Settings" msgstr "Configurações de Hack de Projeção Customizado" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "Cuztomize alguns parâmetros de Projeção Ortográfica." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Tcheco" @@ -1527,10 +1566,11 @@ msgstr "Direcional Digital" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "Engine de Emulação do DSP" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1541,18 +1581,22 @@ msgstr "Engine de Emulação do DSP" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulação HLE do DSP (rápido)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "Interpretador LLE do DSP (lento)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "DSP LLE em Segmento" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "Recompilador LLE do DSP" @@ -1560,15 +1604,23 @@ msgstr "Recompilador LLE do DSP" msgid "DSP settings" msgstr "Configurações de Áudio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "Raiz do DVD:" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "Tamanho de Arquivo" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "Data:" @@ -1589,7 +1641,7 @@ msgstr "Zona Morta" msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "Debugging" @@ -1597,16 +1649,16 @@ msgstr "Debugging" msgid "Decimal" msgstr "Decimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "Descomprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "Descomprimir ISOs selecionados..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "Descomprimindo ISO" @@ -1614,11 +1666,11 @@ msgstr "Descomprimindo ISO" msgid "Default" msgstr "Padrão" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "ISO Padrão:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "Fonte Padrão" @@ -1627,7 +1679,7 @@ msgstr "Fonte Padrão" msgid "Delete" msgstr "Excluir" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "Deletar Save" @@ -1636,7 +1688,7 @@ msgstr "Deletar Save" msgid "Delete the existing file '%s'?" msgstr "Apagar o arquivo existente '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "Descrição" @@ -1644,8 +1696,8 @@ msgstr "Descrição" msgid "Detect" msgstr "Detectar" -#: 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 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." @@ -1658,8 +1710,8 @@ msgstr "" msgid "Device" msgstr "Dispositivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Configurações de Dispositivo" @@ -1684,23 +1736,23 @@ msgstr "" " e a checagem de Backup de Diretório falhou" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "Desativar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "Desativar Neblina" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "Desativar Iluminação" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "Desativar Profundidade por Pixel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "Desativar Texturas" @@ -1744,7 +1796,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Disco" @@ -1771,6 +1823,7 @@ msgstr "" msgid "Divide" msgstr "Dividir" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1780,10 +1833,13 @@ msgstr "Dividir" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Você quer parar a emulação atual?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1808,6 +1864,7 @@ msgstr "Configuração de Wiimote Emulado do Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1832,6 +1889,14 @@ 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. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Configuração do GCPad do Dolphin" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmes TAS Dolphin (*.dtm)" @@ -1880,11 +1945,11 @@ msgstr "" msgid "Down" msgstr "Para Baixo" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "Download de Códigos (Banco de Dados WiiRD)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Códigos %lu baixados. (Adicionados %lu)" @@ -1893,23 +1958,23 @@ msgstr "Códigos %lu baixados. (Adicionados %lu)" msgid "Drums" msgstr "Bateria" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "Dummy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "Extrair Áudio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "Extrair Código EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "Extrair Quadros" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "Extrair Texturas" @@ -1943,6 +2008,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1958,6 +2024,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Holandês" @@ -1982,7 +2053,7 @@ msgstr "" "PC é provavelmente necessário no momento para que o Windows veja o novo " "driver." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "EUROPA" @@ -1998,7 +2069,7 @@ msgstr "Editar" msgid "Edit ActionReplay Code" msgstr "Editar Código ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Editar Configuração" @@ -2010,8 +2081,8 @@ msgstr "Editar Patch" msgid "Edit current perspective" msgstr "Editar perspectiva atual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "Editar..." @@ -2061,7 +2132,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Emular Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "Estado de Emulação" @@ -2089,23 +2160,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "Ativar Registro AR" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "Ativar Throttle de Áudio" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "Ativar BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Ativar Block Merging" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -2118,6 +2189,7 @@ msgstr "" msgid "Enable Cache" msgstr "Ativar Cache" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2127,51 +2199,54 @@ msgstr "Ativar Cache" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Ativar Cheats" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "Ativar Música DTK" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Ativar Núcleo Duplo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Ativar Núcleo Duplo (Aumento na velocidade)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "Ativar Hotkeys" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Ativar Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Ativar Idle Skipping (Aumento na velocidade)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Ativar MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "Ativar Varredura Progressiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "Ativar Salva-Tela" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "Ativar WideScreen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "Ativar Wireframe" @@ -2190,7 +2265,7 @@ msgstr "" "\n" "Se estiver em dúvida, selecione 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2198,7 +2273,7 @@ msgstr "" "Ativar acesso rápido de disco. Necessário para alguns jogos.(ON = Rapido, " "OFF = Compativel)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "Ativar Paginas" @@ -2226,6 +2301,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 @@ -2235,6 +2311,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2242,7 +2321,7 @@ msgstr "" "Ative isso para ter ganho de velocidade em The legend of Zelda: Twilight " "Princess. Disative para QUALQUER UM outro jogo." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2252,7 +2331,7 @@ msgstr "" "gerenciamento de memoria. Precisão para o hardware, mas devagar para ser " "emulado (ON = Compativel, OFF = Rapido)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "Ativa Hack de Projeção Personalizado" @@ -2268,7 +2347,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2290,6 +2369,7 @@ msgstr "" msgid "End" msgstr "Fim" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2305,6 +2385,11 @@ msgstr "Fim" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Inglês" @@ -2335,6 +2420,7 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Erro" @@ -2365,21 +2451,35 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "Erro" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: 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." +<<<<<<< HEAD #: Source/Core/Common/Src/ChunkFile.h:180 <<<<<<< HEAD ======= +======= +#: Source/Core/Common/Src/ChunkFile.h:194 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" +<<<<<<< HEAD #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 >>>>>>> Update from master branch. +======= +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "" <<<<<<< HEAD @@ -2424,7 +2524,7 @@ msgstr "Sair do Dolphin com o emulador" msgid "Export Failed" msgstr "Falha na Exportação" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "Exportar Arquivo" @@ -2437,15 +2537,15 @@ msgstr "Exportar Gravação" msgid "Export Recording..." msgstr "Exportar Gravação..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "Exportar Save" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "Exportar save do Wii (Experimental)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "Exportar todos os saves" @@ -2461,7 +2561,7 @@ msgstr "Exportar Salvar como..." msgid "Extension" msgstr "Extensão" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "Frame Buffer Externo" @@ -2473,44 +2573,44 @@ msgstr "Parâmetro Extra" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Parâmetro Extra útil apenas em \"Metroid Other M\"" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "Extrair Todos os arquivos..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "Extrair Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "Extrair DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "Extrair diretorio..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "Extrair Arquivo..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "Extrair Partição..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "Extraindo %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "Extraindo todos os arquivos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "Extraindo diretorio" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "Extraindo..." @@ -2522,11 +2622,11 @@ msgstr "Byte do FIFO" msgid "FIFO Player" msgstr "FIFO Player" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "FRANÇA" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "Tamanho FST:" @@ -2538,11 +2638,11 @@ msgstr "Falha ao Conectar\"" msgid "Failed to Listen!!" msgstr "Não foi possível Ouvir!!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "Falha ao dazer o download de códigos." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Falha ao extrair %s!" @@ -2659,18 +2759,28 @@ msgstr "Falha ao escrever o header para %s" msgid "Failed to write header for file %d" msgstr "Falha ao escrever o header para o arquivo %d" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "Rápido" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "Mipmaps Rápidos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "Rápida versão do MMU. Não funciona para todos os jogos." +#: Source/Core/Core/Src/Movie.cpp:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "Fifo Player" @@ -2679,7 +2789,7 @@ msgstr "Fifo Player" msgid "File Info" msgstr "Informações do Arquivo" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "O arquivo não contém códigos." @@ -2712,16 +2822,16 @@ msgstr "Arquivo não reconhecido como Memory Card" msgid "File not compressed" msgstr "Arquivo não comprimido" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Modo de abertura desconhecido : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "Arquivo de sistema" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Tipo do arquivo 'ini' desconhecido! Não vai abrir!" @@ -2729,7 +2839,7 @@ msgstr "Tipo do arquivo 'ini' desconhecido! Não vai abrir!" msgid "First Block" msgstr "Primeiro Bloco" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "Corrigir Checksums" @@ -2741,7 +2851,7 @@ msgstr "Forçar 16:9" msgid "Force 4:3" msgstr "Forçar 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "Forçar Console para NTSC-J" @@ -2774,7 +2884,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2810,7 +2920,7 @@ msgstr "Quadro" msgid "Frame Advance" msgstr "Avançar Quadro" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "Extração de Quadros usam FFV1" @@ -2822,7 +2932,7 @@ msgstr "Alcanço do Quadro" msgid "Frame S&kipping" msgstr "Frame S&kipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Limitador de FPS:" @@ -2830,10 +2940,11 @@ msgstr "Limitador de FPS:" msgid "Frames To Record" msgstr "QUadros para Capturar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "Olhar Livre" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2849,6 +2960,11 @@ msgstr "Olhar Livre" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Francês" @@ -2882,7 +2998,7 @@ msgstr "Configuração do Log" msgid "GCPad" msgstr "GCPad" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "ID do jogo:" @@ -2898,15 +3014,15 @@ msgstr "O jogo não está rodando!" msgid "Game not found!!" msgstr "Jogo não encontrado!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "Opções especificas do jogo" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Opçõesdojogo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" @@ -2917,6 +3033,7 @@ msgstr "Configurações de &Controle de 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 @@ -2924,6 +3041,9 @@ msgstr "Configurações de &Controle de Gamecube" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Memory Cards do Gamecube (*.raw,*.gcp)" @@ -2932,15 +3052,17 @@ msgid "Gamecube Pad settings" msgstr "Configurações do controle de Gamecube" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Códigos Gecko" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" "Falha ao rodar o GeckoCode (CT%i CST%i) (%s)\n" "(É um código ruim ou um tipo de código não suportado.)" @@ -2955,8 +3077,12 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Geral" @@ -2965,6 +3091,7 @@ msgstr "Geral" msgid "General Settings" msgstr "Configurações Gerais" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2980,6 +3107,11 @@ msgstr "Configurações Gerais" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Alemão" @@ -3017,7 +3149,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto ativado." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Grego" @@ -3049,7 +3181,7 @@ msgstr "Hacks" msgid "Header checksum failed" msgstr "A checagem do header falhou" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Hebreu" @@ -3119,12 +3251,16 @@ msgstr "Configuração de hotkey" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Hotkeys" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Húngaro" @@ -3132,13 +3268,13 @@ msgstr "Húngaro" msgid "Hybrid Wiimote" msgstr "Wiimote Hibrido" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS:Tentou adiquirir dados de um ticket desconhecido: %08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -3151,11 +3287,11 @@ msgstr "" "TitleID %016llx.\n" " O Dolphin vai provavelmente travar agora" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - Destino ruim" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "Definições de IPL" @@ -3171,15 +3307,15 @@ msgstr "Ponteiro IR" msgid "IR Sensitivity:" msgstr "Sensibilidade IR:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "Detalhes da ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "Diretórios de ISO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "ITÁLIA" @@ -3187,19 +3323,20 @@ msgstr "ITÁLIA" msgid "Icon" msgstr "Icone" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "Se a taxa de FPS estiver instável, esta opção pode ajudar. (ON = Compatível, " "OFF = Rápido)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 @@ -3209,9 +3346,14 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy +>>>>>>> Update the pot file to reflect recent changes in the code. 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." +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " +"Audio to throttle using the DSP (might fix audio clicks but can also cause " +"constant noise depending on the game)." msgstr "" "Se você colocar o Limitador de FPS em um valor maior que a velocidade máxima " "do jogo (NTSC:60, PAL:50), você também vai precisar desativar o Throttle de " @@ -3249,7 +3391,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "Importar Save" @@ -3300,7 +3442,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe esta opção desativada." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "Funciona" @@ -3309,7 +3451,7 @@ msgid "In-Game" msgstr "In-Game" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info" @@ -3329,7 +3471,7 @@ msgstr "Inserir" msgid "Insert Encrypted or Decrypted code here..." msgstr "Inserir Código Encryptado ou Decriptado aqui..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Insira cartão SD" @@ -3341,7 +3483,7 @@ msgstr "Insira nome aqui.." msgid "Install WAD" msgstr "Instalar WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Instalar para o menu do WII" @@ -3352,6 +3494,7 @@ msgstr "" "InstallExceptionHandler foi chamado, mas esta plataforma ainda não tem " "suporte a ele." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3361,14 +3504,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Instalando WAD..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "Interface" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "Opções de interface" @@ -3393,11 +3539,11 @@ msgstr "Erro Interno do LZO - lzo_init() falhou" msgid "Internal Resolution:" msgstr "Resolução Interna:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Interpretador (MUITO lento)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "Intro" @@ -3414,7 +3560,7 @@ msgstr "Valor Inválido!" msgid "Invalid bat.map or dir entry" msgstr "Bat.map ou entrada de Diretório inválidas" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "Tipo de evento %i inválido" @@ -3434,14 +3580,15 @@ msgstr "" "%s\n" "Você pode precisar refazer o dump deste jogo." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "Arquivo de gravação inválido" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "Estado Salvo Inválido" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3457,27 +3604,32 @@ msgstr "Estado Salvo Inválido" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italiano" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "JAPÃO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT recompilador (recomendado)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL recompilador experimental" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japonês" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "CORÉIA" @@ -3486,8 +3638,8 @@ msgstr "CORÉIA" msgid "Key" msgstr "Chave" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Coreano" @@ -3505,7 +3657,7 @@ msgstr "Botão L" msgid "L-Analog" msgstr "L-Analógico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "Linguagem:" @@ -3558,7 +3710,7 @@ msgstr "" msgid "Less Than" msgstr "Menor que" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "Limitar por FPS" @@ -3566,7 +3718,7 @@ msgstr "Limitar por FPS" msgid "Load" msgstr "Carregar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "Carregar Texturas Personalizadas" @@ -3614,6 +3766,7 @@ msgstr "Carregar Estado do Slot 8" msgid "Load State..." msgstr "Carregar State..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3635,6 +3788,13 @@ msgstr "Carregar Menu de Sistema do Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "Carregar Menu de Sistema do Wii" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar Menu de Sistema do Wii %d %c" @@ -3662,7 +3822,7 @@ msgstr "Carrega o arquivo especificado (DOL,ELF,GCM,ISO,WAD)" msgid "Local" msgstr "Local" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Separar tarefas em núcleos" @@ -3674,11 +3834,11 @@ msgstr "Log" msgid "Log Configuration" msgstr "Configuração do Log" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Tipo de Log" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Resposta do Logger" @@ -3708,7 +3868,7 @@ msgstr "" "Incompatibilidade do MD5\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "Hack de velocidade MMU" @@ -3730,11 +3890,11 @@ msgstr "Arquivos de Gameshark MadCatz(*.gcs)" msgid "Main Stick" msgstr "Analógico Principal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "ID da fabricante:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "Fabricante:" @@ -3758,6 +3918,7 @@ msgstr "Byte de Memória" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3765,6 +3926,9 @@ msgstr "Byte de Memória" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Cartão de memoria" @@ -3801,7 +3965,7 @@ msgstr "O tamanho do arquivo do Memory Card é diferente do tamanho do header" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "Microfone" @@ -3810,11 +3974,11 @@ msgstr "Microfone" msgid "Min" msgstr "Mínimo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "Diversas" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Opções diversas" @@ -3836,7 +4000,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "Fonte Monospaced" @@ -3849,7 +4013,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3871,7 +4035,7 @@ msgstr "" msgid "Multiply" msgstr "Multiplicar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3963,6 +4127,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Cima" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3972,6 +4137,9 @@ msgstr "NP Cima" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3980,7 +4148,7 @@ msgstr "Nome:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Nome:" @@ -3994,7 +4162,7 @@ msgid "New Scan" msgstr "Nova Busca" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "Próxima Página" @@ -4006,7 +4174,7 @@ msgstr "Próxima Busca" msgid "Nickname :" msgstr "Nick:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "Sem região (SDK)" @@ -4045,7 +4213,7 @@ msgstr "Nenhuma pasta de salva encontrada para o título %s" msgid "None" msgstr "Nenhum" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Norueguês Bokmaal" @@ -4053,8 +4221,8 @@ msgstr "Norueguês Bokmaal" msgid "Not Equal" msgstr "Não igual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "Indefinido" @@ -4074,7 +4242,7 @@ msgstr "Não conectado" msgid "Notes" msgstr "Notas" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "Notas:" @@ -4112,7 +4280,7 @@ msgstr "Objeto" msgid "Object Range" msgstr "Alcance do Objeto" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Desligado" @@ -4138,11 +4306,11 @@ msgstr "Apenas %d blocos disponíveis" msgid "Open" msgstr "Abrir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "Abrir &conteúdo da pasta" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "Abrir pasta do &save do WII" @@ -4164,11 +4332,11 @@ msgstr "OpenAL: Não foi possível encontrar dispositivos de som" msgid "OpenAL: can't open device %s" msgstr "OpenAL: não foi possível abrir o dispositivo %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "Decodificador de Texturas OpenCL" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "Decodificador de Texturas OpenMP" @@ -4200,7 +4368,7 @@ msgstr "" "e importe-os para um novo Memory Card\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "Outros" @@ -4252,19 +4420,20 @@ msgstr "Parágrafo" msgid "Parameters" msgstr "Parâmetros" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partição %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Patches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Diretórios" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4277,6 +4446,10 @@ msgstr "Diretórios" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausar" @@ -4285,7 +4458,7 @@ msgstr "Pausar" msgid "Per-Pixel Lighting" msgstr "Iluminação Por Pixels" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Perfeito" @@ -4298,6 +4471,7 @@ msgstr "Perspectiva %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 ======= @@ -4308,6 +4482,10 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Executar" @@ -4321,7 +4499,7 @@ msgstr "Reproduzir Gravação" msgid "Play/Pause" msgstr "Executar/Pausar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "Jogável" @@ -4333,6 +4511,7 @@ msgstr "Opções de Reprodução" msgid "Players" msgstr "Jogadores" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4342,6 +4521,9 @@ msgstr "Jogadores" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Favor confirmar..." @@ -4353,23 +4535,23 @@ msgstr "Favor criar uma perspectiva antes de salvar" msgid "Plus-Minus" msgstr "Positivo-Negativo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Polonês" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Porta 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Porta 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Porta 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Porta 4" @@ -4378,11 +4560,11 @@ msgstr "Porta 4" msgid "Port :" msgstr "Porta:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Português" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Português (Brasil)" @@ -4390,17 +4572,17 @@ msgstr "Português (Brasil)" msgid "Post-Processing Effect:" msgstr "Efeito Pós-Processamento" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4413,7 +4595,7 @@ msgstr "Predefinidos:" msgid "Prev Page" msgstr "Pág. Anterior" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "Página Anterior" @@ -4464,7 +4646,7 @@ msgstr "R-Analógico" msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "Russia" @@ -4477,7 +4659,7 @@ msgstr "Alcance" msgid "Read-only mode" msgstr "Modo Somente Leitura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "Real" @@ -4552,6 +4734,7 @@ msgstr "Atualizar Lista" msgid "Refresh game list" msgstr "Atualizar a lista de jogos" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4570,6 +4753,12 @@ msgstr "Atualizar a lista de jogos" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Remover" @@ -4622,11 +4811,11 @@ msgstr "Analógico Direito" msgid "Rumble" msgstr "Vibração" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Executar o DSP LLE em um segmento dedicado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Russo" @@ -4634,10 +4823,11 @@ msgstr "Russo" msgid "Sa&ve State" msgstr "Sal&var estado atual" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "Seguro" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4647,6 +4837,9 @@ msgstr "Seguro" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Taxa de Amostragem:" @@ -4704,12 +4897,12 @@ msgstr "Salvar Estado Atual no Slot 8" msgid "Save State..." msgstr "Salvar estado atual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Salvar como..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Salvar GCM/ISO comprimido" @@ -4717,11 +4910,11 @@ msgstr "Salvar GCM/ISO comprimido" msgid "Save current perspective" msgstr "Salvar perspectiva atual" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "Salvar GCM/ISO descomprimido" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "O Estado Salvo capturado %s está corrompido, parando captura..." @@ -4730,6 +4923,7 @@ msgstr "O Estado Salvo capturado %s está corrompido, parando captura..." msgid "Scaled EFB Copy" msgstr "Cópia Escalada do EFB" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4739,15 +4933,18 @@ msgstr "Cópia Escalada do EFB" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Escaneando %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "Procurando por ISOs" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "Escaneando..." @@ -4763,12 +4960,12 @@ msgstr "Scroll Lock" msgid "Search Filter" msgstr "Filtro de Busca" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Procurar em sub-pastas" -#: 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:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "A seção %s não foi encontrada no SYSCONF" @@ -4778,6 +4975,7 @@ msgstr "A seção %s não foi encontrada no SYSCONF" msgid "Select" msgstr "Selecionar" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4802,6 +5000,14 @@ msgstr "Selecione o arquivo de Gravação" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Selecione o arquivo de Gravação" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Selecione um arquivo WAD de Wii para instalar" @@ -4826,6 +5032,7 @@ msgstr "Selecionar Janelas flutuantes" msgid "Select the file to load" msgstr "Selecione um arquivo para carregar" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 @@ -4842,19 +5049,26 @@ msgstr "Selecione um estado para carregar" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Selecione o arquivo de salva" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Selecione um estado para carregar" +<<<<<<< HEAD <<<<<<< 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. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Selecione um estado para salvar" @@ -4876,7 +5090,7 @@ msgstr "" "\n" "Se estiver em dúvida, selecione Automático." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Fonte Selecionada" @@ -4924,10 +5138,11 @@ msgstr "Posição da Sensor Bar:" msgid "Separator" msgstr "Separador" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Sérvio" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 @@ -4937,6 +5152,9 @@ msgstr "Sérvio" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4947,11 +5165,11 @@ msgstr "" msgid "Set" msgstr "Definir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "Definir como ISO &padrão" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "Definir como Memory Card padrão%c" @@ -4962,7 +5180,7 @@ msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" "SetARCode_IsActive: O índice é maior que a lista de códigos AR de tamanho %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "Configurações..." @@ -4974,7 +5192,7 @@ msgstr "SetupWiiMem: Arquivo de configuração não encontrado" msgid "Shake" msgstr "Sacudir" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "Nome Curto:" @@ -5002,7 +5220,7 @@ msgstr "Show Barra de &Ferramentas" msgid "Show Drives" msgstr "Mostrar Drives" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "Mostrar Regiões de Cópia do EFB" @@ -5018,7 +5236,7 @@ msgstr "Mostrar França" msgid "Show GameCube" msgstr "Mostrar GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "Mostrar" @@ -5034,7 +5252,7 @@ msgstr "Mostrar JAP" msgid "Show Korea" msgstr "Mostrar Coréia" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "Mostrar Idioma:" @@ -5054,7 +5272,7 @@ msgstr "Mostrar Plataformas" msgid "Show Regions" msgstr "Mostrar Regiões" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "Mostrar Estatísticas" @@ -5074,11 +5292,11 @@ msgstr "Mostrar Wad" msgid "Show Wii" msgstr "Mostrar Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "Mostrar uma janela de confirmação antes de parar um jogo." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 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 " @@ -5088,23 +5306,23 @@ msgstr "" "Desabilitar isso pode evitar menssagens irritantes e não-fatais, mas também " "pode fazer com que o Dolphin trave sem nenhuma explicação." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "Mostrar o primeiro bloco" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "Mostrar blocos de save" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "Mostar comentário do save" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "Mostrar ícone do salva" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "Mostrar título do salva" @@ -5142,7 +5360,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Wiimote na Horizontal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Chinês Simplificado" @@ -5150,11 +5368,11 @@ msgstr "Chinês Simplificado" msgid "Size" msgstr "Tamanho" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "Pular a BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "Não fazer o Dest. Alpha Pass" @@ -5197,11 +5415,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Slot B" @@ -5225,7 +5443,7 @@ msgstr "" "Você realmente quer utilizar o Renderizador por Software? Se estiver em " "dúvida, pressione 'Não'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "Configurações de Som" @@ -5243,6 +5461,7 @@ msgstr "Falha na criação do buffer de som: %s" msgid "Space" msgstr "Barra de Espaço" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5258,6 +5477,11 @@ msgstr "Barra de Espaço" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Espanhol" @@ -5289,7 +5513,7 @@ msgstr "" msgid "Specify a video backend" msgstr "Especifique um Backend de Vídeo" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Aumentar a velocidade de transferência do disco" @@ -5297,7 +5521,7 @@ msgstr "Aumentar a velocidade de transferência do disco" msgid "Square Stick" msgstr "Analógico Quadrado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "Controle Padrão" @@ -5395,12 +5619,12 @@ msgstr "Arquivos de salva importados com sucesso" msgid "Swing" msgstr "Balançar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Idioma do Systema:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "TAIWAN" @@ -5439,7 +5663,7 @@ msgstr "Direita da Mesa" msgid "Take Screenshot" msgstr "Capturar Tela" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -5455,7 +5679,7 @@ msgstr "Textura" msgid "Texture Cache" msgstr "Cache de Texturas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "Sobreposição Formato das Texturas" @@ -5471,13 +5695,13 @@ msgstr "O endereço é inválido" msgid "The checksum was successfully fixed" msgstr "O Checksum foi corrigido com sucesso" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "O diretório escolhido já está na lista" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5500,7 +5724,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "O Arquivo %s já foi aberto, o header do arquivo não será escrito." -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "O arquivo que você especificou (%s) não existe" @@ -5518,11 +5742,12 @@ msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "O código AR resultante da derciptação não contém nenhuma linha." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#, fuzzy msgid "" "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." +"If unsure, use the rightmost value." msgstr "" "Quanto mais Seguro, menor será a probabilidade do emulador perder alguma " "atualização de textura da RAM.\n" @@ -5567,7 +5792,7 @@ msgstr "O arquivo especificado \"%s\" não existe" msgid "The value is invalid" msgstr "O valor é inválido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Tema" @@ -5575,7 +5800,7 @@ msgstr "Tema" msgid "Theme selection went wrong" msgstr "A seleção do tema deu errado" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5583,7 +5808,7 @@ msgstr "" "É necessário um ticket para 00000001/00000002. O seu Dump do NAND está " "provavelmente incompleto." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5599,7 +5824,7 @@ msgstr "" "Este simulador de Action Replay não suporta códigos que modifiquem o Action " "Replay em si." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "" "Isto pode causar diminuição da performance no Wii Menu e em alguns jogos." @@ -5624,25 +5849,10 @@ msgstr "" "Se estiver em dúvida, deixe isto desativado." #: 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" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" -"Isto é usado para controlar a velocidade do jogo por throttle de som.\n" -"Desativar isso pode causar velocidade de jogo anormal, ás vezes muito " -"rápido.\n" -"Mas algumas vezes ativar isso pode causar ruído constante.\n" -"\n" -"Atalho de Teclado : Segure para instantaneamente desativar o Throttle." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "Isto é usado para tocar trilhas sonoras de jogos, como BGM" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5654,7 +5864,7 @@ msgstr "" "Dá um grande aumento de velocidade para PCs com mais de um núcleo, mas " "também pode causar travamentos/erros ocasionais." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "Isto vai deixar você editar manualmente o arquivo de configuração .INI" @@ -5677,7 +5887,7 @@ msgstr "Título" msgid "To" msgstr "Para" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "Ligar/Desligar Todos os Logs" @@ -5697,6 +5907,7 @@ msgstr "Ir para Tela Cheia" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5704,14 +5915,17 @@ msgstr "Ir para Tela Cheia" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Topo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Chinês Tradicional" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "Houve a tentativa de carregar um tipo de arquivo desconhecido." @@ -5719,7 +5933,7 @@ msgstr "Houve a tentativa de carregar um tipo de arquivo desconhecido." msgid "Triggers" msgstr "Gatilhos" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Tentando ler de um SYSCONF inválido" @@ -5731,7 +5945,7 @@ msgstr "" "Tentando ler de um SYSCONF inválido\n" "Os Bt IDs do Wiimote não estão disponíveis" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Turco" @@ -5752,11 +5966,11 @@ msgstr "Porta UDP:" msgid "UDP Wiimote" msgstr "Wiimote UDP" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "DESCONHECIDO" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "EUA" @@ -5842,7 +6056,7 @@ msgstr "Atualizar" msgid "Upright Wiimote" msgstr "Wiimote na Vertical" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Usar modo EuRGB60 (PAL60)" @@ -5854,7 +6068,7 @@ msgstr "Usar Tela Cheia" msgid "Use Hex" msgstr "Usar Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Usar Panic Handlers" @@ -5886,7 +6100,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "Utilitário" @@ -5910,25 +6124,29 @@ msgstr "Valor:" msgid "Verbosity" msgstr "Verbosidade" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Vídeo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Virtual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Volume" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "Falha na instalação da WAD: Erro na criação de %s" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "Falha na instalação da WAD: Erro na criação de %s" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5947,15 +6165,15 @@ msgstr "" msgid "Warning" msgstr "Aviso" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "Aviso - Inicializando DOL no modo de console errado!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Aviso - Inicializando ELF no modo de console errado!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Aviso - Inicializando ISO no modo de console errado!" @@ -5985,7 +6203,7 @@ msgstr "" "que tenham o mesmo nome de um arquivo do Memory Card\n" "Continuar?" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5993,7 +6211,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -6001,7 +6219,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -6029,7 +6247,7 @@ msgstr "WaveFileWriter - Arquivo não aberto." msgid "Whammy" msgstr "Distorção" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "Hack de Widescreen" @@ -6037,15 +6255,15 @@ msgstr "Hack de Widescreen" msgid "Width" msgstr "Largura" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Console do Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Raiz do Wii NAND" @@ -6053,6 +6271,7 @@ msgstr "Raiz do Wii NAND" msgid "Wii Save Import" msgstr "Importar Save de Wii" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -6062,6 +6281,9 @@ msgstr "Importar Save de Wii" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Arquivos de Salva do Wii (*.bin)|*.bin" @@ -6128,10 +6350,11 @@ msgstr "Menu de Janelas" msgid "Windows Right" msgstr "Janelas da Direita" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "Word Wrap" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -6147,6 +6370,11 @@ msgstr "Word Wrap" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Funcionando..." @@ -6154,6 +6382,11 @@ msgstr "Funcionando..." msgid "Write to Console" msgstr "Escrever no Console" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "Escrever para o Arquivo" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "Escrever para o Arquivo" @@ -6210,7 +6443,7 @@ msgstr "Você deve digitar um valor válido decimal, hexadecimal ou octal." msgid "You must enter a valid profile name." msgstr "Você deve digitar um nome válido para o perfil." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Você deve reiniciar o Dolphin para que as modificações tenham efeito." @@ -6233,7 +6466,7 @@ msgstr "" "Ele deveria ter 0x%04x (mas tem 0x%04llx)\n" "Você gostaria de gerar um novo?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "Hack do ZTB" @@ -6305,7 +6538,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -6338,12 +6571,12 @@ msgstr "" msgid "s" msgstr "s" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "Cmd 0x%08x desconhecido" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute devolveu -1 ao rodar o aplicativo!" @@ -6503,6 +6736,9 @@ msgstr "| OR" #~ msgid "Emulator Display Settings" #~ msgstr "Configurações de Display do Emulador" +#~ msgid "Enable Audio Throttle" +#~ msgstr "Ativar Throttle de Áudio" + #~ msgid "Enable CPU Access" #~ msgstr "Ativar Acesso da CPU" @@ -6803,6 +7039,21 @@ msgstr "| OR" #~ msgid "The file " #~ msgstr "O arquivo" +#~ msgid "" +#~ "This is used to control game speed by sound throttle.\n" +#~ "Disabling this could cause abnormal game speed, such as too fast.\n" +#~ "But sometimes enabling this could cause constant noise.\n" +#~ "\n" +#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." +#~ msgstr "" +#~ "Isto é usado para controlar a velocidade do jogo por throttle de som.\n" +#~ "Desativar isso pode causar velocidade de jogo anormal, ás vezes muito " +#~ "rápido.\n" +#~ "Mas algumas vezes ativar isso pode causar ruído constante.\n" +#~ "\n" +#~ "Atalho de Teclado : Segure para instantaneamente desativar o " +#~ "Throttle." + #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "Isto é geralmente usado para efeitos de som e voz." diff --git a/Languages/po/ru.po b/Languages/po/ru.po index 31745e4349..c882cf9f5b 100644 --- a/Languages/po/ru.po +++ b/Languages/po/ru.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -16,6 +17,9 @@ msgstr "" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Update from master branch. +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-01-20 14:40+0300\n" "Last-Translator: firnis \n" "Language-Team: Russian <>\n" @@ -59,9 +63,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sКопировать%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Гц" @@ -153,7 +157,7 @@ msgstr "%sЭкспоритровать GCI%s" msgid "%sImport GCI%s" msgstr "%sИмпортировать GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, fuzzy, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%d свободных блоков; %d свободных записей каталогов" @@ -187,11 +191,11 @@ msgstr "Менеджер &читов" msgid "&DSP Settings" msgstr "&Опции аудио" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&Удалить ISO-файл..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&Удалить выбранные ISO-файлы..." @@ -257,7 +261,7 @@ msgstr "&Пауза" msgid "&Play" msgstr "&Запустить" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&Свойства" @@ -301,7 +305,7 @@ msgstr "&Вид" msgid "&Wiimote Settings" msgstr "Опц&ии Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "" @@ -346,7 +350,7 @@ msgstr "<Введите название>" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "<Ничего>" @@ -355,7 +359,7 @@ msgstr "<Ничего>" msgid "" msgstr "<Нажмите кнопку>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "<Системный>" @@ -411,13 +415,13 @@ msgstr "" "\n" "Для создания игры вам необходимо открыть указанный порт на вашем роутере!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "AR-коды" @@ -429,11 +433,11 @@ msgstr "Об эмуляторе Dolphin" msgid "Acceleration" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "" @@ -535,11 +539,11 @@ msgstr "Адаптер:" msgid "Add" msgstr "Добавить" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "Добавление ActionReplay-кода" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "Добавление патча" @@ -547,6 +551,7 @@ msgstr "Добавление патча" msgid "Add new pane" msgstr "Добавить панель" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -562,6 +567,11 @@ msgstr "Добавить панель" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Добавить..." @@ -595,11 +605,11 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "Расширенные" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Расширенные настройки" @@ -608,14 +618,15 @@ msgstr "Расширенные настройки" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Все GC/Wii-файлы (elf, dol, gcm, iso, ciso, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Все образа от GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "Все GCM-файлы Gamecube (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -628,18 +639,22 @@ msgstr "Все GCM-файлы Gamecube (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Файлы быстрых сохранений (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "Файлы образов Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Сжатые образа дисков GC/Wii (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "Все файлы (*.*)|*.*" @@ -651,7 +666,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "Эмулируемый Wiimote" @@ -672,7 +687,7 @@ msgstr "Загрузчик неверноего размера... это точ msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Загрузчик:" @@ -687,7 +702,7 @@ msgid "" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "" @@ -696,7 +711,7 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "Вы уверены, что хотите удалить \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -704,10 +719,11 @@ msgstr "" "Вы уверены, что хотите удалить эти файлы?\n" "Они исчезнут навсегда!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "Вы уверены, что хотите удалить этот файл? Он исчезнет навсегда!" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -717,6 +733,9 @@ msgstr "Вы уверены, что хотите удалить этот фай ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Соотношение сторон:" @@ -725,19 +744,21 @@ msgstr "Соотношение сторон:" msgid "At least one pane must remain open." msgstr "Хотя бы одна панель должна быть открыта." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 #, fuzzy msgid "Audio Backend:" msgstr "Система вывода" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Ошибка открытия устройства вывода звука.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -747,6 +768,9 @@ msgstr "AudioCommon: Ошибка открытия устройства выво ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Авто" @@ -787,7 +811,7 @@ msgstr "" msgid "Back" msgstr "Назад" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 #, fuzzy msgid "Backend Settings" msgstr "Основные настройки" @@ -816,11 +840,11 @@ msgstr "Неверный заголовок файла" msgid "Banner" msgstr "Логотип" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "Данные логотипа" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "Логотип:" @@ -832,7 +856,7 @@ msgstr "Панель" msgid "Basic" msgstr "Основные" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Основные настройки" @@ -863,6 +887,7 @@ msgstr "Синяя справа" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -870,6 +895,9 @@ msgstr "Синяя справа" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "снизу" @@ -878,7 +906,7 @@ msgstr "снизу" msgid "Bound Controls: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Не работает" @@ -894,7 +922,7 @@ msgstr "Выберите папку с образами игр" msgid "Browse for an ISO directory..." msgstr "Выбор папки с ISO-файлами..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "Укажите папку для сохранения" @@ -924,11 +952,11 @@ msgstr "" msgid "C-Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "Режим эмуляции CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "" @@ -967,7 +995,7 @@ msgstr "Не удалось открыть %s" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -977,7 +1005,7 @@ msgstr "" "Нельзя использовать этот файл, как карту памяти\n" "Вы пытаетесь использовать один файл в обоих слотах?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -995,8 +1023,6 @@ msgstr "Не получается найти WiiMote по адресу: %02x:%02 msgid "Cant find WiiMote by connection handle %02x" msgstr "Не получается найти WiiMote по дескриптору %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1006,7 +1032,7 @@ msgstr "Ошибка чтения из DVD_Plugin - DVD-Interface: Критич msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "" @@ -1032,7 +1058,7 @@ msgstr "Сменить &диск..." msgid "Change Game" msgstr "Сменить игру" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1048,8 +1074,8 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "" "Изменения данной опции вступят в силу только после перезапуска эмулятора." @@ -1070,33 +1096,33 @@ msgstr "Поиск кодов" msgid "Cheats Manager" msgstr "Менеджер чит-кодов" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 #, fuzzy msgid "Chinese (Simplified)" msgstr "Chinese (Simplified)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "Выберите основной DVD-диск:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 #, fuzzy msgid "Choose a NAND root directory:" msgstr "Выберите основной DVD-диск:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Выберите файл образа:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "Выберите папку для добавления в список" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Выберите файл карты памяти" @@ -1104,14 +1130,14 @@ msgstr "Выберите файл карты памяти" msgid "Choose a memory card:" msgstr "Выберите карту памяти:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 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 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Выберите папку для сохранения файлов" @@ -1123,14 +1149,14 @@ msgstr "" msgid "Classic" msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "Очистить" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "" @@ -1146,6 +1172,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 @@ -1154,6 +1181,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Закрыть" @@ -1177,20 +1208,20 @@ msgstr "" msgid "Comment" msgstr "Комментарий" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Комментарий:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "Сжать ISO-файл..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Сжать выбранные ISO-файлы..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "Сжатие образа" @@ -1217,13 +1248,13 @@ msgstr "Настроить контроллеры" msgid "Configure..." msgstr "Настройка эмулятора..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 #, fuzzy msgid "Confirm on Stop" msgstr "Потверждение при остановке эмуляции" @@ -1233,7 +1264,7 @@ msgstr "Потверждение при остановке эмуляции" msgid "Connect" msgstr "Подключиться" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "Подключить USB-клавиатуру" @@ -1290,12 +1321,12 @@ msgstr "Конвертировать в GCI" msgid "Copy failed" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "Копировать на карту памяти %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "Ядро" @@ -1325,7 +1356,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Не удалось определить ISO образ %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "Не удалось сохранить %s" @@ -1336,7 +1367,7 @@ msgid "" "(setting pads while the game is running is not yet supported)" msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1348,7 +1379,7 @@ msgstr "" "\n" "Вы запустили Dolphin с CD/DVD, или файл защищен от записи?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "" @@ -1363,7 +1394,7 @@ msgstr "" msgid "Count:" msgstr "Счетчик:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "Страна:" @@ -1377,26 +1408,26 @@ msgstr "Создать новый AR-код" msgid "Create new perspective" msgstr "Создать новую точку обозрения" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "Стиль от KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Стиль от Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "Стиль от VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" "Стиль создан black_rider'ом и опубликован на ForumW.org > Web Developments" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "Создатель:" @@ -1404,7 +1435,7 @@ msgstr "Создатель:" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "обрезать" @@ -1424,7 +1455,7 @@ msgstr "" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Текущая папка сменилась с %s на %s после wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 #, fuzzy msgid "Custom Projection Hack" msgstr "Projection-хак: " @@ -1434,11 +1465,11 @@ msgstr "Projection-хак: " msgid "Custom Projection Hack Settings" msgstr "Projection-хак: " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "" @@ -1450,11 +1481,12 @@ msgstr "" msgid "DSP" msgstr "Аудио" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 #, fuzzy msgid "DSP Emulator Engine" msgstr "Режим эмуляции CPU" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1465,20 +1497,24 @@ msgstr "Режим эмуляции CPU" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 #, fuzzy msgid "DSP LLE interpreter (slow)" msgstr "Интерпретатор (ОЧЕНЬ медленный)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 #, fuzzy msgid "DSP LLE on Thread" msgstr "Обрабатывать DSP LLE отдельным потоком" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "" @@ -1486,15 +1522,23 @@ msgstr "" msgid "DSP settings" msgstr "Настройка аудио (DSP)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "DVD-диск:" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "Размер данных" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "Дата:" @@ -1515,7 +1559,7 @@ msgstr "Мертвая зона" msgid "Debug" msgstr "Отладка" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 #, fuzzy msgid "Debugging" msgstr "Отладка" @@ -1524,16 +1568,16 @@ msgstr "Отладка" msgid "Decimal" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "Снять сжатие с выбранных ISO-файлов..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "" @@ -1541,11 +1585,11 @@ msgstr "" msgid "Default" msgstr "Сброс" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "Образ по умолчанию:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "Шрифт по умолчанию" @@ -1554,7 +1598,7 @@ msgstr "Шрифт по умолчанию" msgid "Delete" msgstr "Удалить" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "Удалить сохранение" @@ -1563,7 +1607,7 @@ msgstr "Удалить сохранение" msgid "Delete the existing file '%s'?" msgstr "Удалить существующий файл '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 #, fuzzy msgid "Description" msgstr "Вопрос" @@ -1572,8 +1616,8 @@ msgstr "Вопрос" msgid "Detect" 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 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." @@ -1584,8 +1628,8 @@ msgstr "" msgid "Device" msgstr "Устройство" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Настройки устройств" @@ -1608,25 +1652,25 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 #, fuzzy msgid "Disable" msgstr "Отключить туман" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "Отключить туман" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "Отключить освещение" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 #, fuzzy msgid "Disable Per-Pixel Depth" msgstr "Глубина пикселя" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "Отключить текстуры" @@ -1656,7 +1700,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Диск" @@ -1680,6 +1724,7 @@ msgstr "" msgid "Divide" msgstr "/" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1689,10 +1734,13 @@ msgstr "/" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Вы хотите остановить эмуляцию?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1718,6 +1766,7 @@ msgstr "Настройки эмулируемого Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1742,6 +1791,14 @@ msgstr "Настройки Dolphin GCPad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Настройки Dolphin GCPad" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1774,11 +1831,11 @@ msgstr "" msgid "Down" msgstr "Вниз" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "Скачать готовые коды (база WiiRD)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Скачано %lu кодов. (добавлено %lu)" @@ -1787,23 +1844,23 @@ msgstr "Скачано %lu кодов. (добавлено %lu)" msgid "Drums" msgstr "Барабаны" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "" @@ -1829,6 +1886,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1844,6 +1902,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Dutch" msgstr "Dutch" @@ -1869,7 +1932,7 @@ msgstr "" "%d -- Если вы недавно обновили Dolphin , то скорее всего необходимо " "перегрузить компьютер, чтобы Windows обнаружил новыйдрайвер." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "ЕВРОПА" @@ -1885,7 +1948,7 @@ msgstr "Изменить" msgid "Edit ActionReplay Code" msgstr "Изменить код ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Править вручную" @@ -1897,8 +1960,8 @@ msgstr "" msgid "Edit current perspective" msgstr "Изменить точку" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "Изменить..." @@ -1937,7 +2000,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Эмулируемый Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "Качество эмуляции:" @@ -1959,23 +2022,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "Включить логирование AR-событий" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "Включить аудиотроттлинг" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "Включить BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Включить совмещение блоков" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -1989,6 +2052,7 @@ msgstr "" msgid "Enable Cache" msgstr "кэшировать" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -1998,52 +2062,55 @@ msgstr "кэшировать" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Включить чит-коды" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "Включить DTK-музыку" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Включить DualCore-режим" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Включить DualCore-режим (ускорение)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "Включить горячие клавиши" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Включить IdleSkipping-режим" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Включить IdleSkipping-режим (ускорение)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Включить MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "Включить прогрессивную развертку" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 #, fuzzy msgid "Enable Screen Saver" msgstr "Включить широкий экран" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "Включить широкий экран" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "Включить каркас моделей" @@ -2060,7 +2127,7 @@ msgstr "" "Повышает визуальное качество текстур, находящихся под наклоном\n" "к углу обзора." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2068,7 +2135,7 @@ msgstr "" "Активирует режим быстрого доступ к диску, необходим для некоторых игр " "(отключите для повышения совместимости)." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "" @@ -2088,7 +2155,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2096,7 +2163,7 @@ msgstr "" "Ускоряет игру The Legend of Zelda: Twilight Princess. Для любой ДРУГОЙ игры " "данный хак должен быть ОТКЛЮЧЕН." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2105,7 +2172,7 @@ msgstr "" "Активирует смещение адреса блока (Block Address Translation, BAT), одну из " "функций MMU. Повышает точность эмуляции ценой снижения скорости." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 #, fuzzy msgid "Enables Custom Projection Hack" msgstr "Projection-хак: " @@ -2118,7 +2185,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2138,6 +2205,7 @@ msgstr "" msgid "End" msgstr "End" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2153,6 +2221,11 @@ msgstr "End" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "English" msgstr "English" @@ -2184,6 +2257,7 @@ msgstr "Равно" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Ошибки" @@ -2214,18 +2288,24 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "Ошибки" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: 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 +#: Source/Core/Common/Src/ChunkFile.h:194 #, 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 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2261,7 +2341,7 @@ msgstr "Закрыть Dolphin с эмулятором" msgid "Export Failed" msgstr "Экспортирование файла" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "Экспортирование файла" @@ -2275,15 +2355,15 @@ msgstr "&Экспортировать запись процесса" msgid "Export Recording..." msgstr "&Экспортировать запись процесса" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "Экспортировать сохранение" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "Экспортировать сохранение Wii (эксперемент)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "Экспортировать все сохранения" @@ -2300,7 +2380,7 @@ msgstr "&Экспортировать сохранение как..." msgid "Extension" msgstr "Расширение" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "" @@ -2312,44 +2392,44 @@ msgstr "" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "Извлечь все файлы..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "Извлечь apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "Извлечь DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "Извлесь папку..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "Извлечь файл..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "Извлечь раздел..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "Извлечение %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "Извлечение всех файлов" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "Извлечение папки" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "Подождите..." @@ -2361,11 +2441,11 @@ msgstr "" msgid "FIFO Player" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "ФРАНЦИЯ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "Размер ТФС:" @@ -2377,11 +2457,11 @@ msgstr "Ошибка подключания!" msgid "Failed to Listen!!" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "Ошибка скачивания кодов." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Ошибка извлечения в %s!" @@ -2478,18 +2558,28 @@ msgstr "Ошибка записи заголовка для %s" msgid "Failed to write header for file %d" msgstr "Ошибка записи заголовка для файла %d" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "быстрое" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "Более быстрая верси MMU (работает не со всеми играми)." +#: Source/Core/Core/Src/Movie.cpp:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "" @@ -2499,7 +2589,7 @@ msgstr "" msgid "File Info" msgstr "Информация о коде" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "Файл не содержит кодов." @@ -2532,16 +2622,16 @@ msgstr "" msgid "File not compressed" msgstr "Файл не сжат" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: неизвестный режим открытия : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "Файловая система" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" @@ -2549,7 +2639,7 @@ msgstr "" msgid "First Block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "Исправить контрольную сумму" @@ -2561,7 +2651,7 @@ msgstr "16:9" msgid "Force 4:3" msgstr "4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 #, fuzzy msgid "Force Console as NTSC-J" msgstr "Установить регион консоли как NTSC-J" @@ -2587,7 +2677,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2623,7 +2713,7 @@ msgstr "Расширенные" msgid "Frame Advance" msgstr "Расширенные" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "" @@ -2636,7 +2726,7 @@ msgstr "Расширенные" msgid "Frame S&kipping" msgstr "&Пропуск кадров" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Лимит кадров:" @@ -2644,10 +2734,11 @@ msgstr "Лимит кадров:" msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "Свободный обзор" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2663,6 +2754,11 @@ msgstr "Свободный обзор" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "French" msgstr "French" @@ -2698,7 +2794,7 @@ msgstr "Настройка \"горячих\" клавиш" msgid "GCPad" msgstr "Джойстик" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "ID игры:" @@ -2714,15 +2810,15 @@ msgstr "Игра не запущена!" msgid "Game not found!!" msgstr "Игра не найдена!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "Персональные настройки игр" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Настройки игры" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" @@ -2734,6 +2830,7 @@ msgstr "Опции &контроллера 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 @@ -2741,6 +2838,9 @@ msgstr "Опции &контроллера Gamecube" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Файлы карт памяти Gamecube (*.raw,*.gcp)" @@ -2749,15 +2849,17 @@ msgid "Gamecube Pad settings" msgstr "Настройка контроллера GameCube" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Gecko-коды" -#: Source/Core/Core/Src/GeckoCode.cpp:139 +#: Source/Core/Core/Src/GeckoCode.cpp:222 #, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 @@ -2770,8 +2872,12 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Общие" @@ -2781,6 +2887,7 @@ msgstr "Общие" msgid "General Settings" msgstr "Настройки интерфейса" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2796,6 +2903,11 @@ msgstr "Настройки интерфейса" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "German" msgstr "German" @@ -2828,7 +2940,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 #, fuzzy msgid "Greek" msgstr "Greek" @@ -2861,7 +2973,7 @@ msgstr "" msgid "Header checksum failed" msgstr "Ошибка контрольной суммы заголовка" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 #, fuzzy msgid "Hebrew" msgstr "Hebrew" @@ -2932,12 +3044,16 @@ msgstr "Настройка \"горячих\" клавиш" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Клавиши" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 #, fuzzy msgid "Hungarian" msgstr "Hungarian" @@ -2946,12 +3062,12 @@ msgstr "Hungarian" msgid "Hybrid Wiimote" msgstr "Гибридный Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2964,11 +3080,11 @@ msgstr "" "TitleID %016llx.\n" " Dolphin cкорее всего зависнет" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "Настройки консоли (IPL)" @@ -2984,15 +3100,15 @@ msgstr "ИК указатель" msgid "IR Sensitivity:" msgstr "Чувствительность IR-сигнала:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "Данные образа" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "Папки с файлами образов" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "ИТАЛИЯ" @@ -3000,13 +3116,13 @@ msgstr "ИТАЛИЯ" msgid "Icon" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 #, fuzzy msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" @@ -3014,11 +3130,12 @@ msgstr "" "Активирует устройство управления памятью, требуется для некоторых игр " "(активация повышает совместимость, деактивация - скорость)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 #, fuzzy 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." +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " +"Audio to throttle using the DSP (might fix audio clicks but can also cause " +"constant noise depending on the game)." msgstr "" "Установка значения лимита кадров выше стандартной скорости игр (NTSC:60, " "PAL:50)\n" @@ -3049,7 +3166,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "Импортировать сохранение" @@ -3098,7 +3215,7 @@ msgstr "" "Отключение освещения улучшает производительность, но освещение полностью " "пропадет в играх, которые его используют." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "Почти играбельна" @@ -3107,7 +3224,7 @@ msgid "In-Game" msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Информация" @@ -3127,7 +3244,7 @@ msgstr "Insert" msgid "Insert Encrypted or Decrypted code here..." msgstr "Вставьте сюда сам код (шифрованный или нешифрованный)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Вставить SD-карту" @@ -3140,7 +3257,7 @@ msgstr "Введите имя кода..." msgid "Install WAD" msgstr "Установка Wii-меню" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Установить в меню Wii" @@ -3150,6 +3267,7 @@ msgid "" msgstr "" "Вызван InstallExceptionHandler, но ваша платформа его еще не поддерживает." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3159,16 +3277,19 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Installing WAD..." msgstr "Устанавливается WAD в меню Wii..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 #, fuzzy msgid "Interface" msgstr "Настройки интерфейса" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "Настройки интерфейса" @@ -3194,11 +3315,11 @@ msgstr "Внутреняя ошибка LZO - ошибка в lzo_init()" msgid "Internal Resolution:" msgstr "Разрешение полноэкранного режима:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Интерпретатор (ОЧЕНЬ медленный)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "Заставка" @@ -3215,7 +3336,7 @@ msgstr "Неверное значение!" msgid "Invalid bat.map or dir entry" msgstr "" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "Неверный тип события %i" @@ -3235,14 +3356,15 @@ msgstr "" "%s\n" " Лучше сделать новую копию игры." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "Неверный файл записи" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "Неверное сохранение" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3258,29 +3380,34 @@ msgstr "Неверное сохранение" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Italian" msgstr "Italian" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "ЯПОНИЯ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT-рекомпилятор (рекомендуется)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL-рекомпилятор (экспериментальный)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 #, fuzzy msgid "Japanese" msgstr "Japanese" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "КОРЕЯ" @@ -3289,8 +3416,8 @@ msgstr "КОРЕЯ" msgid "Key" msgstr "Комбинация" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 #, fuzzy msgid "Korean" msgstr "Korean" @@ -3310,7 +3437,7 @@ msgstr "" msgid "L-Analog" msgstr "L-Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "Язык" @@ -3358,7 +3485,7 @@ msgstr "" msgid "Less Than" msgstr "Меньше чем" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "" @@ -3366,7 +3493,7 @@ msgstr "" msgid "Load" msgstr "Загр." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 #, fuzzy msgid "Load Custom Textures" msgstr "Load Hi-Res Textures" @@ -3423,6 +3550,7 @@ msgstr "Быстрая &загрузка" msgid "Load State..." msgstr "Загрузить игру..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3432,10 +3560,14 @@ msgstr "Загрузить игру..." ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "Загрузить Wii System Menu (%d %c)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 @@ -3445,6 +3577,9 @@ msgstr "Загрузить Wii System Menu (%d %c)" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Загрузить Wii System Menu (%d %c)" @@ -3470,7 +3605,7 @@ msgstr "Загружает указанный файл (DOL, ELF, WAD, GCM, ISO) msgid "Local" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 #, fuzzy msgid "Lock Threads to Cores" msgstr "\"Привязать\" потоки данных к ядрам" @@ -3484,12 +3619,12 @@ msgstr "Лог" msgid "Log Configuration" msgstr "Настройка \"горячих\" клавиш" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 #, fuzzy msgid "Log Types" msgstr "Тип:" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "" @@ -3519,7 +3654,7 @@ msgstr "" "MD5 не совпадает\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "Ускорить MMU (спидхак)" @@ -3541,11 +3676,11 @@ msgstr "Файлы Gameshark MadCatz (*.gcs)" msgid "Main Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "ID создателя:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "Создатель:" @@ -3570,6 +3705,7 @@ msgstr "Па&мять" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3577,6 +3713,9 @@ msgstr "Па&мять" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Карта памяти" @@ -3605,7 +3744,7 @@ msgstr "" msgid "Menu" msgstr "Меню" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "Мик." @@ -3615,11 +3754,11 @@ msgstr "Мик." msgid "Min" msgstr "Мик." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "Разное" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Разное" @@ -3636,7 +3775,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "Моноширный шрифт" @@ -3649,7 +3788,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3664,7 +3803,7 @@ msgstr "" msgid "Multiply" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3754,6 +3893,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Вверх" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3763,6 +3903,9 @@ msgstr "NP Вверх" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3771,7 +3914,7 @@ msgstr "Имя:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Имя:" @@ -3785,7 +3928,7 @@ msgid "New Scan" msgstr "Новый поиск" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "След. страница" @@ -3797,7 +3940,7 @@ msgstr "Искать далее" msgid "Nickname :" msgstr "Ник :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "" @@ -3837,7 +3980,7 @@ msgstr "Не найдена папка с сохранениями для %s" msgid "None" msgstr "Отсутствует" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 #, fuzzy msgid "Norwegian Bokmaal" msgstr "Norwegian Bokmaal" @@ -3846,8 +3989,8 @@ msgstr "Norwegian Bokmaal" msgid "Not Equal" msgstr "Не равно" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "Неизвестно" @@ -3867,7 +4010,7 @@ msgstr "Не подключено" msgid "Notes" msgstr "Примечания" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "Примечания:" @@ -3905,7 +4048,7 @@ msgstr "" msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Выкл" @@ -3931,11 +4074,11 @@ msgstr "Доступно только %d блоков" msgid "Open" msgstr "Открыть" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "Открыть &папку с образом" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "Открыть папку с &сохранениями Wii" @@ -3957,11 +4100,11 @@ msgstr "OpenAL: не найдена аудио-карта" msgid "OpenAL: can't open device %s" msgstr "OpenAL: ошибка открытия устройства %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "" @@ -3990,7 +4133,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "" @@ -4040,19 +4183,20 @@ msgstr "" msgid "Parameters" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Раздел %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Патчи" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Папки" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4065,6 +4209,10 @@ msgstr "Папки" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Пауза" @@ -4074,7 +4222,7 @@ msgstr "Пауза" msgid "Per-Pixel Lighting" msgstr "Освещение пикселя" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Отлично" @@ -4087,6 +4235,7 @@ msgstr "Точка %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 ======= @@ -4097,6 +4246,10 @@ msgstr "Точка %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Запуск" @@ -4111,7 +4264,7 @@ msgstr "Про&играть запись процесса" msgid "Play/Pause" msgstr "Старт/Пауза" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "Играбельна" @@ -4124,6 +4277,7 @@ msgstr "Опции" msgid "Players" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4133,6 +4287,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "" @@ -4144,27 +4301,27 @@ msgstr "Пожалуйста, создайте точку обозрения, п msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 #, fuzzy msgid "Polish" msgstr "Polish" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 #, fuzzy msgid "Port 1" msgstr "Порт :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 #, fuzzy msgid "Port 2" msgstr "Порт :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 #, fuzzy msgid "Port 3" msgstr "Порт :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 #, fuzzy msgid "Port 4" msgstr "Порт :" @@ -4174,12 +4331,12 @@ msgstr "Порт :" msgid "Port :" msgstr "Порт :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 #, fuzzy msgid "Portuguese" msgstr "Portuguese" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 #, fuzzy msgid "Portuguese (Brazilian)" msgstr "Portuguese (Brazilian)" @@ -4189,17 +4346,17 @@ msgstr "Portuguese (Brazilian)" msgid "Post-Processing Effect:" msgstr "Шейдер пост-обработки:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4213,7 +4370,7 @@ msgstr "<Нажмите кнопку>" msgid "Prev Page" msgstr "Пред. страница" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "Пред. страница" @@ -4265,7 +4422,7 @@ msgstr "R-Analog" msgid "RAM" msgstr "Память" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "РОССИЯ" @@ -4278,7 +4435,7 @@ msgstr "" msgid "Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "Настоящий" @@ -4357,6 +4514,7 @@ msgstr "&Обновить список игр" msgid "Refresh game list" msgstr "Обновление списка игр" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4375,6 +4533,12 @@ msgstr "Обновление списка игр" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Удалить" @@ -4427,11 +4591,11 @@ msgstr "" msgid "Rumble" msgstr "Видбрация" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Запускает обработку DSP LLE в отдельном потоке (не рекомендуется)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Русский" @@ -4439,10 +4603,11 @@ msgstr "Русский" msgid "Sa&ve State" msgstr "Быстрое &сохранение" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "безопасное" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4452,6 +4617,9 @@ msgstr "безопасное" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Sample Rate:" msgstr "Частота" @@ -4518,12 +4686,12 @@ msgstr "Быстрое &сохранение" msgid "Save State..." msgstr "Сохранить игру как..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Сохранить как..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Выберите место для сохранения сжатого GCM/ISO-образа" @@ -4531,11 +4699,11 @@ msgstr "Выберите место для сохранения сжатого G msgid "Save current perspective" msgstr "Сохранить точку" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "Выберите место для сохранения несжатого GCM/ISO-образа" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -4544,6 +4712,7 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4553,15 +4722,18 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "Поиск..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "Поиск образов дисков" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "Поиск..." @@ -4577,12 +4749,12 @@ msgstr "Scroll Lock" msgid "Search Filter" msgstr "Фильтр поиска" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 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:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "Секция %s не найдена в SYSCONF" @@ -4592,6 +4764,7 @@ msgstr "Секция %s не найдена в SYSCONF" msgid "Select" msgstr "Выбрать" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4616,6 +4789,14 @@ msgstr "Выберите файл для записи игрового проц #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Выберите файл для записи игрового процесса" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Выберите файл сохранения для импорта" @@ -4642,16 +4823,21 @@ msgstr "" msgid "Select the file to load" msgstr "Выберите файл для запуска..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Выберите файл сохранений Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Выберите файл сохранения для загрузки" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 @@ -4671,6 +4857,9 @@ msgstr "Выберите файл сохранения для загрузки" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Выберите или укажите файл для быстрого сохранения" @@ -4691,7 +4880,7 @@ msgstr "" "4:3: Подравнять картинку к соотношению 4:3.\n" "Растянуть по окну: Размер картинки соответствует размеру окна." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Выбранный шрифт" @@ -4727,11 +4916,11 @@ msgstr "Месторасположение сенсора:" msgid "Separator" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4742,11 +4931,11 @@ msgstr "" msgid "Set" msgstr "Выбрать" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "Сделать &игрой по умолчанию" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "Установить картой памяти по умолчанию %c" @@ -4756,7 +4945,7 @@ msgstr "Установить картой памяти по умолчанию % msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 #, fuzzy msgid "Settings..." msgstr "Настройки консоли (IPL)" @@ -4769,7 +4958,7 @@ msgstr "SetupWiiMem: Файл настроек не найден" msgid "Shake" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "Короткое имя:" @@ -4799,7 +4988,7 @@ msgstr "Отображать панель &инструментов" msgid "Show Drives" msgstr "Отображать игры на DVD" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 #, fuzzy msgid "Show EFB Copy Regions" msgstr "Регионы копии EFB" @@ -4816,7 +5005,7 @@ msgstr "Франции" msgid "Show GameCube" msgstr "GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 #, fuzzy msgid "Show Input Display" msgstr "Италии" @@ -4833,7 +5022,7 @@ msgstr "JAP" msgid "Show Korea" msgstr "Кореи" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "Отображать язык:" @@ -4854,7 +5043,7 @@ msgstr "Отображать игры платформ..." msgid "Show Regions" msgstr "Отображать игры регионов..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 #, fuzzy msgid "Show Statistics" msgstr "Различная статистика" @@ -4875,11 +5064,11 @@ msgstr "WAD-файлы" msgid "Show Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "Активирует запрос подтверждения об остановке процесса эмуляции игры." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 #, fuzzy msgid "" "Show a message box when a potentially serious error has occured.\n" @@ -4892,24 +5081,24 @@ msgstr "" "во время игры, однако в случае вылета эмулятора вы не увидите никакой " "информации." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 #, fuzzy msgid "Show first block" msgstr "Показать блоки" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "Показать блоки" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "Показать комментарий" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "Показать иконку" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "Показать заголовок" @@ -4941,7 +5130,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Реальный Wimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 #, fuzzy msgid "Simplified Chinese" msgstr "Simplified Chinese" @@ -4950,12 +5139,12 @@ msgstr "Simplified Chinese" msgid "Size" msgstr "Размер" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 #, fuzzy msgid "Skip BIOS" msgstr "Пропуcтить загрузку BIOS'а GC" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "" @@ -4987,12 +5176,12 @@ msgstr "" msgid "Slot %i" msgstr "Слот" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 #, fuzzy msgid "Slot A" msgstr "Слот" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 #, fuzzy msgid "Slot B" msgstr "Слот" @@ -5013,7 +5202,7 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "Настройки эмуляции звука" @@ -5031,6 +5220,7 @@ msgstr "Ошибка создания аудио-буфера %s." msgid "Space" msgstr "Пробел" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5046,6 +5236,11 @@ msgstr "Пробел" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Spanish" msgstr "Spanish" @@ -5071,7 +5266,7 @@ msgstr "" msgid "Specify a video backend" msgstr "Назначает видео-плагин" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Ускорить чтение с диска" @@ -5079,7 +5274,7 @@ msgstr "Ускорить чтение с диска" msgid "Square Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "" @@ -5174,12 +5369,12 @@ msgstr "Сохранение успешно импортировано" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Язык системы:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "ТАЙВАНЬ" @@ -5218,7 +5413,7 @@ msgstr "Правая панель" msgid "Take Screenshot" msgstr "Сделать скриншот" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -5235,7 +5430,7 @@ msgstr "Текстура" msgid "Texture Cache" msgstr "Очистить кэш" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 #, fuzzy msgid "Texture Format Overlay" msgstr "Формат текстур" @@ -5252,13 +5447,13 @@ msgstr "Неверный адрес" msgid "The checksum was successfully fixed" msgstr "Контрольная сумма успешно исправлена" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "Выбпвнная папка уже в списке" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, fuzzy, c-format msgid "" "The file %s already exists.\n" @@ -5281,7 +5476,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "Файл %s уже открыт, нельзя записать заголовок." -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Указанный файл (%s) не существует" @@ -5303,7 +5498,7 @@ msgid "" "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." +"If unsure, use the rightmost value." msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 @@ -5342,7 +5537,7 @@ msgstr "Указанный файл \"%s\" не существует" msgid "The value is invalid" msgstr "Неверное значение" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Стиль" @@ -5350,7 +5545,7 @@ msgstr "Стиль" msgid "Theme selection went wrong" msgstr "Ошибка выбора темы" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5358,7 +5553,7 @@ msgstr "" "Не найден билет для 00000001/00000002. Ваша копия NAND скорее всего не " "полная." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5378,7 +5573,7 @@ msgstr "" "Симулятор action replay не поддерживает коды, которые меняют сам Action " "Replay. " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "" "Активация данной опции может привести к замедлению эмуляции в Wii-меню и " @@ -5396,26 +5591,11 @@ msgid "" msgstr "" #: 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" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" -"Данная опция позволяет включить ограничение эмуляции скорости игры\n" -"посредством \"подгонки\" оной к скорости звука.\n" -"Отключение данной опции может вызвать ускорение игрового процесса.\n" -"Включение данной опции может вызвать эффект шума на фоне (редко).\n" -"\n" -"Удерживайте клавишу для быстрого отключения данной опции в игре." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "" "Данная оцпия включает обработку музыкальных трэков (BGM, фоновая музыка)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 #, fuzzy msgid "" "This splits the Video and CPU threads, so they can be run on separate " @@ -5428,7 +5608,7 @@ msgstr "" "эмулятора на многоядерных системах. Побочным эффектом данной опции\n" "является появления некоторых багов и/или ошибок в эмуляции." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "Это позволит вам вручную править INI файл с конфигурацией" @@ -5452,7 +5632,7 @@ msgstr "Название" msgid "To" msgstr "сверху" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 #, fuzzy msgid "Toggle All Log Types" msgstr "Включить все" @@ -5473,6 +5653,7 @@ msgstr "Включение полноэкранного режима" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5480,15 +5661,18 @@ msgstr "Включение полноэкранного режима" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "сверху" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 #, fuzzy msgid "Traditional Chinese" msgstr "Traditional Chinese" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "Попытка загрузить неизвестный тип файла." @@ -5496,7 +5680,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:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Попытка чтения из неверного SYSCONF" @@ -5506,7 +5690,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 #, fuzzy msgid "Turkish" msgstr "Turkish" @@ -5528,11 +5712,11 @@ msgstr "Порт UDP:" msgid "UDP Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "НЕИЗВЕСТНО" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "США" @@ -5613,7 +5797,7 @@ msgstr "Обновить" msgid "Upright Wiimote" msgstr "Гибридный Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Использовать EuRGB60-режим (PAL60)" @@ -5626,7 +5810,7 @@ msgstr "&Полноэкранный режим" msgid "Use Hex" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Показывать panic-уведомления (ошибки)" @@ -5647,7 +5831,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "Утилиты" @@ -5671,25 +5855,29 @@ msgstr "" msgid "Verbosity" msgstr "Глубина анализа" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Видео" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Виртуальный" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Громкость" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "Ошибка установки WAD: ошибка создания %s" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "Ошибка установки WAD: ошибка создания %s" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5704,15 +5892,15 @@ msgstr "" msgid "Warning" msgstr "Предупреждение" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "Предупреждение: запуск DOL в неправильном режиме!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Предупреждение: запуск ELF в неправильном режиме!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Предупреждение: запуск ISO в неправильном режиме!" @@ -5739,7 +5927,7 @@ msgstr "" "с совпадающими именами будут переписаны\n" "Продолжить?" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5747,7 +5935,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5755,7 +5943,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5783,7 +5971,7 @@ msgstr "WaveFileWriter - файл не открыт." msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "" @@ -5791,15 +5979,15 @@ msgstr "" msgid "Width" msgstr "Ширина" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #, fuzzy msgid "Wii NAND Root:" msgstr "DVD-диск:" @@ -5808,6 +5996,7 @@ msgstr "DVD-диск:" msgid "Wii Save Import" msgstr "Импорт сохранений Wii" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5817,6 +6006,9 @@ msgstr "Импорт сохранений Wii" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Файлы сохранений Wii (*.bin)|*.bin" @@ -5883,10 +6075,11 @@ msgstr "Windows Menu" msgid "Windows Right" msgstr "Windows Right" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "Перенос строк" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -5902,6 +6095,11 @@ msgstr "Перенос строк" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Подождите..." @@ -5909,6 +6107,11 @@ msgstr "Подождите..." msgid "Write to Console" msgstr "Выводить в консоль" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "Сохранять в файл" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "Сохранять в файл" @@ -5963,7 +6166,7 @@ msgstr "Нужно ввести десятичное или шестнадцат msgid "You must enter a valid profile name." msgstr "Введите правильное имя профиля." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Необходимо перезапустить Dolphin, чтобы изменения вступили в силу." @@ -5984,7 +6187,7 @@ msgid "" msgstr "" "Ваш файл SYSCONF неверного размера (0x%2$04llx), а должен быть 0x%1$04x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "Включить ZTP-хак" @@ -6039,7 +6242,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "загрузчик (.img)" @@ -6070,12 +6273,12 @@ msgstr "это сохранение не от Wii или ошибка чтени msgid "s" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "неизвестная команда 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute вернул -1 при запуске приложения!" @@ -6245,6 +6448,9 @@ msgstr "| OR" #~ msgid "Emulator Display Settings" #~ msgstr "Настройки изображения" +#~ msgid "Enable Audio Throttle" +#~ msgstr "Включить аудиотроттлинг" + #~ msgid "Enable CPU Access" #~ msgstr "Включить доступ CPU к EFB" @@ -6450,6 +6656,20 @@ msgstr "| OR" #~ msgid "Take Screenshot\t" #~ msgstr "Сделать скриншот\t" +#~ msgid "" +#~ "This is used to control game speed by sound throttle.\n" +#~ "Disabling this could cause abnormal game speed, such as too fast.\n" +#~ "But sometimes enabling this could cause constant noise.\n" +#~ "\n" +#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." +#~ msgstr "" +#~ "Данная опция позволяет включить ограничение эмуляции скорости игры\n" +#~ "посредством \"подгонки\" оной к скорости звука.\n" +#~ "Отключение данной опции может вызвать ускорение игрового процесса.\n" +#~ "Включение данной опции может вызвать эффект шума на фоне (редко).\n" +#~ "\n" +#~ "Удерживайте клавишу для быстрого отключения данной опции в игре." + #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "" #~ "Данная опция включает обработку голосовых и SFX-эффектов (простые звуки)." diff --git a/Languages/po/sr.po b/Languages/po/sr.po index c90b7828e7..62ec55ce59 100644 --- a/Languages/po/sr.po +++ b/Languages/po/sr.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -16,6 +17,9 @@ msgstr "" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Update from master branch. +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-03-02 21:58+0100\n" "Last-Translator: nikolassj\n" "Language-Team: \n" @@ -58,9 +62,9 @@ msgstr "\"%s\"je GCM/ISO fajl, ili nije GC/Wii ISO." msgid "%1$sCopy%1$s" msgstr "%1$sKopiraj%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "" @@ -145,7 +149,7 @@ msgstr "%sExportuj GCI%s" msgid "%sImport GCI%s" msgstr "%sImportuj GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "" @@ -178,11 +182,11 @@ msgstr "&Chit Meneger " msgid "&DSP Settings" msgstr "&DSP Opcije" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "&Obrisi ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "&Obrisi oznacene ISO fajlove..." @@ -246,7 +250,7 @@ msgstr "&Pauza" msgid "&Play" msgstr "&Pokreni" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "&Pribor/Opcije" @@ -290,7 +294,7 @@ msgstr "&Pogledaj" msgid "&Wiimote Settings" msgstr "&Wiimote Opcije" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "" @@ -334,7 +338,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -343,7 +347,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -382,13 +386,13 @@ msgid "" "You must forward TCP port to host!!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "AR Kodovi" @@ -400,11 +404,11 @@ msgstr "O Dolphin-u" msgid "Acceleration" msgstr "Ubrzanje" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Tacna VBeam emulacija" @@ -504,11 +508,11 @@ msgstr "Adapter" msgid "Add" msgstr "Dodaj" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "Dodaj ActionReplay kod" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "Dodaj Patch " @@ -516,6 +520,7 @@ msgstr "Dodaj Patch " msgid "Add new pane" msgstr "Dodaj nova okna" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -531,6 +536,11 @@ msgstr "Dodaj nova okna" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Dodaj..." @@ -564,11 +574,11 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "" @@ -576,14 +586,15 @@ msgstr "" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -596,18 +607,22 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "" @@ -619,7 +634,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Alternate Wiimote Timing" msgstr "" @@ -639,7 +654,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "" @@ -654,7 +669,7 @@ msgid "" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "" @@ -663,7 +678,7 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "Jeste li sigurni da zelite da obrisete \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -671,10 +686,11 @@ msgstr "" "Jeste li sigurni da zelite da obrisete ove fajlove?\n" "Nestace zauvek!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 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 <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -684,6 +700,9 @@ msgstr "Jesi li siguran da zelis da obrises ovaj fajl? Nestace zauvek!" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -692,18 +711,20 @@ msgstr "" msgid "At least one pane must remain open." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Zvuk" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -713,6 +734,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -750,7 +774,7 @@ msgstr "" msgid "Back" msgstr "Nazad " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "" @@ -778,11 +802,11 @@ msgstr "" msgid "Banner" msgstr "Baner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "Detalji o Baneru" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "Baner:" @@ -794,7 +818,7 @@ msgstr "Bar" msgid "Basic" msgstr "Osnovno/ni/ne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Osnovne opcije" @@ -825,6 +849,7 @@ msgstr "Blue right " #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -832,6 +857,9 @@ msgstr "Blue right " ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Donji deo/dno" @@ -840,7 +868,7 @@ msgstr "Donji deo/dno" msgid "Bound Controls: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Ostecen/a/nje..." @@ -856,7 +884,7 @@ msgstr "" msgid "Browse for an ISO directory..." msgstr "Trazi ISO direktoriju" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "" @@ -887,11 +915,11 @@ msgstr "C-Stick" msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "CPU Emulacije \"Engine\"" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "" @@ -930,7 +958,7 @@ msgstr "Nemoze otvoriti %s" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -938,7 +966,7 @@ msgid "" "is not a valid gamecube memory card file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -954,8 +982,6 @@ msgstr "" msgid "Cant find WiiMote by connection handle %02x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -965,7 +991,7 @@ msgstr "" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "" @@ -990,7 +1016,7 @@ msgstr "Promeni Disk" msgid "Change Game" msgstr "Promeni Igru" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1006,8 +1032,8 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "" @@ -1027,31 +1053,31 @@ msgstr "Trazi Chit" msgid "Cheats Manager" msgstr "Chit Meneger" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Kineski (pojednostavljen)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Kineski (tradicionalan)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Biraj fajl da otvoris " @@ -1059,14 +1085,14 @@ msgstr "Biraj fajl da otvoris " msgid "Choose a memory card:" msgstr "Biraj memorisku karticu:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 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 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Biraj folder u kome zelis da ekstraktujes " @@ -1078,14 +1104,14 @@ msgstr "" msgid "Classic" msgstr "Klasik/a" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "Ocisti" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "\"Clear\" nije uspeo " @@ -1101,6 +1127,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 @@ -1109,6 +1136,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Zatvori" @@ -1132,20 +1163,20 @@ msgstr "Komanda" msgid "Comment" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Koment:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "Kompresuj ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Kompresuj oznaceni ISO fajlovi..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "Kompresivanje ISO fajla u toku" @@ -1172,13 +1203,13 @@ msgstr "" msgid "Configure..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "" @@ -1187,7 +1218,7 @@ msgstr "" msgid "Connect" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "" @@ -1244,12 +1275,12 @@ msgstr "Konvertuj u GCI" msgid "Copy failed" msgstr "Kopiranje neuspesno " -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "Kopiraj na memorisku karticu %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "" @@ -1276,7 +1307,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "" @@ -1287,7 +1318,7 @@ msgid "" "(setting pads while the game is running is not yet supported)" msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1296,7 +1327,7 @@ msgid "" "protected?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "" @@ -1311,7 +1342,7 @@ msgstr "" msgid "Count:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "Zemlja:" @@ -1325,24 +1356,24 @@ msgstr "Kreiraj AR Kod" msgid "Create new perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "Kreator " @@ -1350,7 +1381,7 @@ msgstr "Kreator " msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "Izseci" @@ -1370,7 +1401,7 @@ msgstr "" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "" @@ -1378,11 +1409,11 @@ msgstr "" msgid "Custom Projection Hack Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "" @@ -1394,10 +1425,11 @@ msgstr "" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1408,18 +1440,22 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "" @@ -1427,15 +1463,23 @@ msgstr "" msgid "DSP settings" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "" @@ -1456,7 +1500,7 @@ msgstr "Mrtva Zona " msgid "Debug" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "" @@ -1464,16 +1508,16 @@ msgstr "" msgid "Decimal" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "" @@ -1481,11 +1525,11 @@ msgstr "" msgid "Default" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "" @@ -1494,7 +1538,7 @@ msgstr "" msgid "Delete" msgstr "Obrisi" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "Obrisi save" @@ -1503,7 +1547,7 @@ msgstr "Obrisi save" msgid "Delete the existing file '%s'?" msgstr "Obrisi postojeci fajl '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 #, fuzzy msgid "Description" msgstr "Pitanje " @@ -1512,8 +1556,8 @@ msgstr "Pitanje " msgid "Detect" msgstr "Detekuj" -#: 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 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." @@ -1524,8 +1568,8 @@ msgstr "" msgid "Device" msgstr "Uredjaj " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Opcije Uredjaja " @@ -1548,24 +1592,24 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 #, fuzzy msgid "Disable" msgstr "Onemoguci \"Fog\"" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "Onemoguci \"Fog\"" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "Onemoguci \"Lighting\"" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "Onemoguci \"Textures\" " @@ -1595,7 +1639,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Disk" @@ -1619,6 +1663,7 @@ msgstr "" msgid "Divide" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1628,10 +1673,13 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1657,6 +1705,7 @@ msgstr "" msgid "Dolphin FIFO" msgstr "Dolphin" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1681,6 +1730,14 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1709,11 +1766,11 @@ msgstr "" msgid "Down" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "" @@ -1722,23 +1779,23 @@ msgstr "" msgid "Drums" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "" @@ -1763,6 +1820,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1778,6 +1836,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "" @@ -1798,7 +1861,7 @@ msgid "" "driver." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "" @@ -1814,7 +1877,7 @@ msgstr "" msgid "Edit ActionReplay Code" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "" @@ -1826,8 +1889,8 @@ msgstr "" msgid "Edit current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "" @@ -1866,7 +1929,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "" @@ -1888,23 +1951,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -1917,6 +1980,7 @@ msgstr "" msgid "Enable Cache" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -1926,51 +1990,54 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "" @@ -1983,13 +2050,13 @@ msgid "" "If unsure, select 1x." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "" @@ -2009,20 +2076,20 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 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 "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "" @@ -2034,7 +2101,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2051,6 +2118,7 @@ msgstr "" msgid "End" msgstr "Kraj" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2066,6 +2134,11 @@ msgstr "Kraj" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "" @@ -2096,6 +2169,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Error" @@ -2126,18 +2200,24 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "Error" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: 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 +#: Source/Core/Common/Src/ChunkFile.h:194 #, 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 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2169,7 +2249,7 @@ msgstr "" msgid "Export Failed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "" @@ -2182,15 +2262,15 @@ msgstr "" msgid "Export Recording..." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "" @@ -2206,7 +2286,7 @@ msgstr "" msgid "Extension" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "" @@ -2218,44 +2298,44 @@ msgstr "" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "" @@ -2267,11 +2347,11 @@ msgstr "" msgid "FIFO Player" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "" @@ -2283,11 +2363,11 @@ msgstr "" msgid "Failed to Listen!!" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "" @@ -2383,19 +2463,29 @@ msgstr "" msgid "Failed to write header for file %d" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "Brzo " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 #, fuzzy msgid "Fast Mipmaps" msgstr "Ucitaj Native Mipmaps" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "" +#: Source/Core/Core/Src/Movie.cpp:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "" @@ -2405,7 +2495,7 @@ msgstr "" msgid "File Info" msgstr "Informacija o kodu " -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "" @@ -2434,16 +2524,16 @@ msgstr "" msgid "File not compressed" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" @@ -2451,7 +2541,7 @@ msgstr "" msgid "First Block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "" @@ -2463,7 +2553,7 @@ msgstr "" msgid "Force 4:3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "" @@ -2487,7 +2577,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2518,7 +2608,7 @@ msgstr "" msgid "Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "" @@ -2530,7 +2620,7 @@ msgstr "" msgid "Frame S&kipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "" @@ -2538,10 +2628,11 @@ msgstr "" msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2557,6 +2648,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "" @@ -2591,7 +2687,7 @@ msgstr "Dolphin podesavanja/konfiguracija" msgid "GCPad" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "" @@ -2607,15 +2703,15 @@ msgstr "Igra nije pokrenuta!" msgid "Game not found!!" msgstr "Igra nije pronadjena " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube " @@ -2626,6 +2722,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2633,6 +2730,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2641,21 +2741,24 @@ msgid "Gamecube Pad settings" msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "" -#: Source/Core/Core/Src/GeckoCode.cpp:139 +#: Source/Core/Core/Src/GeckoCode.cpp:222 #, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 @@ -2664,6 +2767,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2673,6 +2779,7 @@ msgstr "" msgid "General Settings" msgstr "Opcije Uredjaja " +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2688,6 +2795,11 @@ msgstr "Opcije Uredjaja " #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Nemacki " @@ -2719,7 +2831,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "" @@ -2751,7 +2863,7 @@ msgstr "" msgid "Header checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "" @@ -2813,12 +2925,16 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "" @@ -2826,12 +2942,12 @@ msgstr "" msgid "Hybrid Wiimote" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2840,11 +2956,11 @@ msgid "" " Dolphin will likely hang now" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "" @@ -2860,15 +2976,15 @@ msgstr "" msgid "IR Sensitivity:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "ISO Detalji " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "" @@ -2876,21 +2992,22 @@ msgstr "" msgid "Icon" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 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." +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " +"Audio to throttle using the DSP (might fix audio clicks but can also cause " +"constant noise depending on the game)." msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 @@ -2915,7 +3032,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "" @@ -2959,7 +3076,7 @@ msgstr "" "Onemoguci \"lighting\". Poboljsava performans/brzinu ali uzrokuje da " "\"lightning\" nestane u igrama koje ga koriste." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "" @@ -2968,7 +3085,7 @@ msgid "In-Game" msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info " @@ -2988,7 +3105,7 @@ msgstr "" msgid "Insert Encrypted or Decrypted code here..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "" @@ -3001,7 +3118,7 @@ msgstr "Ubaci ime ovde..." msgid "Install WAD" msgstr "Instaliraj Wii Meni " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "" @@ -3010,6 +3127,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3019,14 +3137,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "" @@ -3050,11 +3171,11 @@ msgstr "" msgid "Internal Resolution:" msgstr "Rezolucija punog ekrana " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "Uvod" @@ -3071,7 +3192,7 @@ msgstr "" msgid "Invalid bat.map or dir entry" msgstr "" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "" @@ -3088,14 +3209,15 @@ msgid "" " You may need to redump this game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3111,27 +3233,32 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italianski " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "JAPAN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT Recompiler (preporucljivo)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japanski " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "KOREA " @@ -3140,8 +3267,8 @@ msgstr "KOREA " msgid "Key" msgstr "Taster " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Korejski " @@ -3159,7 +3286,7 @@ msgstr "" msgid "L-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "" @@ -3205,7 +3332,7 @@ msgstr "" msgid "Less Than" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "" @@ -3213,7 +3340,7 @@ msgstr "" msgid "Load" msgstr "Ucitaj " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 #, fuzzy msgid "Load Custom Textures" msgstr "Ucitaj Hi-Res Textures " @@ -3262,6 +3389,7 @@ msgstr "Ucitaj State Slot 8" msgid "Load State..." msgstr "Ucitaj State" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3271,10 +3399,14 @@ msgstr "Ucitaj State" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "Ucitaj Wii Sistem Meni (%d %c)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 @@ -3284,6 +3416,9 @@ msgstr "Ucitaj Wii Sistem Meni (%d %c)" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Ucitaj Wii Sistem Meni (%d %c)" @@ -3307,7 +3442,7 @@ msgstr "" msgid "Local" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "" @@ -3319,11 +3454,11 @@ msgstr "" msgid "Log Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "" @@ -3351,7 +3486,7 @@ msgid "" " %016llx%016llx != %016llx%016llx" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "" @@ -3373,11 +3508,11 @@ msgstr "" msgid "Main Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "" @@ -3402,6 +3537,7 @@ msgstr "&Memorija" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3409,6 +3545,9 @@ msgstr "&Memorija" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "" @@ -3437,7 +3576,7 @@ msgstr "" msgid "Menu" msgstr "Meni" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "" @@ -3446,11 +3585,11 @@ msgstr "" msgid "Min" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "" @@ -3467,7 +3606,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "" @@ -3480,7 +3619,7 @@ msgstr "" msgid "Motor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3495,7 +3634,7 @@ msgstr "" msgid "Multiply" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3585,6 +3724,7 @@ msgstr "" msgid "NP Up" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3594,6 +3734,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3602,7 +3745,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "" @@ -3616,7 +3759,7 @@ msgid "New Scan" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "" @@ -3628,7 +3771,7 @@ msgstr "" msgid "Nickname :" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "" @@ -3667,7 +3810,7 @@ msgstr "" msgid "None" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "" @@ -3675,8 +3818,8 @@ msgstr "" msgid "Not Equal" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "" @@ -3696,7 +3839,7 @@ msgstr "" msgid "Notes" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "" @@ -3734,7 +3877,7 @@ msgstr "" msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Izskljucen/o" @@ -3760,11 +3903,11 @@ msgstr "" msgid "Open" msgstr "Otvori " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "" @@ -3786,11 +3929,11 @@ msgstr "" msgid "OpenAL: can't open device %s" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "" @@ -3819,7 +3962,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "" @@ -3869,19 +4012,20 @@ msgstr "" msgid "Parameters" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -3894,6 +4038,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pauza " @@ -3903,7 +4051,7 @@ msgstr "Pauza " msgid "Per-Pixel Lighting" msgstr "Onemoguci \"Lighting\"" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Perfektno " @@ -3916,6 +4064,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 ======= @@ -3926,6 +4075,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Pokreni " @@ -3939,7 +4092,7 @@ msgstr "Pokreni snimanje " msgid "Play/Pause" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "" @@ -3952,6 +4105,7 @@ msgstr "Opcije " msgid "Players" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -3961,6 +4115,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "" @@ -3972,23 +4129,23 @@ msgstr "" msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Polski " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Port 4" @@ -3997,11 +4154,11 @@ msgstr "Port 4" msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portugalski " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "" @@ -4009,17 +4166,17 @@ msgstr "" msgid "Post-Processing Effect:" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4032,7 +4189,7 @@ msgstr "" msgid "Prev Page" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "" @@ -4083,7 +4240,7 @@ msgstr "" msgid "RAM" msgstr "RAM " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "Rusija" @@ -4096,7 +4253,7 @@ msgstr "" msgid "Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "" @@ -4168,6 +4325,7 @@ msgstr "" msgid "Refresh game list" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4186,6 +4344,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "" @@ -4235,11 +4399,11 @@ msgstr "" msgid "Rumble" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "" @@ -4247,10 +4411,11 @@ msgstr "" msgid "Sa&ve State" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "Siguran " +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4260,6 +4425,9 @@ msgstr "Siguran " ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "" @@ -4317,12 +4485,12 @@ msgstr "Snimaj State Slot 8" msgid "Save State..." msgstr "Snimaj state..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Snimaj kao..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Snimaj kompresovani GCM/ISO" @@ -4330,11 +4498,11 @@ msgstr "Snimaj kompresovani GCM/ISO" msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -4343,6 +4511,7 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4352,15 +4521,18 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "Skeniranje..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "Skeniranje za ISO fajlove " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "Skeniranje..." @@ -4376,12 +4548,12 @@ msgstr "" msgid "Search Filter" msgstr "Trazi Filter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Trazi Subfoldere " -#: 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:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "" @@ -4391,6 +4563,7 @@ msgstr "" msgid "Select" msgstr "Izaberi " +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4415,6 +4588,14 @@ msgstr "Izaberi Snimani fajl" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Izaberi Snimani fajl" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Izaberi \"Snimani fajl/Save file\" za importovanje " @@ -4441,16 +4622,21 @@ msgstr "" msgid "Select the file to load" msgstr "Izaberi fajl za ucitavanje " +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Izaberi \"snimani fajl/the save state\"" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Izaberi state za ucitavanje " +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 @@ -4470,6 +4656,9 @@ msgstr "Izaberi state za ucitavanje " ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Izaberi state za snimanje/save" @@ -4484,7 +4673,7 @@ msgid "" "If unsure, select Auto." msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Odabrani font" @@ -4520,11 +4709,11 @@ msgstr "" msgid "Separator" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4533,11 +4722,11 @@ msgstr "" msgid "Set" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "" @@ -4547,7 +4736,7 @@ msgstr "" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "" @@ -4559,7 +4748,7 @@ msgstr "" msgid "Shake" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "" @@ -4588,7 +4777,7 @@ msgstr "" msgid "Show Drives" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "" @@ -4604,7 +4793,7 @@ msgstr "" msgid "Show GameCube" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "" @@ -4620,7 +4809,7 @@ msgstr "" msgid "Show Korea" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "" @@ -4640,7 +4829,7 @@ msgstr "" msgid "Show Regions" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "" @@ -4660,34 +4849,34 @@ msgstr "" msgid "Show Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 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." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "" @@ -4718,7 +4907,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "" @@ -4726,12 +4915,12 @@ msgstr "" msgid "Size" msgstr "Velicina" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 #, fuzzy msgid "Skip BIOS" msgstr "Preskoci GC BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "" @@ -4763,11 +4952,11 @@ msgstr "" msgid "Slot %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "" @@ -4787,7 +4976,7 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "" @@ -4805,6 +4994,7 @@ msgstr "" msgid "Space" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -4820,6 +5010,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "" @@ -4843,7 +5038,7 @@ msgstr "" msgid "Specify a video backend" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "" @@ -4851,7 +5046,7 @@ msgstr "" msgid "Square Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "" @@ -4944,12 +5139,12 @@ msgstr "" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "" @@ -4988,7 +5183,7 @@ msgstr "" msgid "Take Screenshot" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -5006,7 +5201,7 @@ msgstr "Tacan \"Texture Cache\"" msgid "Texture Cache" msgstr "Tacan \"Texture Cache\"" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "" @@ -5022,13 +5217,13 @@ msgstr "" msgid "The checksum was successfully fixed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5047,7 +5242,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "" @@ -5069,7 +5264,7 @@ msgid "" "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." +"If unsure, use the rightmost value." msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 @@ -5107,7 +5302,7 @@ msgstr "" msgid "The value is invalid" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "" @@ -5115,13 +5310,13 @@ msgstr "" msgid "Theme selection went wrong" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5133,7 +5328,7 @@ msgid "" "Replay itself." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "" @@ -5149,19 +5344,10 @@ msgid "" msgstr "" #: 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" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5169,7 +5355,7 @@ msgid "" "cause occasional crashes/glitches." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "" @@ -5192,7 +5378,7 @@ msgstr "" msgid "To" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "" @@ -5212,6 +5398,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5219,14 +5406,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "" @@ -5234,7 +5424,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:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "" @@ -5244,7 +5434,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "" @@ -5265,11 +5455,11 @@ msgstr "" msgid "UDP Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "" @@ -5347,7 +5537,7 @@ msgstr "Updejt " msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "" @@ -5360,7 +5550,7 @@ msgstr "&Pun Ekran" msgid "Use Hex" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "" @@ -5381,7 +5571,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "" @@ -5405,25 +5595,28 @@ msgstr "" msgid "Verbosity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Video " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Jacina zvuka " -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +msgid "WAD installation failed: error creating ticket" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5438,15 +5631,15 @@ msgstr "" msgid "Warning" msgstr "Upozorenje " -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "Upozorenje - pokrece se DOL u pogresan konzol mod!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Upozorenje - pokrece se ELF u pogresan konzol mod!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Upozorenje - pogretanje ISO fajla u pogresan konzol mod!" @@ -5472,7 +5665,7 @@ msgstr "" "koji imaju isto ime kao i fajlovi na vasoj memoriskoj kartici\n" " Nastavi?" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5480,7 +5673,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5488,7 +5681,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5516,7 +5709,7 @@ msgstr "" msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "" @@ -5524,15 +5717,15 @@ msgstr "" msgid "Width" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "" @@ -5540,6 +5733,7 @@ msgstr "" msgid "Wii Save Import" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5549,6 +5743,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5612,10 +5809,11 @@ msgstr "" msgid "Windows Right" msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -5631,6 +5829,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Radi..." @@ -5638,6 +5841,10 @@ msgstr "Radi..." msgid "Write to Console" msgstr "" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +msgid "Write to Debugger" +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "" @@ -5691,7 +5898,7 @@ msgstr "" msgid "You must enter a valid profile name." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" @@ -5709,7 +5916,7 @@ msgid "" "Do you want to generate a new one?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "" @@ -5763,7 +5970,7 @@ msgstr "" msgid "^ ADD" msgstr "^ DODAJ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "" @@ -5794,12 +6001,12 @@ msgstr "" msgid "s" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "" diff --git a/Languages/po/tr.po b/Languages/po/tr.po index a3e5d84924..890dd90043 100644 --- a/Languages/po/tr.po +++ b/Languages/po/tr.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -19,6 +20,9 @@ msgstr "" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Clean up Turkish translation file. +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-12-20 19:22+0200\n" >>>>>>> Update Hungarian and Turkish translations. "Last-Translator: nlgzrgn \n" @@ -65,9 +69,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sKopyala%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -161,7 +165,7 @@ msgstr "%sGCI Ver%s" msgid "%sImport GCI%s" msgstr "%sGCI Al%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u Boş Blok; %u Boş Dizin Girişi" @@ -194,11 +198,11 @@ msgstr "Hile Yöneti&cisi" msgid "&DSP Settings" msgstr "Ses Ayarları (&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "Kalıbı Sil... (&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "Seçilen Kalıpları Sil... (&D)" @@ -262,7 +266,7 @@ msgstr "Duraklat (&P)" msgid "&Play" msgstr "Oynat (&P)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "Özellikler (&P)" @@ -306,7 +310,7 @@ msgstr "Görünüm (&V)" msgid "&Wiimote Settings" msgstr "&Wiimote Ayarları" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "&Wiki" @@ -350,7 +354,7 @@ msgstr "" msgid "" msgstr "<Çözünürlük bulunamadı>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "" @@ -359,7 +363,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" @@ -415,13 +419,13 @@ msgstr "" "\n" "TCP bağlantı noktanızı barındırıcıya yönlendirmelisiniz!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "AR Kodları" @@ -433,11 +437,11 @@ msgstr "Dolphin Hakkında" msgid "Acceleration" msgstr "Hızlandırma" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "Doğruluk:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Doğru VBeam Emülasyonu" @@ -553,11 +557,11 @@ msgstr "Dönüştürücü:" msgid "Add" msgstr "Ekle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "Action Replay Kodu Ekle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "Yama Ekle" @@ -565,6 +569,7 @@ msgstr "Yama Ekle" msgid "Add new pane" msgstr "Bölme ekle" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -580,6 +585,11 @@ msgstr "Bölme ekle" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Ekle..." @@ -629,11 +639,11 @@ msgstr "" "Düğmeleri etkinleştirmek için gerekli olan analog denetim basıncını " "ayarlayın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "Gelişmiş" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Gelişmiş Ayarlar" @@ -641,14 +651,15 @@ msgstr "Gelişmiş Ayarlar" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "Tüm GC/Wii dosyaları (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "Tüm GC/Wii kalıpları (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "Tüm GameCube GCM Dosyaları (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -661,18 +672,22 @@ msgstr "Tüm GameCube GCM Dosyaları (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Tüm Kayıtlı Oyunlar (sav,s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "Tüm Wii kalıpları (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Tüm sıkıştırılan GC/Wii kalıpları (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "Tüm dosyalar (*.*)|*.*" @@ -688,7 +703,7 @@ msgstr "" "\n" "Emin değilseniz, işaretsiz bırakın." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Alternate Wiimote Timing" msgstr "Alternatif Wiimote Zamanlaması" @@ -708,7 +723,7 @@ msgstr "Apploader boyutu yanlış. Bu gerçekten bir apploader mı?" msgid "Apploader unable to load from file" msgstr "Apploader dosyadan yüklenemiyor." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Apploader:" @@ -726,7 +741,7 @@ msgstr "" "\n" "Emin değilseniz, kapalı seçin." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Arapça" @@ -735,7 +750,7 @@ msgstr "Arapça" msgid "Are you sure you want to delete \"%s\"?" msgstr "\"%s\" dosyasını silmek istiyor musunuz?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -743,12 +758,13 @@ msgstr "" "Bu dosyaları gerçekten silmek istiyor musunuz?\n" "Silindikten sonra bu dosyaları geri döndüremezsiniz!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Bu dosyayı gerçekten silmek istiyor musunuz? Silindikten sonra bu dosyaları " "geri döndüremezsiniz!" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -758,6 +774,9 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "En-boy Oranı:" @@ -766,18 +785,20 @@ msgstr "En-boy Oranı:" msgid "At least one pane must remain open." msgstr "En az bir bölme açık kalmalıdır." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Ses" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Ses Çözücüsü:" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: AO sürücüyü açarken hata.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -787,6 +808,9 @@ msgstr "AudioCommon: AO sürücüyü açarken hata.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Otomatik" @@ -829,7 +853,7 @@ msgstr "" msgid "Back" msgstr "Geri" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Çözücü Ayarları" @@ -856,11 +880,11 @@ msgstr "Kötü Dosya Başı" msgid "Banner" msgstr "Afiş" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "Afiş Ayrıntıları" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "Afiş:" @@ -872,7 +896,7 @@ msgstr "Çubuk" msgid "Basic" msgstr "Temel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Temel Ayarlar" @@ -903,6 +927,7 @@ msgstr "Mavi Sağ" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -910,6 +935,9 @@ msgstr "Mavi Sağ" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Alt" @@ -918,7 +946,7 @@ msgstr "Alt" msgid "Bound Controls: %lu" msgstr "Bağlı Denetimler: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "Bozuk" @@ -934,7 +962,7 @@ msgstr "Eklemek için bir klasöre gözat" msgid "Browse for an ISO directory..." msgstr "Bir kalıp konumu için gözat..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "Çıkış klasörü için gözat" @@ -964,11 +992,11 @@ msgstr "C Çubuğu" msgid "C-Stick" msgstr "C Çubuğu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "CPU Emülatör Motoru" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Cache Display Lists" msgstr "Görüntü Listelerini Önbellekle" @@ -1019,7 +1047,7 @@ msgstr "%s açılamadı." msgid "Cannot unregister events with events pending" msgstr "Bekleyen olaylardan dolayı olaylar kayıttan kaldırılamıyor." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1030,7 +1058,7 @@ msgstr "" "%s\n" "Geçerli bir Gamecube hafıza kartı dosyası değil." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1048,8 +1076,6 @@ msgstr "BD ile WiiMote bulunamadı: %02x:%02x:%02x:%02x:%02x:%02x" msgid "Cant find WiiMote by connection handle %02x" msgstr "Sap bağlantısı ile Wiimote bulunamadı: %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1059,7 +1085,7 @@ msgstr "DVD Eklentisinden okunamıyor - DVD-Arabirimi : Önemli Hata" msgid "Caps Lock" msgstr "Büyük Harf Kilidi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "Katalanca" @@ -1084,7 +1110,7 @@ msgstr "Diski Değiştir" msgid "Change Game" msgstr "Oyunu Değiştir" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1100,8 +1126,8 @@ msgstr "zFar Parametresinin işaretini değiştirir (düzeltme sonrası)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "zNear Parametresinin işaretini değiştirir (düzeltme sonrası)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "" "Emülatör çalışırken değiştirirseniz herhangi bir etkisini göremezsiniz!" @@ -1122,31 +1148,31 @@ msgstr "Hile Arama" msgid "Cheats Manager" msgstr "Hile Yöneticisi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Çince (Basit)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Çince (Geleneksel)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "DVD kök dizinini seçin:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "NAND kök dizinini seçin:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Varsayılan kalıbı seçin:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "Eklemek için bir konum seçin" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "Açmak için bir dosya seçin" @@ -1154,7 +1180,7 @@ msgstr "Açmak için bir dosya seçin" msgid "Choose a memory card:" msgstr "Bir hafıza kartı seçin:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1162,8 +1188,8 @@ msgstr "" "Apploader olarak bir dosya seçin: (Sadece konumlardan yapılan disklere " "uygulanır)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Genişletmek için bir klasör seçin" @@ -1175,14 +1201,14 @@ msgstr "Çember Çubuk" msgid "Classic" msgstr "Klasik" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "Temizle" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "Temizleme başarısız." @@ -1198,6 +1224,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 @@ -1206,6 +1233,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Kapat" @@ -1229,20 +1260,20 @@ msgstr "Komut" msgid "Comment" msgstr "Yorum" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "Yorum:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "Kalıbı sıkıştır..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "Seçili kalıpları sıkıştır..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "Kalıp sıkıştırılıyor..." @@ -1269,13 +1300,13 @@ msgstr "Kolları Yapılandır" msgid "Configure..." msgstr "Yapılandır..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "Dosyanın Üzerine Yazmaya İzin Ver" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "Durdurma Onayı İste" @@ -1284,7 +1315,7 @@ msgstr "Durdurma Onayı İste" msgid "Connect" msgstr "Bağlan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "USB Klavye Bağla" @@ -1341,12 +1372,12 @@ msgstr "GCI'ya dönüştür" msgid "Copy failed" msgstr "Kopyalama başarısız." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "Hafıza kartı %c 'ye kopyala" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "Çekirdek" @@ -1376,7 +1407,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Kalıp dosyası %s tanınamadı." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "%s kaydedilemedi." @@ -1389,7 +1420,7 @@ msgstr "" "Kollar ayarlanamadı. Oyuncu ayrıldı veya oyun şu anda çalışıyor! \n" "(Oyunlar çalışırken kolların ayarlanması henüz desteklenmemektedir)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1401,7 +1432,7 @@ msgstr "" "\n" "Dolphin'i bir CD/DVD'den çalıştırıyorsunuz veya kayıt dosyası yazma korumalı." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "Uzantı 'ini' için açma komutu bulunamadı." @@ -1418,7 +1449,7 @@ msgstr "" msgid "Count:" msgstr "Sayı:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "Ülke:" @@ -1432,28 +1463,28 @@ msgstr "AR Kodu Oluştur" msgid "Create new perspective" msgstr "Yeni perspektif oluştur" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "KDE-Look.org tarafından oluşturulmuştur." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com] tarafından " "oluşturulmuştur." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "VistaIcons.com tarafından oluşturulmuştur." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" "black_rider tarafından oluşturulup ForumW.org > Web Developments 'da " "yayınlanmıştır." -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "Oluşturan:" @@ -1461,7 +1492,7 @@ msgstr "Oluşturan:" msgid "Critical" msgstr "Önemli" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "Kırp" @@ -1485,7 +1516,7 @@ msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "" "wx Dosya Seçiciden sonra şu anki konum %s 'den %s 'ye değiştirilmiştir." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "Özel Görüntüleme Hilesi" @@ -1493,11 +1524,11 @@ msgstr "Özel Görüntüleme Hilesi" msgid "Custom Projection Hack Settings" msgstr "Özel Görüntüleme Hilesi Ayarları" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "Bazı ortografik projeksiyon parametrelerini özelleştir." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Çekçe" @@ -1509,10 +1540,11 @@ msgstr "Yön Tuşları" msgid "DSP" msgstr "Ses" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "Ses Emülatörü Motoru" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1523,18 +1555,22 @@ msgstr "Ses Emülatörü Motoru" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE Emülasyonu (Hızlı)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE Yorumlayıcı (Çok Yavaş)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 msgid "DSP LLE on Thread" msgstr "İşlem Birimi Üzerinde DSP LLE" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP LLE Yeniden Derleyici" @@ -1542,15 +1578,23 @@ msgstr "DSP LLE Yeniden Derleyici" msgid "DSP settings" msgstr "Ses ayarları" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "DVD Kök Dizini:" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "Veri Boyutu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "Tarih:" @@ -1571,7 +1615,7 @@ msgstr "Ölü Bölge" msgid "Debug" msgstr "Hata ayıklama" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 msgid "Debugging" msgstr "Hata ayıklama" @@ -1579,16 +1623,16 @@ msgstr "Hata ayıklama" msgid "Decimal" msgstr "Onluk taban" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "Kalıbı genişlet..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "Seçili kalıpları genişlet..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "Kalıp genişletiliyor..." @@ -1596,11 +1640,11 @@ msgstr "Kalıp genişletiliyor..." msgid "Default" msgstr "Varsayılan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "Varsayılan kalıp:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "Varsayılan yazı tipi" @@ -1609,7 +1653,7 @@ msgstr "Varsayılan yazı tipi" msgid "Delete" msgstr "Sil" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "Kaydı sil" @@ -1618,7 +1662,7 @@ msgstr "Kaydı sil" msgid "Delete the existing file '%s'?" msgstr "'%s' dosyasını silmek istediğinizden emin misiniz?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 msgid "Description" msgstr "Açıklama" @@ -1626,8 +1670,8 @@ msgstr "Açıklama" msgid "Detect" msgstr "Belirle" -#: 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 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." @@ -1639,8 +1683,8 @@ msgstr "" msgid "Device" msgstr "Sürücü" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Sürücü Ayarları" @@ -1665,23 +1709,23 @@ msgstr "" "ve konum yedeği doğrulama da başarısız." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Disable" msgstr "İptal et" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "Sisi İptal Et" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "Işıklandırmayı İptal Et" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "Disable Per-Pixel Depth" msgstr "Piksel Derinliğini İptal Et" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "Dokuları İptal Et" @@ -1725,7 +1769,7 @@ msgstr "" "\n" "Emin değilseniz, işaretsiz bırakın." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "Disk" @@ -1752,6 +1796,7 @@ msgstr "" msgid "Divide" msgstr "Böl" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1761,10 +1806,13 @@ msgstr "Böl" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Emülasyonu durdurmak istiyor musunuz?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1789,6 +1837,7 @@ msgstr "Dolphin Taklit Wiimote Yapılandırması" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1813,6 +1862,14 @@ msgstr "Dolphin GC Kolu Yapılandırması" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GC Kolu Yapılandırması" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Filmleri (*.dtm)" @@ -1845,11 +1902,11 @@ msgstr "" msgid "Down" msgstr "Aşağı" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "Kodları İndir (WiiRD Veritabanı)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "%lu kod indirildi. (%lu eklendi.)" @@ -1858,23 +1915,23 @@ msgstr "%lu kod indirildi. (%lu eklendi.)" msgid "Drums" msgstr "Davullar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "Kukla" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "Sesi Dök" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "EFB Hedef Dökümü" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "Kareleri Dök" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "Dokuları Dök" @@ -1909,6 +1966,7 @@ msgstr "" "\n" "Emin değilseniz, işaretsiz bırakın." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1924,6 +1982,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Flemenkçe" @@ -1947,7 +2010,7 @@ msgstr "" "azından %d.%d sürümü olmalıdır. --- Eğer Dolphin'i sürekli güncelliyorsanız, " "Windows'un sürücüyü görmesi için yeniden başlatma gerekebilir." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "AVRUPA" @@ -1963,7 +2026,7 @@ msgstr "Düzen" msgid "Edit ActionReplay Code" msgstr "Action Replay Kodunu Düzenle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Yapılandırmayı Düzenle" @@ -1975,8 +2038,8 @@ msgstr "Yamayı Düzenle" msgid "Edit current perspective" msgstr "Şu anki perspektifi düzenle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "Düzenle..." @@ -2026,7 +2089,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "Taklit Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "Emülasyon Durumu:" @@ -2054,18 +2117,15 @@ msgstr "" msgid "Enable AR Logging" msgstr "AR Geçmişine İzin Ver" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "Ses Hızlandırmasına İzin Ver" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "BAT'a İzin Ver" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Blok Birleşimine İzin Ver" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 @@ -2076,6 +2136,9 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "Sınırlayıcı Kutu Hesaplama'yı Etkinleştir" @@ -2084,6 +2147,7 @@ msgstr "Sınırlayıcı Kutu Hesaplama'yı Etkinleştir" msgid "Enable Cache" msgstr "Ön Belleğe İzin Ver" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -2093,51 +2157,54 @@ msgstr "Ön Belleğe İzin Ver" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Hilelere İzin Ver" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "DTK Müziğine İzin Ver" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Çift Çekirdeğe İzin Ver" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Çift Çekirdeğe İzin Ver (hızı artırır)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "Kısayol Tuşlarına İzin Ver" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Boşta Atlamaya İzin Ver" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Boşta Atlamaya İzin Ver (hızı artırır)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "MMU'ya İzin Ver" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "Progresif Taramaya İzin Ver" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "Ekran Koruyucusuna İzin Ver" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "Geniş Ekrana İzin Ver" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "Geniş Çerçeveye İzin Ver" @@ -2155,7 +2222,7 @@ msgstr "" "\n" "Emin değilseniz, 1x seçin." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2163,7 +2230,7 @@ msgstr "" "Disk erişimini hızlandırır. Bazı oyunlarda gereklidir. (Açık = Hızlı, Kapalı " "= Uyumlu)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "Sayfalara izin ver" @@ -2193,7 +2260,7 @@ msgstr "" "\n" "Emin değilseniz, işaretsiz bırakın." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2201,7 +2268,7 @@ msgstr "" "The Legend of Zelda: Twilight Princess oyununu hızlandırır. Diğer tüm " "oyunlarda iptal edin." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2211,7 +2278,7 @@ msgstr "" "işlevidir. Gerçekçiliği artırır ama performansı düşürür. (Açık = Uyumlu, " "Kapalı = Hızlı)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "Özel Gösterim Hilesini Etkinleştirir" @@ -2227,7 +2294,7 @@ msgstr "" "\n" "Emin değilseniz, işaretsiz bırakın." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2249,6 +2316,7 @@ msgstr "" msgid "End" msgstr "Son" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2264,6 +2332,11 @@ msgstr "Son" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "İngilizce" @@ -2294,6 +2367,7 @@ msgstr "Eşit" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "Hata" @@ -2326,11 +2400,17 @@ msgstr "" "Üzgünüz, Wii kaydında geçici hasar var." >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "Hata" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Seçili dili yüklerken hata. Sistem varsayılanlarına geri dönülüyor." -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " @@ -2342,7 +2422,7 @@ msgstr "" "yüklemesinden vazgeçiliyor..." >>>>>>> Clean up Turkish translation file. -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2376,7 +2456,7 @@ msgstr "Dolphin Emülatöründen Çık" msgid "Export Failed" msgstr "Verme başarısız." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "Dosya Ver" @@ -2389,15 +2469,15 @@ msgstr "Çekimi Ver" msgid "Export Recording..." msgstr "Çekimi Ver..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "Kaydı Ver" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "Wii Kayıtlı Oyununu Ver (Deneme Amaçlı)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "Tüm Kayıtları Ver" @@ -2413,7 +2493,7 @@ msgstr "Kaydı farklı ver..." msgid "Extension" msgstr "Uzantı" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "External Frame Buffer" msgstr "Harici Çerçeve Tamponu" @@ -2425,44 +2505,44 @@ msgstr "İlave Parametre" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "İlave Parametre sadece \"Metroid: Other M\" oyununda kullanışlıdır." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "Tüm Dosyaları Genişlet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "Apploader'i Genişlet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "DOL'ü Genişlet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "Konumu Genişlet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "Dosyayı Genişlet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "Bölüntüyü Genişlet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "%s Genişletiliyor" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "Tüm Dosyalar Genişletiliyor" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "Konum Genişletiliyor" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "Genişletiliyor..." @@ -2474,11 +2554,11 @@ msgstr "FIFO Bayt'ı" msgid "FIFO Player" msgstr "FIFO Oynatıcısı" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "FRANSA" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "FST Boyutu:" @@ -2490,11 +2570,11 @@ msgstr "Bağlantı başarısız!" msgid "Failed to Listen!!" msgstr "Dinleme başarısız!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "Kod indirme başarısız." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "%s 'ye genişletme başarısız!" @@ -2611,18 +2691,28 @@ msgstr "%s için başlık yazılamadı." msgid "Failed to write header for file %d" msgstr "%d dosyası için başlık yazılamadı." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "Hızlı" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "Hızlı MipMap'ler" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "MMU'nun hızlı sürümü. Her oyunda çalışmaz." +#: Source/Core/Core/Src/Movie.cpp:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Fifo Player" msgstr "Fifo Oynatıcısı" @@ -2631,7 +2721,7 @@ msgstr "Fifo Oynatıcısı" msgid "File Info" msgstr "Dosya Bilgisi" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "Dosya kod içermemektedir." @@ -2664,16 +2754,16 @@ msgstr "Dosya bir hafıza kartı olarak tanınamadı." msgid "File not compressed" msgstr "Dosya sıkıştırılmadı." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Bilinmeyen açma modu : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "Dosya sistemi" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Dosya türü 'ini' bilinmiyor! Açılmayacaktır!" @@ -2681,7 +2771,7 @@ msgstr "Dosya türü 'ini' bilinmiyor! Açılmayacaktır!" msgid "First Block" msgstr "İlk Blok" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "Sağlamayı Düzelt" @@ -2693,7 +2783,7 @@ msgstr "16:9 'a zorla" msgid "Force 4:3" msgstr "4:3 'e zorla" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "Konsolu NTSC-J Olmaya Zorla" @@ -2725,7 +2815,7 @@ msgstr "" "\n" "Emin değilseniz, işaretsiz bırakın." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2761,7 +2851,7 @@ msgstr "Çerçeve" msgid "Frame Advance" msgstr "Gelişmiş Çerçeveleme" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 msgid "Frame Dumps use FFV1" msgstr "Çerçeve dökümünde FFV1 kullan" @@ -2773,7 +2863,7 @@ msgstr "Çerçeve Aralığı" msgid "Frame S&kipping" msgstr "Çerçeve Atlama(&K)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Çerçeve Sınırı:" @@ -2781,10 +2871,11 @@ msgstr "Çerçeve Sınırı:" msgid "Frames To Record" msgstr "Çekilecek Çerçeveler" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "Serbest Bakış" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2800,6 +2891,11 @@ msgstr "Serbest Bakış" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Fransızca" @@ -2838,7 +2934,7 @@ msgstr "GCMic Yapılandırması" msgid "GCPad" msgstr "GC Kolu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "Oyun ID'si:" @@ -2854,15 +2950,15 @@ msgstr "Oyun çalışmıyor!" msgid "Game not found!!" msgstr "Oyun bulunamadı!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "Oyuna Özel Ayarlar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Oyun Yapılandırması" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "GameCube" @@ -2873,6 +2969,7 @@ msgstr "Gamecube Kolu Ayarları (&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2880,6 +2977,9 @@ msgstr "Gamecube Kolu Ayarları (&P)" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "GameCube Hafıza Kartları (*.raw,*.gcp)" @@ -2888,15 +2988,17 @@ msgid "Gamecube Pad settings" msgstr "GameCube Kolu Ayarları" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Gecko Kodları" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" "Gecko Kodu çalışmadı: (CT%i CST%i) (%s)\n" "(kötü bir kod veya türü henüz desteklenmiyor.)" @@ -2911,8 +3013,12 @@ msgstr "" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Genel" @@ -2921,6 +3027,7 @@ msgstr "Genel" msgid "General Settings" msgstr "Genel Ayarlar" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2936,6 +3043,11 @@ msgstr "Genel Ayarlar" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Almanca" @@ -2972,7 +3084,7 @@ msgstr "" "\n" "Emin değilseniz, işaretli bırakın." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Yunanca" @@ -3004,7 +3116,7 @@ msgstr "Hack'ler" msgid "Header checksum failed" msgstr "Başlık sağlama hatası" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "İbranice" @@ -3073,12 +3185,16 @@ msgstr "Kısayol Tuşu Yapılandırması" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Tuşlar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Macarca" @@ -3086,12 +3202,12 @@ msgstr "Macarca" msgid "Hybrid Wiimote" msgstr "Karışık Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "IOCTL_ES_GETVIEWS: Bilinmeyen biletten veri alma denemesi: %08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -3104,11 +3220,11 @@ msgstr "" "Başlık ID %016llx.\n" " Dolphin çakılacak gibi gözüküyor." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - kötü durak" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "IPL Ayarları" @@ -3124,15 +3240,15 @@ msgstr "Kızılötesi İşaretleyici" msgid "IR Sensitivity:" msgstr "Kızılötesi Hassasiyeti:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "Kalıp Ayrıntıları" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "Kalıp Konumları" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "İTALYA" @@ -3140,7 +3256,7 @@ msgstr "İTALYA" msgid "Icon" msgstr "Simge" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -3151,17 +3267,19 @@ msgstr "" "Mario oyunları tarafından kullanılır." >>>>>>> Clean up Turkish translation file. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "Saniyedeki çerçeve sayısı düzensizse, bu seçenek size yardım edebilir. (Açık " "= Uyumlu, Kapalı = Hızlı)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy 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." +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " +"Audio to throttle using the DSP (might fix audio clicks but can also cause " +"constant noise depending on the game)." msgstr "" "Eğer çerçeve sınırını oyun hızından yüksek seçerseniz (NTSC:60, PAL:50), ses " "ayarlarında Ses hızlandırmasını da iptal ederek bunu daha etkili " @@ -3199,7 +3317,7 @@ msgstr "" "\n" "Emin değilseniz, işaretsiz bırakın." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "Kayıt Al" @@ -3250,7 +3368,7 @@ msgstr "" "\n" "Emin değilseniz, işaretsiz bırakın." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "Oyun İçi" @@ -3259,7 +3377,7 @@ msgid "In-Game" msgstr "Oyun-İçi" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Bilgi" @@ -3279,7 +3397,7 @@ msgstr "Ekle" msgid "Insert Encrypted or Decrypted code here..." msgstr "Şifreli veya şifresiz kodu buraya ekleyin..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "SD Kart Ekle" @@ -3291,7 +3409,7 @@ msgstr "Adı buraya yazın..." msgid "Install WAD" msgstr "WAD Kur" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "Wii Menüsüne kur" @@ -3302,6 +3420,7 @@ msgstr "" "Kurulum Özel Durum İşleyici çağrıldı, ama bu platform henüz bunu " "desteklemiyor." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3311,14 +3430,17 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "WAD kuruluyor..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "Arabirim" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "Arabirim Ayarları" @@ -3343,11 +3465,11 @@ msgstr "İç LZO Hatası - lzo_init() başarısız." msgid "Internal Resolution:" msgstr "İç Çözünürlük:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Yorumlayıcı (Çok Yavaş)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "İntro" @@ -3364,7 +3486,7 @@ msgstr "Hatalı Değer!" msgid "Invalid bat.map or dir entry" msgstr "Hatalı bat.map veya konum girişi" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "Hatalı olay türü: %i" @@ -3384,14 +3506,15 @@ msgstr "" "%s\n" "Oyunu yeniden dökmeniz gerekebilir." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "Hatalı çekim dosyası" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "Hatalı durum" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3407,27 +3530,32 @@ msgstr "Hatalı durum" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "İtalyanca" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "JAPONYA" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT Yeniden Derleyici (önerilen)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL Deneysel Yeniden Derleyici" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japonca" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "KORE" @@ -3436,8 +3564,8 @@ msgstr "KORE" msgid "Key" msgstr "Tuş" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Korece" @@ -3455,7 +3583,7 @@ msgstr "L Düğmesi" msgid "L-Analog" msgstr "L Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "Dil:" @@ -3508,7 +3636,7 @@ msgstr "" msgid "Less Than" msgstr "Daha Az" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "FPS Sınırlaması" @@ -3516,7 +3644,7 @@ msgstr "FPS Sınırlaması" msgid "Load" msgstr "Yükle" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 msgid "Load Custom Textures" msgstr "Özel Dokuları Yükle" @@ -3564,6 +3692,7 @@ msgstr "Durumu Yükle : 8" msgid "Load State..." msgstr "Durumu Yükle..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3585,6 +3714,13 @@ msgstr "Wii Sistem Menüsünü Yükle" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +msgid "Load Wii System Menu" +msgstr "Wii Sistem Menüsünü Yükle" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii Sistem Menüsünü Yükle %d%c" @@ -3611,7 +3747,7 @@ msgstr "Belirtilen dosyayı yükler (DOL,ELF,WAD,GCM,ISO)" msgid "Local" msgstr "Yerel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "İşlem Birimlerini Çekirdeklere Kilitle" @@ -3623,11 +3759,11 @@ msgstr "Geçmiş" msgid "Log Configuration" msgstr "Geçmiş Yapılandırması" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Geçmiş Türü" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Geçmiş Çıkışı" @@ -3657,7 +3793,7 @@ msgstr "" "MD5 eşleşmiyor\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU Hız Hilesi" @@ -3679,11 +3815,11 @@ msgstr "MadCatz Gameshark dosyaları(*.gcs)" msgid "Main Stick" msgstr "Ana Çubuk" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "Yapımcı ID'si:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "Yapımcı:" @@ -3707,6 +3843,7 @@ msgstr "Hafıza Baytı" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3714,6 +3851,9 @@ msgstr "Hafıza Baytı" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Hafıza Kartı" @@ -3750,7 +3890,7 @@ msgstr "Hafıza kartı dosya boyutu başlık boyutuyla eşleşmiyor" msgid "Menu" msgstr "Menü" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "Mikrofon" @@ -3759,11 +3899,11 @@ msgstr "Mikrofon" msgid "Min" msgstr "En az" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "Çeşitli" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Çeşitli Ayarlar" @@ -3784,7 +3924,7 @@ msgstr "" "\n" "Emin değilseniz, işaretsiz bırakın." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "Boşluklu yazı" @@ -3797,7 +3937,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3819,7 +3959,7 @@ msgstr "" msgid "Multiply" msgstr "Çarp" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3911,6 +4051,7 @@ msgstr "NP Sekme" msgid "NP Up" msgstr "NP Yukarı" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3920,6 +4061,9 @@ msgstr "NP Yukarı" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3928,7 +4072,7 @@ msgstr "İsim:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "İsim:" @@ -3942,7 +4086,7 @@ msgid "New Scan" msgstr "Yeni Tarama" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "Sonraki Sayfa" @@ -3954,7 +4098,7 @@ msgstr "Sonraki Tarama" msgid "Nickname :" msgstr "Takma Ad :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "Ülke Yok (SDK)" @@ -3993,7 +4137,7 @@ msgstr "Başlık %s için kayıt klasörü bulunamadı" msgid "None" msgstr "Hiçbiri" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Norveççe (Bokmaal Lehçesi)" @@ -4001,8 +4145,8 @@ msgstr "Norveççe (Bokmaal Lehçesi)" msgid "Not Equal" msgstr "Eşit Değil" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "Ayarlanmamış" @@ -4022,7 +4166,7 @@ msgstr "Bağlı değil" msgid "Notes" msgstr "Notlar" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "Notlar:" @@ -4060,7 +4204,7 @@ msgstr "Nesne" msgid "Object Range" msgstr "Nesne Aralığı" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Kapalı" @@ -4086,11 +4230,11 @@ msgstr "Sadece %d blok kullanılabilir" msgid "Open" msgstr "Aç" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "Dosya konumunu aç (&C)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "Wii kayıt kla&sörünü aç" @@ -4112,11 +4256,11 @@ msgstr "OpenAL: Ses sürücüleri bulunamıyor" msgid "OpenAL: can't open device %s" msgstr "OpenAL: Sürücü %s açılamıyor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "OpenCL Doku Çözücü" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "OpenMP Doku Çözücü" @@ -4148,7 +4292,7 @@ msgstr "" "ve kayıtları yeni bir hafıza kartına alın.\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "Diğer" @@ -4200,19 +4344,20 @@ msgstr "Paragraf" msgid "Parameters" msgstr "Parametreler" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Bölüntü %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Yamalar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Yollar" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4225,6 +4370,10 @@ msgstr "Yollar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Duraklat" @@ -4233,7 +4382,7 @@ msgstr "Duraklat" msgid "Per-Pixel Lighting" msgstr "Piksel Aydınlatması" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "Mükemmel" @@ -4246,6 +4395,7 @@ msgstr "Perspektif %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 ======= @@ -4256,6 +4406,10 @@ msgstr "Perspektif %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Oynat" @@ -4269,7 +4423,7 @@ msgstr "Çekimi Oynat" msgid "Play/Pause" msgstr "Oynat/Duraklat" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "Oynanabilir" @@ -4281,6 +4435,7 @@ msgstr "Oynatma Seçenekleri" msgid "Players" msgstr "Oyuncular" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4290,6 +4445,9 @@ msgstr "Oyuncular" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Lütfen onaylayın..." @@ -4301,23 +4459,23 @@ msgstr "Kaydetmeden önce lütfen bir perspektif oluşturun" msgid "Plus-Minus" msgstr "Artı-Eksi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Lehçe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Bağ. Nok. 1:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Bağ. Nok. 2:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Bağ. Nok. 3:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Bağ. Nok. 4:" @@ -4326,11 +4484,11 @@ msgstr "Bağ. Nok. 4:" msgid "Port :" msgstr "Bağ. Nok. :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portekizce" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portekizce (Brezilya)" @@ -4338,7 +4496,7 @@ msgstr "Portekizce (Brezilya)" msgid "Post-Processing Effect:" msgstr "Geç İşleme Etkisi:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" <<<<<<< HEAD @@ -4347,7 +4505,7 @@ msgstr "" msgstr "PlayController'da erken kayıt bitişi. %u + 8 > %u" >>>>>>> Clean up Turkish translation file. -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" <<<<<<< HEAD @@ -4356,7 +4514,7 @@ msgstr "" msgstr "PlayWiimote'da erken kayıt bitişi. %u + %d > %u" >>>>>>> Clean up Turkish translation file. -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" <<<<<<< HEAD @@ -4373,7 +4531,7 @@ msgstr "Önayarlar:" msgid "Prev Page" msgstr "Önceki Sayfa" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "Önceki Sayfa" @@ -4424,7 +4582,7 @@ msgstr "R Analog" msgid "RAM" msgstr "Anabellek" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "RUSYA" @@ -4437,7 +4595,7 @@ msgstr "Aralık" msgid "Read-only mode" msgstr "Salt Okunur Mod" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "Gerçek" @@ -4512,6 +4670,7 @@ msgstr "Listeyi Yenile" msgid "Refresh game list" msgstr "Oyun Listesini Yenile" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4530,6 +4689,12 @@ msgstr "Oyun Listesini Yenile" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Kaldır" @@ -4582,11 +4747,11 @@ msgstr "Sağ Çubuk" msgid "Rumble" msgstr "Gümbürtü" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "DSPLLE'yi ayrı işlem biriminde çalıştır (önerilmez)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Rusça" @@ -4594,10 +4759,11 @@ msgstr "Rusça" msgid "Sa&ve State" msgstr "Durumu Kaydet (&V)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "Güvenli" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4607,6 +4773,9 @@ msgstr "Güvenli" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Örnek Oran:" @@ -4664,12 +4833,12 @@ msgstr "Durumu Kaydet : 8" msgid "Save State..." msgstr "Durumu Kaydet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "Farklı kaydet..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "Sıkıştırılan GCM/ISO'yu kaydet" @@ -4677,11 +4846,11 @@ msgstr "Sıkıştırılan GCM/ISO'yu kaydet" msgid "Save current perspective" msgstr "Şu anki perspektifi kaydet" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "Genişletilen GCM/ISO'yu kaydet" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Kayıtlı durum filmi %s bozuk, film çekimi duruyor..." @@ -4690,6 +4859,7 @@ msgstr "Kayıtlı durum filmi %s bozuk, film çekimi duruyor..." msgid "Scaled EFB Copy" msgstr "Boyutlandırılmış EFB Kopyası" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4699,15 +4869,18 @@ msgstr "Boyutlandırılmış EFB Kopyası" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Taranıyor %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "Kalıplar taranıyor" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "Taranıyor..." @@ -4723,12 +4896,12 @@ msgstr "Kaydırma Kilidi" msgid "Search Filter" msgstr "Arama Filtresi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Alt Klasörleri Ara" -#: 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:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "SYSCONF içinde %s bölümü bulunamadı" @@ -4738,6 +4911,7 @@ msgstr "SYSCONF içinde %s bölümü bulunamadı" msgid "Select" msgstr "Seç" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4762,6 +4936,14 @@ msgstr "Çekim Dosyasını Seç" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "Çekim Dosyasını Seç" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Kurmak için bir Wii WAD dosyası seçin" @@ -4787,6 +4969,7 @@ msgstr "Sabit olmayan pencereyi seçin" msgid "Select the file to load" msgstr "Yüklemek için dosyayı seçin" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 @@ -4803,19 +4986,26 @@ msgstr "Yüklemek için durum seçin" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Kayıt dosyasını seçin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "Yüklemek için durum seçin" +<<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Kaydetmek için durum seçin" @@ -4837,7 +5027,7 @@ msgstr "" "\n" "Emin değilseniz, otomatik seçin." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "Seçilen yazı tipi" @@ -4885,11 +5075,11 @@ msgstr "Sensör Çubuk Konumu:" msgid "Separator" msgstr "Bölücü" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Sırpça" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4899,11 +5089,11 @@ msgstr "" msgid "Set" msgstr "Ayarla" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "Varsayılan Kalıp Olarak Ayarla (&D)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "Varsayılan Hafıza Kartı %c olarak ayarla" @@ -4913,7 +5103,7 @@ msgstr "Varsayılan Hafıza Kartı %c olarak ayarla" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "SetARCode_IsActive: Anasayfa, kod listesi boyutu %lu dan daha büyük." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "Ayarlar..." @@ -4925,7 +5115,7 @@ msgstr "SetupWiiMem: Ayar dosyası bulunamadı" msgid "Shake" msgstr "Sallama" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "Kısa İsim:" @@ -4953,7 +5143,7 @@ msgstr "Araç Çubuğunu Gös&ter" msgid "Show Drives" msgstr "Aygıtları Göster" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 msgid "Show EFB Copy Regions" msgstr "EFB Bölge Kopyalamasını Göster" @@ -4969,7 +5159,7 @@ msgstr "Fransızları Göster" msgid "Show GameCube" msgstr "GameCube'leri Göster" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "Görüntü Girişini Göster" @@ -4985,7 +5175,7 @@ msgstr "Japonları Göster" msgid "Show Korea" msgstr "Korelileri Göster" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "Gösterme Dili:" @@ -5005,7 +5195,7 @@ msgstr "Platformları Göster" msgid "Show Regions" msgstr "Bölgeleri Göster" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Show Statistics" msgstr "İstatistikleri Göster" @@ -5025,11 +5215,11 @@ msgstr "WAD'ları Göster" msgid "Show Wii" msgstr "Wii'leri Göster" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "Oyunu durdurmadan önce onay kutusu görüntüle." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 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 " @@ -5039,23 +5229,23 @@ msgstr "" "Bunu iptal ederseniz, hata mesajları almazsınız ama Dolphin çöktüğünde " "hiçbir uyarı vermeden aniden kapanır." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "İlk bloğu göster" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "Kayıt bloklarını göster" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "Kayıt yorumunu göster" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "Kayıt simgesini göster" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "Kayıt başlığını göster" @@ -5093,7 +5283,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Yatay Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Basitleştirilmiş Çince" @@ -5101,11 +5291,11 @@ msgstr "Basitleştirilmiş Çince" msgid "Size" msgstr "Boyut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "BIOS'u Geç" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 msgid "Skip Dest. Alpha Pass" msgstr "Hedef Alpha Geçişini Atla" @@ -5145,11 +5335,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Slot B" @@ -5173,7 +5363,7 @@ msgstr "" "Yazılım yorumlamasını açmayı gerçekten istiyor musunuz? Emin değilseniz, " "'Hayır' seçin." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "Ses Ayarları" @@ -5191,6 +5381,7 @@ msgstr "Ses tamponu oluşturulamadı: %s" msgid "Space" msgstr "Boşluk" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5206,6 +5397,11 @@ msgstr "Boşluk" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "İspanyolca" @@ -5237,7 +5433,7 @@ msgstr "" msgid "Specify a video backend" msgstr "Bir görüntü arka ucu belirtin" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Disk Aktarım Oranını Hızlandır" @@ -5245,7 +5441,7 @@ msgstr "Disk Aktarım Oranını Hızlandır" msgid "Square Stick" msgstr "Kare Çubuk" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "Varsayılan Denetim Aygıtı" @@ -5343,12 +5539,12 @@ msgstr "Kayıt dosyaları başarıyla alındı" msgid "Swing" msgstr "Hareket" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Sistem Dili:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "TAYVAN" @@ -5387,7 +5583,7 @@ msgstr "Tablo Sağ" msgid "Take Screenshot" msgstr "Ekran Görüntüsü Al" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" <<<<<<< HEAD msgstr "" @@ -5407,7 +5603,7 @@ msgstr "Doku" msgid "Texture Cache" msgstr "Doku Ön Belleği" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" msgstr "Doku Biçimi Kaplaması" @@ -5423,13 +5619,13 @@ msgstr "Adres geçersiz" msgid "The checksum was successfully fixed" msgstr "Sağlama başarıyla düzeltildi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "Seçilen konum zaten listede" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5452,7 +5648,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "Dosya %s zaten açık, dosya başlığı yazılmayacaktır." -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Belirtilen dosya (%s) bulunamadı" @@ -5470,11 +5666,12 @@ msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "Ortaya çıkan şifresi çözülmüş AR kodu herhangi bir satır içermiyor." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#, fuzzy msgid "" "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." +"If unsure, use the rightmost value." msgstr "" "Bunu güvenli bir şekilde ayarlamanız, emülatörün RAM'den doku güncellemesi " "kaybetme oranını azaltacaktır. \n" @@ -5518,7 +5715,7 @@ msgstr "Belirtilen dosya \"%s\" bulunamadı" msgid "The value is invalid" msgstr "Değer hatalı" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Tema" @@ -5526,7 +5723,7 @@ msgstr "Tema" msgid "Theme selection went wrong" msgstr "Tema seçiminde hata" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5534,7 +5731,7 @@ msgstr "" "Burada 00000001/00000002 için bir bilet olmalıdır. NAND dökümünüz " "tamamlanmamış olabilir." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5549,7 +5746,7 @@ msgid "" msgstr "" "Bu Action Replay simülatörü, kodların kendisini düzenlemesini desteklemiyor." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "Bu Wii Menüsünde ve bazı oyunlarda yavaşlamaya neden olabilir." @@ -5572,25 +5769,10 @@ msgstr "" "Emin değilseniz, işaretsiz bırakın." #: 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" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" -"Bu seçenek oyun hızının sesle denetlenmesini sağlar. \n" -"İptal ederseniz oyun hızında anormallik olabilir,mesela oyun çok hızlı " -"çalışabilir. \n" -"Ama bazen bunu işaretlemek gürültüye neden olabilir. \n" -"\n" -"Klavye Kısayolu : Hızlandırmayı anında iptal etmek için basılı tutun." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "Arka plan müziklerini oynatmak için kullanılır." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5602,7 +5784,7 @@ msgstr "" "Bilgisayarınızda çift çekirdek varsa hızınızı büyük oranda artırır,ama bazı " "çökme ve hatalara neden olabilir." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "INI Yapılandırma dosyasını elle düzenlemeye izin verir." @@ -5625,7 +5807,7 @@ msgstr "Başlık" msgid "To" msgstr "Buraya" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "Tüm Geçmiş Türlerini Seç" @@ -5645,6 +5827,7 @@ msgstr "Tam Ekran Moduna Geç" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5652,14 +5835,17 @@ msgstr "Tam Ekran Moduna Geç" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Üst" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Geleneksel Çince" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "Bilinmeyen bir dosya türünü yüklemeyi denedi." @@ -5667,7 +5853,7 @@ msgstr "Bilinmeyen bir dosya türünü yüklemeyi denedi." msgid "Triggers" msgstr "Tetikler" -#: Source/Core/Common/Src/SysConf.h:92 Source/Core/Common/Src/SysConf.h:115 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Geçersiz SYSCONF'tan okumayı deniyor" @@ -5679,7 +5865,7 @@ msgstr "" "Geçersiz SYSCONF'tan okumayı deniyor\n" "Wiimote BT ID'leri mevcut değil" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Türkçe" @@ -5700,11 +5886,11 @@ msgstr "UDP Bağ.Nok.:" msgid "UDP Wiimote" msgstr "UDP Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "BİLİNMEYEN" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "AMERİKA" @@ -5789,7 +5975,7 @@ msgstr "Güncelle" msgid "Upright Wiimote" msgstr "Dik Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 Modunu Kullan (PAL60)" @@ -5801,7 +5987,7 @@ msgstr "Tam Ekran Kullan" msgid "Use Hex" msgstr "HEX Kullan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Önemli Hataları Bildir" @@ -5831,7 +6017,7 @@ msgstr "" "\n" "Emin değilseniz, işaretsiz bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "Gereçler" @@ -5855,25 +6041,29 @@ msgstr "Değer:" msgid "Verbosity" msgstr "Duyuru/Hata/Uyarı" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "Görüntü" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "Sanal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Ses" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "WAD kurulumu başarısız: %s oluşturmada hata" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "WAD kurulumu başarısız: %s oluşturmada hata" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5892,15 +6082,15 @@ msgstr "" msgid "Warning" msgstr "Uyarı" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "Uyarı - DOL yanlış konsol modunda başlatılıyor!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Uyarı - ELF yanlış konsol modunda başlatılıyor!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Uyarı - Kalıp yanlış konsol modunda başlatılıyor!" @@ -5929,7 +6119,7 @@ msgstr "" "ve hafıza kartınızdaki dosyayla aynı adda olacak.\n" "Devam?" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5944,7 +6134,7 @@ msgstr "" "taktirde, büyük bir ihtimalle, senkronizasyon sorunu yaşayacaksınız." >>>>>>> Clean up Turkish translation file. -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5959,7 +6149,7 @@ msgstr "" "senkronizasyon sorunu yaşayacaksınız." >>>>>>> Clean up Turkish translation file. -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -6005,7 +6195,7 @@ msgstr "WaveFileWriter - dosya açılamadı." msgid "Whammy" msgstr "Darbe" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "Geniş Ekran Hilesi" @@ -6013,15 +6203,15 @@ msgstr "Geniş Ekran Hilesi" msgid "Width" msgstr "Genişlik" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Wii Konsolu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Wii NAND Kök Dizini:" @@ -6029,6 +6219,7 @@ msgstr "Wii NAND Kök Dizini:" msgid "Wii Save Import" msgstr "Wii Kaydı Al" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -6038,6 +6229,9 @@ msgstr "Wii Kaydı Al" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii kayıt dosyaları (*.bin)|*.bin" @@ -6104,10 +6298,11 @@ msgstr "Pencere Menüsü" msgid "Windows Right" msgstr "Pencereleri Sağa Döşe" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "Heceleme" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -6123,6 +6318,11 @@ msgstr "Heceleme" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Clean up Turkish translation file. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Çalışıyor..." @@ -6130,6 +6330,11 @@ msgstr "Çalışıyor..." msgid "Write to Console" msgstr "Konsola Yaz" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "Dosyaya Yaz" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "Dosyaya Yaz" @@ -6185,7 +6390,7 @@ msgstr "Doğru bir sekizlik,onluk veya onaltılık değer girmelisiniz." msgid "You must enter a valid profile name." msgstr "Geçerli bir profil ismi girmelisiniz." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Değişikliğin etkili olması için Dolphin'i yeniden başlatmalısınız." @@ -6208,7 +6413,7 @@ msgstr "" "0x%04x olmalıdır (sizinki: 0x%04llx) \n" "Yenisini oluşturmak ister misiniz?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "ZTP Hilesi" @@ -6278,7 +6483,7 @@ msgstr "" msgid "^ ADD" msgstr "^ EKLE" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -6309,12 +6514,12 @@ msgstr "Bir Wii kaydı değil veya bu başlık boyutu için okuma hatası: %x" msgid "s" msgstr "s" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "Bilinmeyen komut 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute uygulama çalışırken -1'e düştü!" @@ -6551,6 +6756,9 @@ msgstr "| VEYA" #~ msgid "Emulator Display Settings" #~ msgstr "Emülatör Görüntü Ayarları" +#~ msgid "Enable Audio Throttle" +#~ msgstr "Ses Hızlandırmasına İzin Ver" + #, fuzzy #~ msgid "Enable CPU Access" #~ msgstr "Ön Belleğe İzin Ver" @@ -6614,6 +6822,13 @@ msgstr "| VEYA" #~ msgid "Error allocating buffer" #~ msgstr "Tampon ayırma hatası" +#~ msgid "" +#~ "Error in PlayWiimote. %u != %u, byte %d.\n" +#~ "Sorry, Wii recording is temporarily broken." +#~ msgstr "" +#~ "PlayWiimote'da hata. %u != %u, byte %d.\n" +#~ "Üzgünüz, Wii kaydında geçici hasar var." + #~ msgid "Error loading %s: can't read info" #~ msgstr "%s yüklenirken hata: Bilgi okunamıyor." @@ -6912,6 +7127,20 @@ msgstr "| VEYA" #~ msgid "The file " #~ msgstr "Dosya" +#~ msgid "" +#~ "This is used to control game speed by sound throttle.\n" +#~ "Disabling this could cause abnormal game speed, such as too fast.\n" +#~ "But sometimes enabling this could cause constant noise.\n" +#~ "\n" +#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." +#~ msgstr "" +#~ "Bu seçenek oyun hızının sesle denetlenmesini sağlar. \n" +#~ "İptal ederseniz oyun hızında anormallik olabilir,mesela oyun çok hızlı " +#~ "çalışabilir. \n" +#~ "Ama bazen bunu işaretlemek gürültüye neden olabilir. \n" +#~ "\n" +#~ "Klavye Kısayolu : Hızlandırmayı anında iptal etmek için basılı tutun." + #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "Ses efektlerini oynatmak için kullanılır." diff --git a/Languages/po/zh_CN.po b/Languages/po/zh_CN.po index 4a55b8ea04..f7bb9c4575 100644 --- a/Languages/po/zh_CN.po +++ b/Languages/po/zh_CN.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -16,6 +17,9 @@ msgstr "" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Update from master branch. +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-01-09 13:55-0800\n" "Last-Translator: thegfw \n" "Language-Team: \n" @@ -57,9 +61,9 @@ msgstr "\"%s\" 不是一个有效的 GCM/ISO 文件, 或者不是一个 GC/Wii msgid "%1$sCopy%1$s" msgstr "%1$s复制%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -151,7 +155,7 @@ msgstr "%s导出 GCI%s" msgid "%sImport GCI%s" msgstr "%s导入 GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u 空闲区块; %u 空闲目录项目" @@ -184,11 +188,11 @@ msgstr "作弊码管理器(&C)" msgid "&DSP Settings" msgstr "音频设置(&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "删除镜像(&D)..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "删除所选镜像(&D)" @@ -252,7 +256,7 @@ msgstr "暂停游戏(&P)" msgid "&Play" msgstr "开始游戏(&P)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "属性(&P)" @@ -296,7 +300,7 @@ msgstr "视图(&V)" msgid "&Wiimote Settings" msgstr "&Wiimote 设置" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "百科(&W)" @@ -340,7 +344,7 @@ msgstr "<在这里插入名称>" msgid "" msgstr "<未找到分辨率>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "<无>" @@ -349,7 +353,7 @@ msgstr "<无>" msgid "" msgstr "<按任意键>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "<系统>" @@ -405,13 +409,13 @@ msgstr "" "\n" "You must forward TCP port to host!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "AM-基板" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "动作回放代码" @@ -423,11 +427,11 @@ msgstr "关于 Dolphin" msgid "Acceleration" msgstr "加速器" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "精确脉冲染料激光模拟" @@ -532,11 +536,11 @@ msgstr "适配器:" msgid "Add" msgstr "添加" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "添加动作回放代码" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "添加补丁" @@ -544,6 +548,7 @@ msgstr "添加补丁" msgid "Add new pane" msgstr "添加新面板" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -559,6 +564,11 @@ msgstr "添加新面板" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "添加..." @@ -592,11 +602,11 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "调整摇杆控制需要活动的按钮." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "高级" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "高级设置" @@ -604,14 +614,15 @@ msgstr "高级设置" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "所有 GC/Wii 文件 (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "所有 GC/Wii 镜像 (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "所有 Gamecube GCM 文件 (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -624,18 +635,22 @@ msgstr "所有 Gamecube GCM 文件 (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "所有存档状态 (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "所有 Wii 镜像文件 (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "所有压缩的 GC/Wii 镜像文件 (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "所有文件 (*.*)|*.*" @@ -647,7 +662,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "模拟 Wiimote" @@ -668,7 +683,7 @@ msgstr "应用程序载入器大小错误...这真是一个应用程序载入器 msgid "Apploader unable to load from file" msgstr "应用程序载入器不能从文件载入" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "应用载入器:" @@ -683,7 +698,7 @@ msgid "" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "" @@ -692,7 +707,7 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "您确定要删除 \"%s\" ?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -700,10 +715,11 @@ msgstr "" "请确认真的要删除这些文件?\n" "这将是永久性的删除!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "请确认真的要删除这些文件?这将是永久性的删除!" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -713,6 +729,9 @@ msgstr "请确认真的要删除这些文件?这将是永久性的删除!" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "高宽比:" @@ -721,18 +740,20 @@ msgstr "高宽比:" msgid "At least one pane must remain open." msgstr "必须有一个窗口保持打开" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "音频" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "音频后端:" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: 打开 AO 设备错误.\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -742,6 +763,9 @@ msgstr "AudioCommon: 打开 AO 设备错误.\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "自动" @@ -780,7 +804,7 @@ msgstr "" msgid "Back" msgstr "Back" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "后端设置" @@ -808,11 +832,11 @@ msgstr "无效文件头" msgid "Banner" msgstr "标志" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "标志详细信息" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "标志:" @@ -824,7 +848,7 @@ msgstr "Bar" msgid "Basic" msgstr "基本" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "基本 设置" @@ -855,6 +879,7 @@ msgstr "蓝 右" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -862,6 +887,9 @@ msgstr "蓝 右" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "底部" @@ -870,7 +898,7 @@ msgstr "底部" msgid "Bound Controls: %lu" msgstr "绑定控制器: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "损坏" @@ -886,7 +914,7 @@ msgstr "浏览要添加的目录" msgid "Browse for an ISO directory..." msgstr "浏览镜像目录" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "浏览输出目录" @@ -917,11 +945,11 @@ msgstr "C-摇杆" msgid "C-Stick" msgstr "C-摇杆" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "CPU 模拟引擎" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 #, fuzzy msgid "Cache Display Lists" msgstr "启用显示列表缓存" @@ -961,7 +989,7 @@ msgstr "不能打开 %s" msgid "Cannot unregister events with events pending" msgstr "事件未决时不能反注册事件" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -971,7 +999,7 @@ msgstr "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -989,8 +1017,6 @@ msgstr "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgid "Cant find WiiMote by connection handle %02x" msgstr "不能按照连接句柄 %02x 找到 WiiMote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1000,7 +1026,7 @@ msgstr "不能从 DVD插件 - DVD接口读取数据: 严重错误" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "" @@ -1025,7 +1051,7 @@ msgstr "切换光盘" msgid "Change Game" msgstr "切换游戏" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1041,8 +1067,8 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "Changing this will have no effect while the emulator is running!" @@ -1062,32 +1088,32 @@ msgstr "作弊码搜索" msgid "Cheats Manager" msgstr "金手指管理" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "简体中文" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "繁体中文" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "选择一个DVD根目录" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 #, fuzzy msgid "Choose a NAND root directory:" msgstr "选择一个DVD根目录" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "选择一个默认镜像" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "选择一个要添加的目录" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "选择要打开的文件" @@ -1095,7 +1121,7 @@ msgstr "选择要打开的文件" msgid "Choose a memory card:" msgstr "选择一个内存卡" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1103,8 +1129,8 @@ msgstr "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:768 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:807 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "选择解压缩到的文件夹" @@ -1116,14 +1142,14 @@ msgstr "Circle Stick" msgid "Classic" msgstr "经典" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "清除" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "清除失败" @@ -1139,6 +1165,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 @@ -1147,6 +1174,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "关闭" @@ -1170,20 +1201,20 @@ msgstr "命令" msgid "Comment" msgstr "注释" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "注释:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "压缩镜像..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "压缩所选镜像..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "压缩镜像中" @@ -1210,13 +1241,13 @@ msgstr "设置手柄" msgid "Configure..." msgstr "设置..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "确认文件覆盖" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 #, fuzzy msgid "Confirm on Stop" msgstr "停止时确认" @@ -1226,7 +1257,7 @@ msgstr "停止时确认" msgid "Connect" msgstr "连接" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "连接 USB 键盘" @@ -1283,12 +1314,12 @@ msgstr "转换到 GCI" msgid "Copy failed" msgstr "复制失败" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "复制到内存卡 %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "核心" @@ -1318,7 +1349,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "不能识别 ISO 文件 %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "不能保存 %s" @@ -1331,7 +1362,7 @@ msgstr "" "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)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1343,7 +1374,7 @@ msgstr "" "\n" "您是不是在CD/DVD上运行的Dolphin?或者存档文件带有写入保护?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "Couldn't find open command for extension 'ini'!" @@ -1360,7 +1391,7 @@ msgstr "" msgid "Count:" msgstr "数量:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "国家:" @@ -1374,25 +1405,25 @@ msgstr "创建动作回放代码" msgid "Create new perspective" msgstr "创建新布局" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "Created by KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "Created by VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "Created by black_rider and published on ForumW.org > Web Developments" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "创建者:" @@ -1400,7 +1431,7 @@ msgstr "创建者:" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "裁切" @@ -1420,7 +1451,7 @@ msgstr "淡入淡出" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Current dir changed from %s to %s after wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "自定义投影修正" @@ -1428,11 +1459,11 @@ msgstr "自定义投影修正" msgid "Custom Projection Hack Settings" msgstr "自定义投影修正设置" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "自定义一些正交投影参数" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "捷克语" @@ -1444,10 +1475,11 @@ msgstr "D-Pad" msgid "DSP" msgstr "DSP音频" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "音频模拟引擎" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1458,19 +1490,23 @@ msgstr "音频模拟引擎" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "音频 HLE 模拟(很快)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "音频 LLE 解释(很慢)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 #, fuzzy msgid "DSP LLE on Thread" msgstr "DSP LLE 于线程" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "音频 LLE 重编译器" @@ -1478,15 +1514,23 @@ msgstr "音频 LLE 重编译器" msgid "DSP settings" msgstr "音频设置" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "DVD 根目录:" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "数据大小" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "日期:" @@ -1507,7 +1551,7 @@ msgstr "死区" msgid "Debug" msgstr "调试" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 #, fuzzy msgid "Debugging" msgstr "调试" @@ -1516,16 +1560,16 @@ msgstr "调试" msgid "Decimal" msgstr "十进制" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "解压缩镜像中..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "解压缩所选镜像..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "解压缩镜像中" @@ -1533,11 +1577,11 @@ msgstr "解压缩镜像中" msgid "Default" msgstr "默认" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "默认镜像:" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "默认字体" @@ -1546,7 +1590,7 @@ msgstr "默认字体" msgid "Delete" msgstr "删除" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "删除存档" @@ -1555,7 +1599,7 @@ msgstr "删除存档" msgid "Delete the existing file '%s'?" msgstr "删除已经存在的文件 '%s' 么?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 #, fuzzy msgid "Description" msgstr "询问" @@ -1564,8 +1608,8 @@ msgstr "询问" msgid "Detect" 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 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." @@ -1578,8 +1622,8 @@ msgstr "" msgid "Device" msgstr "设备" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "设备设置" @@ -1604,25 +1648,25 @@ msgstr "" "和目录备份校检失败" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 #, fuzzy msgid "Disable" msgstr "禁用雾化" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "禁用雾化" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "禁用光线" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 #, fuzzy msgid "Disable Per-Pixel Depth" msgstr "像素深度" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "禁用材质" @@ -1652,7 +1696,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "光盘" @@ -1677,6 +1721,7 @@ msgstr "按模拟器显示输入读取" msgid "Divide" msgstr "Divide" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1686,10 +1731,13 @@ msgstr "Divide" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "您确定是否停止当前模拟?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1715,6 +1763,7 @@ msgstr "Dolphin 模拟 Wiimote 设置" msgid "Dolphin FIFO" msgstr "Dolphin" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1739,6 +1788,14 @@ msgstr "Dolphin GC 手柄设置" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GC 手柄设置" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS 电影 (*.dtm)" @@ -1767,11 +1824,11 @@ msgstr "Dolphin 当前设置了隐藏所有游戏. 双击这里显示所有游 msgid "Down" msgstr "下" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "下载代码 (WiiRD 数据库)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "已下载 %lu 代码(已添加 %lu)" @@ -1780,23 +1837,23 @@ msgstr "已下载 %lu 代码(已添加 %lu)" msgid "Drums" msgstr "鼓" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "虚拟" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "转储音频" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "转储 EFB 目标" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "转储框架" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "转储材质" @@ -1822,6 +1879,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1837,6 +1895,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "荷兰语" @@ -1862,7 +1925,7 @@ msgstr "" "reboot is probably required at this point to get Windows to see the new " "driver." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "欧版" @@ -1878,7 +1941,7 @@ msgstr "编辑" msgid "Edit ActionReplay Code" msgstr "编辑动作回放代码" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "编辑设置" @@ -1890,8 +1953,8 @@ msgstr "编辑补丁" msgid "Edit current perspective" msgstr "编辑当前外观" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "编辑..." @@ -1930,7 +1993,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "模拟 Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "模拟器状态: " @@ -1952,23 +2015,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "启用动作回放记录" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "启用音频调节" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "启用 BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "启用区块合并" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -1982,6 +2045,7 @@ msgstr "" msgid "Enable Cache" msgstr "启用缓存" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -1991,52 +2055,55 @@ msgstr "启用缓存" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "启用作弊" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "启用 DTK 音乐" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "启用多核处理" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "启用多核处理(加速)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "启用热键" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "启用空闲步进" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "启用空闲步进(加速)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "启用 MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "启用逐行扫描" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 #, fuzzy msgid "Enable Screen Saver" msgstr "启用宽屏" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "启用宽屏" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "启用线框" @@ -2052,13 +2119,13 @@ msgstr "" "Enables anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" msgstr "启用快速光盘访问. 部分游戏需要. (ON = 快速, OFF = 兼容)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "Enable pages" @@ -2078,7 +2145,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2086,7 +2153,7 @@ msgstr "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2096,7 +2163,7 @@ msgstr "" "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " "Fast)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "启用自定义投影修正" @@ -2108,7 +2175,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2125,6 +2192,7 @@ msgstr "" msgid "End" msgstr "End" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2140,6 +2208,11 @@ msgstr "End" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "英语" @@ -2170,6 +2243,7 @@ msgstr "等于" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "错误" @@ -2200,18 +2274,24 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "错误" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: 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." -#: Source/Core/Common/Src/ChunkFile.h:180 +#: Source/Core/Common/Src/ChunkFile.h:194 #, 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 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2245,7 +2325,7 @@ msgstr "Exit Dolphin with emulator" msgid "Export Failed" msgstr "导出失败" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "导出文件" @@ -2258,15 +2338,15 @@ msgstr "导出录制" msgid "Export Recording..." msgstr "导出录制..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "导出存档" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "导出 Wii 存档 (实验性)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "导出所有存档" @@ -2282,7 +2362,7 @@ msgstr "导出存档为..." msgid "Extension" msgstr "扩展" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 #, fuzzy msgid "External Frame Buffer" msgstr "外部参数" @@ -2295,44 +2375,44 @@ msgstr "外部参数" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "解压缩所有文件..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "解压缩 Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "解压缩 DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "解压缩目录..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "解压缩文件..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "解压缩分区..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "解压缩 %s 中" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "解压缩所有文件中" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "解压缩目录中" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "解压缩中..." @@ -2345,11 +2425,11 @@ msgstr "" msgid "FIFO Player" msgstr "玩家" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "法国" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "FST 大小:" @@ -2361,11 +2441,11 @@ msgstr "连接失败!" msgid "Failed to Listen!!" msgstr "监听失败!!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "下载代码失败." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "解压缩到 %s 失败!" @@ -2475,19 +2555,29 @@ msgstr "写入文件头到 %s 失败" msgid "Failed to write header for file %d" msgstr "写入文件头失败 %d" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "快速" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 #, fuzzy msgid "Fast Mipmaps" msgstr "载人原始纹理" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "MMU 快速版本. 任何游戏都不能工作" +#: Source/Core/Core/Src/Movie.cpp:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 #, fuzzy msgid "Fifo Player" @@ -2498,7 +2588,7 @@ msgstr "玩家" msgid "File Info" msgstr "代码信息" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "文件未包含代码." @@ -2531,16 +2621,16 @@ msgstr "文件不能被识别成内存卡" msgid "File not compressed" msgstr "文件不是已压缩文件" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: 未知打开模式 : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "文件系统" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "文件类型 'ini' 未知! 不能打开!" @@ -2548,7 +2638,7 @@ msgstr "文件类型 'ini' 未知! 不能打开!" msgid "First Block" msgstr "第一个区块" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "修正校检和" @@ -2560,7 +2650,7 @@ msgstr "强制 16:9" msgid "Force 4:3" msgstr "强制 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 #, fuzzy msgid "Force Console as NTSC-J" msgstr "设置终端为 NTSC-J" @@ -2593,7 +2683,7 @@ msgstr "" "Force the game to output graphics for widescreen resolutions.\n" "Note that this might cause graphical glitches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2628,7 +2718,7 @@ msgstr "Frame Advance" msgid "Frame Advance" msgstr "Frame Advance" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 #, fuzzy msgid "Frame Dumps use FFV1" msgstr "帧转储使用 FFV1" @@ -2642,7 +2732,7 @@ msgstr "Frame Advance" msgid "Frame S&kipping" msgstr "帧数跳跃(&K)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "帧数限制:" @@ -2650,10 +2740,11 @@ msgstr "帧数限制:" msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "自由视点" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2669,6 +2760,11 @@ msgstr "自由视点" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "法语" @@ -2703,7 +2799,7 @@ msgstr "记录设置" msgid "GCPad" msgstr "手柄" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "游戏 ID:" @@ -2719,15 +2815,15 @@ msgstr "游戏没有运行!" msgid "Game not found!!" msgstr "游戏没找到!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "游戏特殊设置" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "游戏配置" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" @@ -2738,6 +2834,7 @@ msgstr "Gamecube 手柄设置(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2745,6 +2842,9 @@ msgstr "Gamecube 手柄设置(&P)" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube 内存卡 (*.raw,*.gcp)" @@ -2753,15 +2853,17 @@ msgid "Gamecube Pad settings" msgstr "Gamecube 手柄设置" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Gecko 代码" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" "(either a bad code or the code type is not yet supported.)" @@ -2770,6 +2872,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 @@ -2778,6 +2881,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "常规" @@ -2787,6 +2893,7 @@ msgstr "常规" msgid "General Settings" msgstr "界面设置" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2802,6 +2909,11 @@ msgstr "界面设置" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "德语" @@ -2833,7 +2945,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "希腊语" @@ -2865,7 +2977,7 @@ msgstr "" msgid "Header checksum failed" msgstr "头部校检失败" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "希伯来语" @@ -2932,12 +3044,16 @@ msgstr "热键设置" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "热键" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "匈牙利语" @@ -2945,12 +3061,12 @@ msgstr "匈牙利语" msgid "Hybrid Wiimote" msgstr "混合 Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2963,11 +3079,11 @@ msgstr "" "TitleID %016llx.\n" " Dolphin will likely hang now" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - bad destination" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "IPL 设置" @@ -2983,15 +3099,15 @@ msgstr "IR 指针" msgid "IR Sensitivity:" msgstr "红外灵敏度:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "镜像详细信息" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "镜像目录" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "意大利" @@ -2999,22 +3115,24 @@ msgstr "意大利" msgid "Icon" msgstr "图标" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy 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." +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " +"Audio to throttle using the DSP (might fix audio clicks but can also cause " +"constant noise depending on the game)." msgstr "" "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." @@ -3042,7 +3160,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "导入存档" @@ -3091,7 +3209,7 @@ msgstr "" "Disable lighting. Improves performance but causes lighting to disappear in " "games which use it." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "进游戏" @@ -3100,7 +3218,7 @@ msgid "In-Game" msgstr "进游戏" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "信息" @@ -3120,7 +3238,7 @@ msgstr "插入" msgid "Insert Encrypted or Decrypted code here..." msgstr "在这里插入加密的或者解密的代码..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "插入SD卡" @@ -3133,7 +3251,7 @@ msgstr "在这里插入名称..." msgid "Install WAD" msgstr "安装 Wii 菜单" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "安装到Wii菜单" @@ -3143,6 +3261,7 @@ msgid "" msgstr "" "InstallExceptionHandler called, but this platform does not yet support it." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3152,16 +3271,19 @@ msgstr "" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Installing WAD..." msgstr "安装 WAD 到 Wii 菜单中..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 #, fuzzy msgid "Interface" msgstr "界面设置" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "界面设置" @@ -3187,11 +3309,11 @@ msgstr "内部 LZO 错误 - lzo_init() 失败" msgid "Internal Resolution:" msgstr "全屏分辨率:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "解释器 (非常慢)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "片头" @@ -3208,7 +3330,7 @@ msgstr "无效值!" msgid "Invalid bat.map or dir entry" msgstr "无效 bat.map 或 目录项目" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "无效事件类型 %i" @@ -3228,14 +3350,15 @@ msgstr "" "%s\n" " You may need to redump this game." -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "无效录制文件" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "Invalid state" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3251,27 +3374,32 @@ msgstr "Invalid state" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "意大利语" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "日本" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT 重编译器 (推荐)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL 实验性重编译器" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "日语" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "韩国" @@ -3280,8 +3408,8 @@ msgstr "韩国" msgid "Key" msgstr "按键" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "韩语" @@ -3299,7 +3427,7 @@ msgstr "L 键" msgid "L-Analog" msgstr "L-摇杆" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "语言:" @@ -3352,7 +3480,7 @@ msgstr "" msgid "Less Than" msgstr "小于" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "" @@ -3360,7 +3488,7 @@ msgstr "" msgid "Load" msgstr "载入" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 #, fuzzy msgid "Load Custom Textures" msgstr "载入精细材质" @@ -3409,6 +3537,7 @@ msgstr "载入存档插槽 8" msgid "Load State..." msgstr "载入状态..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3418,10 +3547,14 @@ msgstr "载入状态..." ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "载入 Wii 系统菜单(%d %c)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 @@ -3431,6 +3564,9 @@ msgstr "载入 Wii 系统菜单(%d %c)" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "载入 Wii 系统菜单(%d %c)" @@ -3455,7 +3591,7 @@ msgstr "载入指定文件 (DOL,ELF,GCM,ISO,WAD)" msgid "Local" msgstr "本地" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 #, fuzzy msgid "Lock Threads to Cores" msgstr "锁定线程到核心" @@ -3468,11 +3604,11 @@ msgstr "日志" msgid "Log Configuration" msgstr "记录设置" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "记录类型" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "记录输出" @@ -3502,7 +3638,7 @@ msgstr "" "MD5 不匹配\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU 速度破解" @@ -3524,11 +3660,11 @@ msgstr "MadCatz Gameshark 文件(*.gcs)" msgid "Main Stick" msgstr "主摇杆" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "制作者ID:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "制作者:" @@ -3553,6 +3689,7 @@ msgstr "内存(&M)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3560,6 +3697,9 @@ msgstr "内存(&M)" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "内存卡" @@ -3594,7 +3734,7 @@ msgstr "" msgid "Menu" msgstr "菜单" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "Mic" @@ -3604,11 +3744,11 @@ msgstr "Mic" msgid "Min" msgstr "Mic" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "其它" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "其它设置" @@ -3625,7 +3765,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "等宽字体" @@ -3638,7 +3778,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "马达" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3653,7 +3793,7 @@ msgstr "" msgid "Multiply" msgstr "多人游戏" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3743,6 +3883,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3752,6 +3893,9 @@ msgstr "NP Up" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3760,7 +3904,7 @@ msgstr "名称:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "名称:" @@ -3774,7 +3918,7 @@ msgid "New Scan" msgstr "新建扫描" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "下一页" @@ -3786,7 +3930,7 @@ msgstr "下一扫描" msgid "Nickname :" msgstr "昵称 :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "无国家 (SDK)" @@ -3826,7 +3970,7 @@ msgstr "No save folder found for title %s" msgid "None" msgstr "无" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "挪威语" @@ -3834,8 +3978,8 @@ msgstr "挪威语" msgid "Not Equal" msgstr "不等于" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "未设置" @@ -3855,7 +3999,7 @@ msgstr "未连接" msgid "Notes" msgstr "说明" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "说明: " @@ -3893,7 +4037,7 @@ msgstr "" msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "关闭" @@ -3919,11 +4063,11 @@ msgstr "只有 %d 区块有效" msgid "Open" msgstr "打开" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "打开包含文件夹(&C)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "打开 Wii 存档目录(&S)" @@ -3945,11 +4089,11 @@ msgstr "OpenAL: 不能找到音频设备" msgid "OpenAL: can't open device %s" msgstr "OpenAL: 不能打开设备 %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "" @@ -3981,7 +4125,7 @@ msgstr "" "and import the the saves to a new memcard\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "" @@ -4033,19 +4177,20 @@ msgstr "Paragraph" msgid "Parameters" msgstr "参数" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "分区 %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "补丁" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "路径" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4058,6 +4203,10 @@ msgstr "路径" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "暂停" @@ -4067,7 +4216,7 @@ msgstr "暂停" msgid "Per-Pixel Lighting" msgstr "像素光线" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "完美" @@ -4080,6 +4229,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 ======= @@ -4090,6 +4240,10 @@ msgstr "Perspective %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "开始" @@ -4103,7 +4257,7 @@ msgstr "播放录制" msgid "Play/Pause" msgstr "开始/暂停" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "可以玩" @@ -4116,6 +4270,7 @@ msgstr "选项" msgid "Players" msgstr "玩家" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4125,6 +4280,9 @@ msgstr "玩家" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "请确认..." @@ -4136,23 +4294,23 @@ msgstr "Please create a perspective before saving" msgid "Plus-Minus" msgstr "Plus-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "波兰语" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "端口 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "端口 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "端口 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "端口 4" @@ -4161,11 +4319,11 @@ msgstr "端口 4" msgid "Port :" msgstr "端口 :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "葡萄牙语" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "葡萄牙语(巴西)" @@ -4174,17 +4332,17 @@ msgstr "葡萄牙语(巴西)" msgid "Post-Processing Effect:" msgstr "Post-Processing Shader:" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4197,7 +4355,7 @@ msgstr "预置: " msgid "Prev Page" msgstr "上一页" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "上一页" @@ -4248,7 +4406,7 @@ msgstr "R-摇杆" msgid "RAM" msgstr "内存" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "俄语" @@ -4261,7 +4419,7 @@ msgstr "范围" msgid "Read-only mode" msgstr "只读模式" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "真实" @@ -4339,6 +4497,7 @@ msgstr "刷新列表" msgid "Refresh game list" msgstr "刷新游戏列表" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4357,6 +4516,12 @@ msgstr "刷新游戏列表" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "移除" @@ -4409,11 +4574,11 @@ msgstr "右摇杆" msgid "Rumble" msgstr "震动" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Run DSP LLE on a dedicated thread (not recommended)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "俄语" @@ -4421,10 +4586,11 @@ msgstr "俄语" msgid "Sa&ve State" msgstr "保存状态(&V)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "安全" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4434,6 +4600,9 @@ msgstr "安全" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "采样率:" @@ -4491,12 +4660,12 @@ msgstr "存档插槽 8" msgid "Save State..." msgstr "保存状态..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "另存为..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "保存压缩的GCM/镜像" @@ -4504,11 +4673,11 @@ msgstr "保存压缩的GCM/镜像" msgid "Save current perspective" msgstr "保存当前视角" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "保存解压缩的GCM/镜像" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Savestate movie %s is corrupted, movie recording stopping..." @@ -4518,6 +4687,7 @@ msgstr "Savestate movie %s is corrupted, movie recording stopping..." msgid "Scaled EFB Copy" msgstr "EFB 比例复制" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4527,15 +4697,18 @@ msgstr "EFB 比例复制" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "扫描中..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "扫描镜像中" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "扫描中..." @@ -4551,12 +4724,12 @@ msgstr "Scroll Lock" msgid "Search Filter" msgstr "搜索过滤" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 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:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "Section %s not found in SYSCONF" @@ -4566,6 +4739,7 @@ msgstr "Section %s not found in SYSCONF" msgid "Select" msgstr "选择" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4590,6 +4764,14 @@ msgstr "选择录制文件" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "选择录制文件" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "选择要导入的存档" @@ -4616,16 +4798,21 @@ msgstr "选择浮动窗口" msgid "Select the file to load" msgstr "选择要载入的文件" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "选择一个存档文件" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "选择要载入的状态" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 @@ -4645,6 +4832,9 @@ msgstr "选择要载入的状态" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "选择要保存的状态" @@ -4665,7 +4855,7 @@ msgstr "" "Force 4:3: Stretch the picture to an aspect ratio of 4:3.\n" "Stretch to window: Stretch the picture to the window size." -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "所选字体" @@ -4701,11 +4891,11 @@ msgstr "传感器栏位置" msgid "Separator" msgstr "分割" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "塞尔维亚语" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4715,11 +4905,11 @@ msgstr "" msgid "Set" msgstr "设置" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "设置为默认镜像(&D)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "设置为默认内存卡 %c" @@ -4729,7 +4919,7 @@ msgstr "设置为默认内存卡 %c" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "SetARCode_IsActive: Index is greater than ar code list size %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "设置..." @@ -4741,7 +4931,7 @@ msgstr "安装Wii内存: 不能找到设置文件" msgid "Shake" msgstr "震动" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "短名称:" @@ -4770,7 +4960,7 @@ msgstr "显示工具栏(&T)" msgid "Show Drives" msgstr "显示驱动器" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 #, fuzzy msgid "Show EFB Copy Regions" msgstr "EFB 复制范围" @@ -4787,7 +4977,7 @@ msgstr "显示法国" msgid "Show GameCube" msgstr "显示 GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "显示输入显示" @@ -4803,7 +4993,7 @@ msgstr "显示日本" msgid "Show Korea" msgstr "显示韩国" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "显示语言:" @@ -4823,7 +5013,7 @@ msgstr "显示平台" msgid "Show Regions" msgstr "显示国家" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 #, fuzzy msgid "Show Statistics" msgstr "各种统计数据" @@ -4844,11 +5034,11 @@ msgstr "显示 Wad" msgid "Show Wii" msgstr "显示 Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "停止游戏时显示确认对话框" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 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 " @@ -4858,23 +5048,23 @@ msgstr "" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "显示第一区块" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "显示存档区块" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "显示存档注释" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "显示存档图标" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "显示存档标题" @@ -4905,7 +5095,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Sideways Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "简体中文" @@ -4913,12 +5103,12 @@ msgstr "简体中文" msgid "Size" msgstr "大小" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 #, fuzzy msgid "Skip BIOS" msgstr "跳过 GC BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 #, fuzzy msgid "Skip Dest. Alpha Pass" msgstr "禁用目标透明通道" @@ -4951,11 +5141,11 @@ msgstr "" msgid "Slot %i" msgstr "插槽 %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "插槽 A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "插槽 B" @@ -4975,7 +5165,7 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "声音设置" @@ -4993,6 +5183,7 @@ msgstr "声音缓冲区创建失败: %s" msgid "Space" msgstr "空格" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -5008,6 +5199,11 @@ msgstr "空格" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "西班牙语" @@ -5031,7 +5227,7 @@ msgstr "" msgid "Specify a video backend" msgstr "指定一个视频后端" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "提升光盘传输率" @@ -5039,7 +5235,7 @@ msgstr "提升光盘传输率" msgid "Square Stick" msgstr "方块键" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "标准控制器" @@ -5132,12 +5328,12 @@ msgstr "成功导入存档文件" msgid "Swing" msgstr "Swing" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "系统语言" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "台湾" @@ -5177,7 +5373,7 @@ msgstr "Table Right" msgid "Take Screenshot" msgstr "屏幕截图(&T)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -5194,7 +5390,7 @@ msgstr "材质" msgid "Texture Cache" msgstr "清除缓存" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 #, fuzzy msgid "Texture Format Overlay" msgstr "材质格式" @@ -5211,13 +5407,13 @@ msgstr "地址无效" msgid "The checksum was successfully fixed" msgstr "校检和成功修复" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "选择的目录已经存在于列表" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5240,7 +5436,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "The file %s was already open, the file header will not be written." -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "您指定的文件 %s 不存在" @@ -5262,7 +5458,7 @@ msgid "" "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." +"If unsure, use the rightmost value." msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 @@ -5302,7 +5498,7 @@ msgstr "指定的文件 \"%s\" 不存在" msgid "The value is invalid" msgstr "这个值无效" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "主题" @@ -5310,7 +5506,7 @@ msgstr "主题" msgid "Theme selection went wrong" msgstr "选择主题出现错误" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5318,7 +5514,7 @@ msgstr "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5334,7 +5530,7 @@ msgstr "" "This action replay simulator does not support codes that modify Action " "Replay itself." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "This could cause slow down in Wii Menu and some games." @@ -5350,24 +5546,10 @@ msgid "" msgstr "" #: 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" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" -"This is used to control game speed by sound throttle.\n" -"Disabling this could cause abnormal game speed, such as too fast.\n" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "这用于播放音乐音轨,比如背景音乐." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5379,7 +5561,7 @@ msgstr "" "Causes major speed improvements on PCs with more than one core, but can also " "cause occasional crashes/glitches." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "This will let you Manually Edit the INI config file" @@ -5403,7 +5585,7 @@ msgstr "标题" msgid "To" msgstr "顶部" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "切换所有日志类型" @@ -5423,6 +5605,7 @@ msgstr "切换全屏" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5430,14 +5613,17 @@ msgstr "切换全屏" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "顶部" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "繁体中文" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "已经尝试载入未知文件类型." @@ -5445,7 +5631,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:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Trying to read from invalid SYSCONF" @@ -5457,7 +5643,7 @@ msgstr "" "Trying to read from invalid SYSCONF\n" "Wiimote bt ids are not available" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "土耳其语" @@ -5478,11 +5664,11 @@ msgstr "UDP 端口:" msgid "UDP Wiimote" msgstr "UDP Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "未知" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "美国" @@ -5562,7 +5748,7 @@ msgstr "更新" msgid "Upright Wiimote" msgstr "直握 Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "使用 EuRGB60 模式 (PAL60)" @@ -5575,7 +5761,7 @@ msgstr "切换全屏(&F)" msgid "Use Hex" msgstr "使用十六进制" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "使用警告程序" @@ -5596,7 +5782,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "实用扩展" @@ -5620,25 +5806,29 @@ msgstr "值: " msgid "Verbosity" msgstr "详细" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "视频" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "虚拟" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "音量" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "WAD 安装失败: 创建 %s 错误" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "WAD 安装失败: 创建 %s 错误" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5653,15 +5843,15 @@ msgstr "" msgid "Warning" msgstr "警告" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "Warning - starting DOL in wrong console mode!" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "Warning - starting ELF in wrong console mode!" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "Warning - starting ISO in wrong console mode!" @@ -5689,7 +5879,7 @@ msgstr "" "and have the same name as a file on your memcard\n" "Continue?" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5697,7 +5887,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5705,7 +5895,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5733,7 +5923,7 @@ msgstr "波形文件写入器 - 文件未打开." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "宽屏破解" @@ -5741,15 +5931,15 @@ msgstr "宽屏破解" msgid "Width" msgstr "宽度" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Wii控制台" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #, fuzzy msgid "Wii NAND Root:" msgstr "DVD 根目录:" @@ -5758,6 +5948,7 @@ msgstr "DVD 根目录:" msgid "Wii Save Import" msgstr "导入 Wii 存档" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5767,6 +5958,9 @@ msgstr "导入 Wii 存档" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 存档文件 (*.bin)|*.bin" @@ -5834,10 +6028,11 @@ msgstr "窗口菜单" msgid "Windows Right" msgstr "窗口右侧" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "自动换行" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -5853,6 +6048,11 @@ msgstr "自动换行" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "工作中..." @@ -5860,6 +6060,11 @@ msgstr "工作中..." msgid "Write to Console" msgstr "写入到控制台" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "写入到文件" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "写入到文件" @@ -5913,7 +6118,7 @@ msgstr "您必须输入一个十进制或者十六进制值." msgid "You must enter a valid profile name." msgstr "您必须输入一个有效的配置文件名称." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "You must restart Dolphin in order for the change to take effect." @@ -5934,7 +6139,7 @@ msgid "" msgstr "" "Your SYSCONF file is the wrong size - should be 0x%04x (but is 0x%04llx)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "ZTP 破解" @@ -5988,7 +6193,7 @@ msgstr "" msgid "^ ADD" msgstr "^ 加" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "应用程序载入器 (.img)" @@ -6019,12 +6224,12 @@ msgstr "not a wii save or read failure for file header size %x" msgid "s" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "未知命令 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute returned -1 on application run!" @@ -6223,6 +6428,9 @@ msgstr "| 或" #~ msgid "Emulator Display Settings" #~ msgstr "模拟器显示设置" +#~ msgid "Enable Audio Throttle" +#~ msgstr "启用音频调节" + #~ msgid "Enable CPU Access" #~ msgstr "启用CPU访问" @@ -6558,6 +6766,19 @@ msgstr "| 或" #~ msgid "The file " #~ msgstr "The file " +#~ msgid "" +#~ "This is used to control game speed by sound throttle.\n" +#~ "Disabling this could cause abnormal game speed, such as too fast.\n" +#~ "But sometimes enabling this could cause constant noise.\n" +#~ "\n" +#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." +#~ msgstr "" +#~ "This is used to control game speed by sound throttle.\n" +#~ "Disabling this could cause abnormal game speed, such as too fast.\n" +#~ "But sometimes enabling this could cause constant noise.\n" +#~ "\n" +#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." + #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "This is usually used to play voice and sound effects." diff --git a/Languages/po/zh_TW.po b/Languages/po/zh_TW.po index d171170136..e0384728e6 100644 --- a/Languages/po/zh_TW.po +++ b/Languages/po/zh_TW.po @@ -9,6 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2011-12-18 13:39-0600\n" ======= "POT-Creation-Date: 2011-10-11 23:25-0500\n" @@ -16,6 +17,9 @@ msgstr "" ======= "POT-Creation-Date: 2011-12-18 13:39-0600\n" >>>>>>> Update from master branch. +======= +"POT-Creation-Date: 2012-03-09 16:54-0600\n" +>>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-03-15 02:51+0800\n" "Last-Translator: khiav \n" "Language-Team: khiav&yrbn \n" @@ -57,9 +61,9 @@ msgstr "\"%s\" 為無效的 GCM/ISO 檔案，或非 GC/Wii ISO。" msgid "%1$sCopy%1$s" msgstr "%1$s複製%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:617 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -151,7 +155,7 @@ msgstr "%s匯出 GCI%s" msgid "%sImport GCI%s" msgstr "%s匯入 GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:762 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:774 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "剩餘 %u 個區塊；剩餘 %u 個目錄項目" @@ -184,11 +188,11 @@ msgstr "作弊檔管理器(&C)" msgid "&DSP Settings" msgstr "DSP 設定(&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:946 msgid "&Delete ISO..." msgstr "刪除 ISO 檔(&D)..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:967 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "&Delete selected ISOs..." msgstr "刪除已選取的 ISO 檔(&D)..." @@ -252,7 +256,7 @@ msgstr "暫停(&P)" msgid "&Play" msgstr "執行(&P)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:932 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:928 msgid "&Properties" msgstr "屬性(&P)" @@ -296,7 +300,7 @@ msgstr "檢視(&V)" msgid "&Wiimote Settings" msgstr "Wiimote 設定(&W)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:929 msgid "&Wiki" msgstr "&Wiki" @@ -340,7 +344,7 @@ msgstr "<插入名稱>" msgid "" msgstr "<無解析度設定>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" msgstr "<無>" @@ -349,7 +353,7 @@ msgstr "<無>" msgid "" msgstr "<按任意鍵>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "<系統>" @@ -403,13 +407,13 @@ msgstr "" "\n" "您必須至主機的 TCP 埠口進行設定！！" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:83 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" msgstr "AM-Baseboard" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:296 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "AR 代碼" @@ -421,11 +425,11 @@ msgstr "關於 Dolphin" msgid "Acceleration" msgstr "加速" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "精確的 VBeam 模擬" @@ -532,11 +536,11 @@ msgstr "配接器：" msgid "Add" msgstr "新增" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1227 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1235 msgid "Add ActionReplay Code" msgstr "新增 ActionReplay 代碼" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1156 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1164 msgid "Add Patch" msgstr "新增修正" @@ -544,6 +548,7 @@ msgstr "新增修正" msgid "Add new pane" msgstr "新增面版" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 @@ -559,6 +564,11 @@ msgstr "新增面版" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "新增..." @@ -605,11 +615,11 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "調整模擬搖桿控制壓力需要活動的按鈕。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:516 msgid "Advanced" msgstr "進階" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "進階設定" @@ -617,14 +627,15 @@ msgstr "進階設定" msgid "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" msgstr "所有 GC/Wii 檔案 (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, ciso, gcz)" msgstr "所有 GC/Wii 映像檔 (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1249 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Gamecube GCM files (gcm)" msgstr "所有 Gamecube GCM 檔案 (gcm)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 @@ -637,18 +648,22 @@ msgstr "所有 Gamecube GCM 檔案 (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "所有即時存檔 (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "All Wii ISO files (iso)" msgstr "所有 Wii ISO 檔案 (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "所有已壓縮的 GC/Wii ISO 檔案 (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" msgstr "所有檔案 (*.*)|*.*" @@ -660,7 +675,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "模擬 Wiimote" @@ -681,7 +696,7 @@ msgstr "程式讀取器為錯誤的大小...它是程式讀取器嗎？" msgid "Apploader unable to load from file" msgstr "程式讀取器無法從檔案中讀取" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:781 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "程式讀取器：" @@ -696,7 +711,7 @@ msgid "" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "" @@ -705,7 +720,7 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "是否確認刪除 \"%s\" ？" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1076 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1072 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -713,10 +728,11 @@ msgstr "" "是否真的要刪除這些檔案？\n" "刪了之後就回不來了哦！" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1067 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1063 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "是否真的要刪除這些檔案？刪了之後就回不來了哦！" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 @@ -726,6 +742,9 @@ msgstr "是否真的要刪除這些檔案？刪了之後就回不來了哦！" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "畫面比例：" @@ -734,18 +753,20 @@ msgstr "畫面比例：" msgid "At least one pane must remain open." msgstr "必須剩餘至少一個面板。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "聲音" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "聲音裝置：" -#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 +#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon：開啟 AO 裝置出錯。\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 @@ -755,6 +776,9 @@ msgstr "AudioCommon：開啟 AO 裝置出錯。\n" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "自動" @@ -793,7 +817,7 @@ msgstr "" msgid "Back" msgstr "返回" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:638 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "裝置設定" @@ -821,11 +845,11 @@ msgstr "損壞的檔頭" msgid "Banner" msgstr "橫幅" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:530 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:538 msgid "Banner Details" msgstr "圖示明細" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:502 msgid "Banner:" msgstr "橫幅：" @@ -837,7 +861,7 @@ msgstr "Bar" msgid "Basic" msgstr "基本" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:554 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "基本設定" @@ -868,6 +892,7 @@ msgstr "藍 右" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 @@ -875,6 +900,9 @@ msgstr "藍 右" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "下方" @@ -883,7 +911,7 @@ msgstr "下方" msgid "Bound Controls: %lu" msgstr "綁定控制器：%lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Broken" msgstr "破損" @@ -899,7 +927,7 @@ msgstr "瀏覽要新增的資料夾" msgid "Browse for an ISO directory..." msgstr "瀏覽 ISO 資料夾..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1142 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1138 msgid "Browse for output directory" msgstr "瀏覽輸出的資料夾" @@ -930,11 +958,11 @@ msgstr "C-搖桿" msgid "C-Stick" msgstr "C-搖桿" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "CPU 模擬引擎" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 #, fuzzy msgid "Cache Display Lists" msgstr "開啟顯示列表快取" @@ -974,7 +1002,7 @@ msgstr "無法開啟 %s" msgid "Cannot unregister events with events pending" msgstr "事件未決定時無法註銷事件" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1020 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -984,7 +1012,7 @@ msgstr "" "無法使用此檔案作為記憶卡。\n" "您要在相同的插槽中使用相同的檔案嗎？" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1043 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1041 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1002,8 +1030,6 @@ msgstr "找不到 WiiMote 依 bd： %02x:%02x:%02x:%02x:%02x:%02x" msgid "Cant find WiiMote by connection handle %02x" msgstr "找不到 WiiMote 依連接項 %02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:236 -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:331 #: Source/Core/Core/Src/HW/DVDInterface.cpp:643 #: Source/Core/Core/Src/HW/DVDInterface.cpp:653 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" @@ -1013,7 +1039,7 @@ msgstr "無法讀取從 DVD_Plugin - DVD-界面：嚴重錯誤" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "" @@ -1038,7 +1064,7 @@ msgstr "更換光碟" msgid "Change Game" msgstr "更換遊戲" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:502 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1054,8 +1080,8 @@ msgstr "更改 zFar 參數符號 (在修正後)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "更改 zNear 參數的符號 (在修正後)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "更改此選項在模擬器執行時沒有效果！" @@ -1075,32 +1101,32 @@ msgstr "尋找作弊代碼" msgid "Cheats Manager" msgstr "作弊代碼管理器" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Chinese (Simplified)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Chinese (Traditional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "選擇一個 DVD 根目錄：" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 #, fuzzy msgid "Choose a NAND root directory:" msgstr "選擇一個 DVD 根目錄：" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "選擇一個預設 ISO：" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1167 msgid "Choose a directory to add" msgstr "選擇一個要添加的資料夾" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1005 msgid "Choose a file to open" msgstr "選擇一個要開啟的檔案" @@ -1108,14 +1134,14 @@ msgstr "選擇一個要開啟的檔案" msgid "Choose a memory card:" msgstr "選擇一個記憶卡：" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 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 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "選擇提取的資料夾存放位置" @@ -1127,14 +1153,14 @@ msgstr "Circle Stick" msgid "Classic" msgstr "Classic" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:142 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:159 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 msgid "Clear" msgstr "清除" -#: Source/Core/Core/Src/CoreTiming.cpp:174 +#: Source/Core/Core/Src/CoreTiming.cpp:175 msgid "Clear failed." msgstr "清除失敗。" @@ -1148,6 +1174,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 @@ -1156,6 +1183,10 @@ msgstr "在遊戲執行時客戶端斷開連接！！網路對戰已經被關閉 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "關閉" @@ -1179,20 +1210,20 @@ msgstr "命令" msgid "Comment" msgstr "註釋" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:500 msgid "Comment:" msgstr "註釋：" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:957 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "Compress ISO..." msgstr "壓縮 ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:969 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:965 msgid "Compress selected ISOs..." msgstr "壓縮選擇的 ISO 檔..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Compressing ISO" msgstr "正在壓縮 ISO" @@ -1219,13 +1250,13 @@ msgstr "設定控制器" msgid "Configure..." msgstr "模擬器設定..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1184 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1212 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1180 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1208 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1273 msgid "Confirm File Overwrite" msgstr "確認檔案覆蓋" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:580 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 #, fuzzy msgid "Confirm on Stop" msgstr "確認停止" @@ -1235,7 +1266,7 @@ msgstr "確認停止" msgid "Connect" msgstr "連接" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:723 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "連接 USB 鍵盤" @@ -1292,12 +1323,12 @@ msgstr "轉換為 GCI" msgid "Copy failed" msgstr "複製失敗" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:785 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 #, c-format msgid "Copy to Memcard %c" msgstr "複製至記憶卡 %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:364 msgid "Core" msgstr "核心" @@ -1327,7 +1358,7 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "無法識別 ISO 檔案 %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:580 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:588 #, c-format msgid "Could not save %s" msgstr "無法儲存 %s" @@ -1340,7 +1371,7 @@ msgstr "" "無法設置控制器。有玩家存留或者遊戲正在執行！\n" "(還不支援在遊戲執行時設定控制器)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:119 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:118 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1352,7 +1383,7 @@ msgstr "" "\n" "請確認是否經由 CD/DVD 執行 Dolphin，或者是檔案具有唯讀的屬性？" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1059 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1067 msgid "Couldn't find open command for extension 'ini'!" msgstr "找不到副檔名 'ini' 的開啟命令！" @@ -1369,7 +1400,7 @@ msgstr "" msgid "Count:" msgstr "數量：" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 msgid "Country:" msgstr "國別：" @@ -1383,24 +1414,24 @@ msgstr "建立 AR 代碼" msgid "Create new perspective" msgstr "建立一個新的透檢視" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by KDE-Look.org" msgstr "由 KDE-Look.org 製做" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "由 Milosz Wlazlo 製做 [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" msgstr "由 VistaIcons.com 製做" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "由 black_rider 製做並發佈於 ForumW.org > Web Developments" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:15 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " msgstr "作者：" @@ -1408,7 +1439,7 @@ msgstr "作者：" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:557 msgid "Crop" msgstr "剪裁" @@ -1428,7 +1459,7 @@ msgstr "Crossfade" msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "目前的目錄在 wxFileSelector 後從 %s 更改至 %s ！" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Custom Projection Hack" msgstr "自訂投影修正" @@ -1436,11 +1467,11 @@ msgstr "自訂投影修正" msgid "Custom Projection Hack Settings" msgstr "自訂投影修正設定" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Customize some Orthographic Projection parameters." msgstr "自訂一些直線投影參數。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Czech" @@ -1452,10 +1483,11 @@ msgstr "十字方向鍵" msgid "DSP" msgstr "聲音" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 msgid "DSP Emulator Engine" msgstr "DSP 模擬引擎" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 <<<<<<< HEAD <<<<<<< HEAD @@ -1466,19 +1498,23 @@ msgstr "DSP 模擬引擎" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE 模擬器 (快)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE 解釋器 (慢)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 #, fuzzy msgid "DSP LLE on Thread" msgstr "DSP LLE 單獨線程" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP LLE 重編譯器 (慢)" @@ -1486,15 +1522,23 @@ msgstr "DSP LLE 重編譯器 (慢)" msgid "DSP settings" msgstr "聲音設定" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:778 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "DVD 根：" +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 +msgid "DVDLowRead - Fatal Error: failed to read from volume" +msgstr "" + +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 +msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" +msgstr "" + #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 msgid "Data Size" msgstr "資料大小" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:471 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 msgid "Date:" msgstr "日期：" @@ -1515,7 +1559,7 @@ msgstr "非作用區" msgid "Debug" msgstr "除錯" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 #, fuzzy msgid "Debugging" msgstr "除錯" @@ -1524,16 +1568,16 @@ msgstr "除錯" msgid "Decimal" msgstr "Decimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:951 msgid "Decompress ISO..." msgstr "解壓 ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:970 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:966 msgid "Decompress selected ISOs..." msgstr "解壓選擇的 ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1148 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1281 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1144 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1277 msgid "Decompressing ISO" msgstr "ISO 解壓中" @@ -1541,11 +1585,11 @@ msgstr "ISO 解壓中" msgid "Default" msgstr "預設值" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:775 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "預設的 ISO：" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:112 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 msgid "Default font" msgstr "預設的字型" @@ -1554,7 +1598,7 @@ msgstr "預設的字型" msgid "Delete" msgstr "刪除" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:786 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 msgid "Delete Save" msgstr "刪除存檔" @@ -1563,7 +1607,7 @@ msgstr "刪除存檔" msgid "Delete the existing file '%s'?" msgstr "刪除已存在的檔案 '%s' ？" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:685 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:681 #, fuzzy msgid "Description" msgstr "問題" @@ -1572,8 +1616,8 @@ msgstr "問題" msgid "Detect" 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 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." @@ -1586,8 +1630,8 @@ msgstr "" msgid "Device" msgstr "裝置" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:690 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "裝置設定" @@ -1612,25 +1656,25 @@ msgstr "" " 並且目錄備份校驗失敗" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 #, fuzzy msgid "Disable" msgstr "關閉霧化" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Disable Fog" msgstr "關閉霧化" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Disable Lighting" msgstr "關閉光源" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 #, fuzzy msgid "Disable Per-Pixel Depth" msgstr "像素深度" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 msgid "Disable Textures" msgstr "關閉紋理" @@ -1660,7 +1704,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:554 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:562 msgid "Disc" msgstr "光碟" @@ -1685,6 +1729,7 @@ msgstr "顯示控制器輸入狀態 (僅作用於錄製或播放影片時)。" msgid "Divide" msgstr "Divide" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 @@ -1694,10 +1739,13 @@ msgstr "Divide" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "您要停止目前的模擬嗎？" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:935 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:932 msgid "Dolphin" msgstr "Dolphin" @@ -1723,6 +1771,7 @@ msgstr "Dolphin 模擬 Wiimote 設定" msgid "Dolphin FIFO" msgstr "Dolphin" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 @@ -1747,6 +1796,14 @@ msgstr "Dolphin GC 控制器設定" #: Source/Core/DolphinWX/Src/FrameTools.cpp:751 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 +msgid "Dolphin GCPad Configuration" +msgstr "Dolphin GC 控制器設定" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS 影片 (*.dtm)" @@ -1775,11 +1832,11 @@ msgstr "Dolphin 目前被設定為隱藏所有遊戲。按兩下這裡顯示所 msgid "Down" msgstr "下" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:42 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" msgstr "下載代碼 (WiiRD 數據庫)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:276 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "已下載 %lu 條代碼。 (已添加 %lu 條)" @@ -1788,23 +1845,23 @@ msgstr "已下載 %lu 條代碼。 (已添加 %lu 條)" msgid "Drums" msgstr "Drums" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" msgstr "空" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "Dump Audio" msgstr "轉儲聲音" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Dump EFB Target" msgstr "轉儲 EFB 目標" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:545 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 msgid "Dump Frames" msgstr "轉儲畫格" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Dump Textures" msgstr "轉儲紋理" @@ -1830,6 +1887,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 @@ -1845,6 +1903,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Dutch" @@ -1868,7 +1931,7 @@ msgstr "" "錯誤：這個版本 Dolphin 需要的 TAP-Win32 驅動至少為 版本 %d.%d -- 如果最近曾更" "改 Dolphin 組件，重新啟動後也許可以看到 Windows 新增驅動。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:162 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:170 msgid "EUROPE" msgstr "EUROPE" @@ -1884,7 +1947,7 @@ msgstr "編輯" msgid "Edit ActionReplay Code" msgstr "編輯 ActionReplay 代碼" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:282 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "編輯 ini 設定檔" @@ -1896,8 +1959,8 @@ msgstr "編輯修正" msgid "Edit current perspective" msgstr "編輯目前版式" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:422 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:444 msgid "Edit..." msgstr "編輯..." @@ -1936,7 +1999,7 @@ msgstr "" msgid "Emulated Wiimote" msgstr "模擬 Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 msgid "Emulation State: " msgstr "模擬狀態：" @@ -1958,23 +2021,23 @@ msgstr "" msgid "Enable AR Logging" msgstr "開啟 AR 日誌" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:607 -msgid "Enable Audio Throttle" -msgstr "開啟聲音節流閥" - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "開啟 BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "開啟塊合併" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "" @@ -1988,6 +2051,7 @@ msgstr "" msgid "Enable Cache" msgstr "開啟快取" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 @@ -1997,52 +2061,55 @@ msgstr "開啟快取" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "開啟作弊" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:604 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:605 msgid "Enable DTK Music" msgstr "開啟 DTK 音樂" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "開啟雙核心" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "開啟雙核心 (加速)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 msgid "Enable Hotkeys" msgstr "開啟快捷鍵" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "開啟略過空閒" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "開啟略過空閒 (加速)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:308 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "開啟 MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:568 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 msgid "Enable Progressive Scan" msgstr "開啟逐行掃瞄" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 #, fuzzy msgid "Enable Screen Saver" msgstr "開啟寬螢幕" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Enable WideScreen" msgstr "開啟寬螢幕" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Enable Wireframe" msgstr "開啟線框" @@ -2058,13 +2125,13 @@ msgstr "" "開啟各異向性過濾。\n" "通過柔化可見的多邊形增強紋理的視覺品質。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" msgstr "開啟快速光碟存取。部份遊戲需要。(ON = 兼容、OFF = 快速)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Enable pages" msgstr "開啟分頁瀏覽" @@ -2084,13 +2151,13 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "開啟此選項將加速塞爾達傳說：曙光公主，請勿在其它遊戲中使用。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2099,7 +2166,7 @@ msgstr "" "開啟塊位址轉換 (BAT)：一個記憶體管理單元的函數。用來更精確的執行，相對的模擬" "速度會變慢。(ON = 兼容、OFF = 快速)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Enables Custom Projection Hack" msgstr "開啟自訂投影修正" @@ -2111,7 +2178,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2128,6 +2195,7 @@ msgstr "" msgid "End" msgstr "End" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 @@ -2143,6 +2211,11 @@ msgstr "End" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "English" @@ -2173,6 +2246,7 @@ msgstr "等於" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 msgid "Error" msgstr "錯誤" @@ -2203,18 +2277,24 @@ msgid "" msgstr "" >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 +msgid "Error" +msgstr "錯誤" + +>>>>>>> Update the pot file to reflect recent changes in the code. #: 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 +#: Source/Core/Common/Src/ChunkFile.h:194 #, 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 +#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " @@ -2247,7 +2327,7 @@ msgstr "離開 Dolphin" msgid "Export Failed" msgstr "匯出失敗" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:651 msgid "Export File" msgstr "匯出檔案" @@ -2260,15 +2340,15 @@ msgstr "匯出錄像" msgid "Export Recording..." msgstr "匯出錄像..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:788 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Export Save" msgstr "匯出存檔" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:939 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "Export Wii save (Experimental)" msgstr "匯出 Wii 存檔 (實驗性)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:789 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Export all saves" msgstr "匯出所有存檔" @@ -2284,7 +2364,7 @@ msgstr "匯出存檔為..." msgid "Extension" msgstr "擴充" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 #, fuzzy msgid "External Frame Buffer" msgstr "額外參數" @@ -2297,44 +2377,44 @@ msgstr "額外參數" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "僅在 ''銀河戰士：另一個 M'' 中有效的額外參數。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:633 msgid "Extract All Files..." msgstr "提取所有檔案..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:635 msgid "Extract Apploader..." msgstr "提取程式讀取器..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract DOL..." msgstr "提取 DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:629 msgid "Extract Directory..." msgstr "提取資料夾..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:631 msgid "Extract File..." msgstr "提取檔案..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:627 msgid "Extract Partition..." msgstr "提取分割區..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:736 #, c-format msgid "Extracting %s" msgstr "%s 提取中" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting All Files" msgstr "所有檔案提取中" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:712 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:720 msgid "Extracting Directory" msgstr "資料夾提取中" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:714 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:722 msgid "Extracting..." msgstr "提取中..." @@ -2347,11 +2427,11 @@ msgstr "" msgid "FIFO Player" msgstr "玩家" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:165 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:173 msgid "FRANCE" msgstr "FRANCE" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 msgid "FST Size:" msgstr "FST 大小" @@ -2363,11 +2443,11 @@ msgstr "連接失敗！" msgid "Failed to Listen!!" msgstr "監聽失敗！！" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:286 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." msgstr "下載代碼失敗。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:828 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "提取至 %s 失敗！" @@ -2477,19 +2557,29 @@ msgstr "檔案 %s 寫入檔頭失敗" msgid "Failed to write header for file %d" msgstr "檔案 %d 寫入檔頭失敗" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +msgid "Farsi" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 msgid "Fast" msgstr "快速" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 #, fuzzy msgid "Fast Mipmaps" msgstr "讀取原始紋理" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "快速版本的 MMU。可能無法在所有遊戲上執行。" +#: Source/Core/Core/Src/Movie.cpp:844 +#, c-format +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" + #: Source/Core/DolphinWX/Src/FrameTools.cpp:212 #, fuzzy msgid "Fifo Player" @@ -2500,7 +2590,7 @@ msgstr "玩家" msgid "File Info" msgstr "代碼訊息" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:283 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." msgstr "檔案未含有代碼。" @@ -2533,16 +2623,16 @@ msgstr "檔案未被識別為一張記憶卡" msgid "File not compressed" msgstr "檔案未壓縮" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:153 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:168 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO：未知開啟模式： 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:542 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:550 msgid "Filesystem" msgstr "檔案系統" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1052 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1060 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "檔案類型 'ini' 未知！ 無法開啟！" @@ -2550,7 +2640,7 @@ msgstr "檔案類型 'ini' 未知！ 無法開啟！" msgid "First Block" msgstr "首數據區塊" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807 msgid "Fix Checksums" msgstr "修正校驗" @@ -2562,7 +2652,7 @@ msgstr "強制 16:9" msgid "Force 4:3" msgstr "強制 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 #, fuzzy msgid "Force Console as NTSC-J" msgstr "設定主機為 NTSC-J" @@ -2594,7 +2684,7 @@ msgstr "" "強制遊戲輸出寬螢幕解析度的影像。\n" "注意這可能導致圖形問題" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2629,7 +2719,7 @@ msgstr "畫格步進" msgid "Frame Advance" msgstr "畫格步進" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:548 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 #, fuzzy msgid "Frame Dumps use FFV1" msgstr "FFV1 畫格轉儲" @@ -2643,7 +2733,7 @@ msgstr "畫格步進" msgid "Frame S&kipping" msgstr "畫格省略(&K)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:551 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "畫格速限制：" @@ -2651,10 +2741,11 @@ msgstr "畫格速限制：" msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 msgid "Free Look" msgstr "自由視點" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 @@ -2670,6 +2761,11 @@ msgstr "自由視點" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "French" @@ -2704,7 +2800,7 @@ msgstr "記錄設定" msgid "GCPad" msgstr "GC 控制器" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:459 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 msgid "Game ID:" msgstr "遊戲 ID ：" @@ -2720,15 +2816,15 @@ msgstr "遊戲未執行！" msgid "Game not found!!" msgstr "找不到遊戲！！" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:404 msgid "Game-Specific Settings" msgstr "遊戲規格設定" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "遊戲設定" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" @@ -2739,6 +2835,7 @@ msgstr "Gamecube 控制器設定(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007 @@ -2746,6 +2843,9 @@ msgstr "Gamecube 控制器設定(&P)" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube 記憶卡 (*.raw,*.gcp)" @@ -2754,15 +2854,17 @@ msgid "Gamecube Pad settings" msgstr "Gamecube 控制器設定" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Gecko 代碼" -#: Source/Core/Core/Src/GeckoCode.cpp:139 -#, c-format +#: Source/Core/Core/Src/GeckoCode.cpp:222 +#, fuzzy, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" "GeckoCode 無法執行 (CT%i CST%i) (%s)\n" "(一個損毀的代碼或不支援的代碼類型。)" @@ -2771,6 +2873,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 @@ -2779,6 +2882,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "一般" @@ -2788,6 +2894,7 @@ msgstr "一般" msgid "General Settings" msgstr "界面設定" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 @@ -2803,6 +2910,11 @@ msgstr "界面設定" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "German" @@ -2834,7 +2946,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Greek" @@ -2866,7 +2978,7 @@ msgstr "" msgid "Header checksum failed" msgstr "檔頭校驗失敗" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Hebrew" @@ -2933,12 +3045,16 @@ msgstr "快捷鍵設定" >>>>>>> Update translation files for recent changes in the code. ======= #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "快捷鍵" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Hungarian" @@ -2946,12 +3062,12 @@ msgstr "Hungarian" msgid "Hybrid Wiimote" msgstr "混合 Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:523 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:526 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "IOCTL_ES_GETVIEWS：試圖取得資料從未知的標簽： %08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:795 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:793 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2963,11 +3079,11 @@ msgstr "" "標題 ID %016llx.\n" " Dolphin 可能會當" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:304 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:307 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - 損毀的目標" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "IPL 設定" @@ -2983,15 +3099,15 @@ msgstr "IR 指示器" msgid "IR Sensitivity:" msgstr "IR 靈敏度：" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:513 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:521 msgid "ISO Details" msgstr "ISO 明細" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "ISO 資料夾" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:168 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:176 msgid "ITALY" msgstr "ITALY" @@ -2999,21 +3115,23 @@ msgstr "ITALY" msgid "Icon" msgstr "圖示" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "開啟記憶體管理單元，某些遊戲需要。(ON = 兼容、OFF = 快速)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#, fuzzy 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." +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " +"Audio to throttle using the DSP (might fix audio clicks but can also cause " +"constant noise depending on the game)." msgstr "" "如果您要設定畫格數限制大於遊戲的速度 (NTSC:60, PAL:50)，您就需要同時關閉 DSP " "中的聲音節流閥才能使其生效。" @@ -3041,7 +3159,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:787 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 msgid "Import Save" msgstr "匯入存檔" @@ -3086,7 +3204,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "關閉光源。改善效能，但是如果在遊戲中需要使用光照效果則會無法作用。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "In Game" msgstr "遊戲中" @@ -3095,7 +3213,7 @@ msgid "In-Game" msgstr "遊戲中" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "訊息" @@ -3115,7 +3233,7 @@ msgstr "Insert" msgid "Insert Encrypted or Decrypted code here..." msgstr "在這裡插入被加密或已解密的代碼..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "插入 SD 卡" @@ -3127,7 +3245,7 @@ msgstr "在這裡插入名稱.." msgid "Install WAD" msgstr "安裝 WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:959 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Install to Wii Menu" msgstr "安裝至 Wii 選單" @@ -3136,6 +3254,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "調用 InstallExceptionHandler，但是這個平台尚未支援此功能。" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 @@ -3145,15 +3264,18 @@ msgstr "調用 InstallExceptionHandler，但是這個平台尚未支援此功能 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "正在安裝 WAD 至 Wii 選單..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 #, fuzzy msgid "Interface" msgstr "界面設定" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:591 msgid "Interface Settings" msgstr "界面設定" @@ -3179,11 +3301,11 @@ msgstr "內部 LZO 錯誤 - lzo_init() 失敗" msgid "Internal Resolution:" msgstr "全螢幕顯示解析度：" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:244 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "解釋器 (非常緩慢)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Intro" msgstr "標題" @@ -3200,7 +3322,7 @@ msgstr "無效的數值！" msgid "Invalid bat.map or dir entry" msgstr "無效的 bat.map 或目錄項目" -#: Source/Core/Core/Src/CoreTiming.cpp:536 +#: Source/Core/Core/Src/CoreTiming.cpp:537 #, c-format msgid "Invalid event type %i" msgstr "無效的事件類型 %i" @@ -3220,14 +3342,15 @@ msgstr "" "%s\n" " 可能需要重新轉儲這個遊戲。" -#: Source/Core/Core/Src/Movie.cpp:503 +#: Source/Core/Core/Src/Movie.cpp:540 msgid "Invalid recording file" msgstr "無效的錄像檔" -#: Source/Core/Core/Src/Core.cpp:489 +#: Source/Core/Core/Src/Core.cpp:491 msgid "Invalid state" msgstr "無效的狀態" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 @@ -3243,27 +3366,32 @@ msgstr "無效的狀態" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italian" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 msgid "JAPAN" msgstr "JAPAN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT 重編譯器 (推薦)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL 實驗性重編譯器" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:282 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japanese" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:184 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 msgid "KOREA" msgstr "KOREA" @@ -3272,8 +3400,8 @@ msgstr "KOREA" msgid "Key" msgstr "鍵" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Korean" @@ -3291,7 +3419,7 @@ msgstr "L 鈕" msgid "L-Analog" msgstr "L-類比" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "Language:" msgstr "語系：" @@ -3344,7 +3472,7 @@ msgstr "" msgid "Less Than" msgstr "小於" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "" @@ -3352,7 +3480,7 @@ msgstr "" msgid "Load" msgstr "讀取" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:539 #, fuzzy msgid "Load Custom Textures" msgstr "讀取高解析度紋理" @@ -3401,6 +3529,7 @@ msgstr "讀取儲存格 8" msgid "Load State..." msgstr "讀取進度檔..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 @@ -3410,10 +3539,14 @@ msgstr "讀取進度檔..." ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "讀取 Wii 系統選單 (%d%c)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 @@ -3423,6 +3556,9 @@ msgstr "讀取 Wii 系統選單 (%d%c)" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +>>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "讀取 Wii 系統選單 (%d%c)" @@ -3447,7 +3583,7 @@ msgstr "讀取指定檔案 (DOL,ELF,GCM,ISO,WAD)" msgid "Local" msgstr "本地" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 #, fuzzy msgid "Lock Threads to Cores" msgstr "鎖定線程至內核" @@ -3460,11 +3596,11 @@ msgstr "記錄" msgid "Log Configuration" msgstr "記錄設定" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "記錄類型" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:75 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "記錄輸出" @@ -3494,7 +3630,7 @@ msgstr "" "MD5 不符合\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU 速度修正" @@ -3516,11 +3652,11 @@ msgstr "MadCatz Gameshark 檔案(*.gcs)" msgid "Main Stick" msgstr "主搖桿" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:467 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:475 msgid "Maker ID:" msgstr "廠商 ID：" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:498 msgid "Maker:" msgstr "廠商：" @@ -3545,6 +3681,7 @@ msgstr "記憶卡(&M)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 @@ -3552,6 +3689,9 @@ msgstr "記憶卡(&M)" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "記憶卡" @@ -3586,7 +3726,7 @@ msgstr "" msgid "Menu" msgstr "選單" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 msgid "Mic" msgstr "麥克風" @@ -3596,11 +3736,11 @@ msgstr "麥克風" msgid "Min" msgstr "麥克風" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:582 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:578 msgid "Misc" msgstr "雜項" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "其它設定" @@ -3617,7 +3757,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:113 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Monospaced font" msgstr "等寬字型" @@ -3630,7 +3770,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "馬達" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:668 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:664 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3645,7 +3785,7 @@ msgstr "" msgid "Multiply" msgstr "多重分插" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3735,6 +3875,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 @@ -3744,6 +3885,9 @@ msgstr "NP Up" ======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3752,7 +3896,7 @@ msgstr "名稱：" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:13 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "名稱：" @@ -3766,7 +3910,7 @@ msgid "New Scan" msgstr "新的搜尋" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Next Page" msgstr "下一頁" @@ -3778,7 +3922,7 @@ msgstr "尋找下一個" msgid "Nickname :" msgstr "暱稱：" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:192 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:200 msgid "No Country (SDK)" msgstr "無國家 (SDK)" @@ -3818,7 +3962,7 @@ msgstr "找不到標題 %s 的存檔資料夾" msgid "None" msgstr "無" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Norwegian Bokmaal" @@ -3826,8 +3970,8 @@ msgstr "Norwegian Bokmaal" msgid "Not Equal" msgstr "不相等" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:869 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:865 msgid "Not Set" msgstr "未設定" @@ -3847,7 +3991,7 @@ msgstr "未連接" msgid "Notes" msgstr "註釋" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:14 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 msgid "Notes: " msgstr "注意：" @@ -3885,7 +4029,7 @@ msgstr "" msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "關閉" @@ -3911,11 +4055,11 @@ msgstr "僅 %d 個區塊可用" msgid "Open" msgstr "開啟" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:941 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:937 msgid "Open &containing folder" msgstr "開啟內容資料夾(&C)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Open Wii &save folder" msgstr "開啟 Wii 存檔資料夾(&S)" @@ -3937,11 +4081,11 @@ msgstr "OpenAL：找不到聲音裝置" msgid "OpenAL: can't open device %s" msgstr "OpenAL：無法開啟裝置 %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:504 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 msgid "OpenMP Texture Decoder" msgstr "" @@ -3973,7 +4117,7 @@ msgstr "" "並匯入存檔至一張新的記憶卡中\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:321 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:507 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 msgid "Other" msgstr "" @@ -4023,19 +4167,20 @@ msgstr "段落" msgid "Parameters" msgstr "參數" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "分割區 %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:293 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "修正" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "路徑" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 @@ -4048,6 +4193,10 @@ msgstr "路徑" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 +>>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "暫停" @@ -4057,7 +4206,7 @@ msgstr "暫停" msgid "Per-Pixel Lighting" msgstr "像素光源" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:349 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 msgid "Perfect" msgstr "完美" @@ -4070,6 +4219,7 @@ msgstr "版式 %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 ======= @@ -4080,6 +4230,10 @@ msgstr "版式 %d" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1630 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1631 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "執行" @@ -4093,7 +4247,7 @@ msgstr "播放錄像" msgid "Play/Pause" msgstr "執行/暫停" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Playable" msgstr "可玩" @@ -4106,6 +4260,7 @@ msgstr "選項" msgid "Players" msgstr "玩家" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 @@ -4115,6 +4270,9 @@ msgstr "玩家" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "請確認..." @@ -4126,23 +4284,23 @@ msgstr "請在儲存前建立一個新的透檢視" msgid "Plus-Minus" msgstr "Plus-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Polish" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "埠口 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "埠口 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "埠口 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:675 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "埠口 4" @@ -4151,11 +4309,11 @@ msgstr "埠口 4" msgid "Port :" msgstr "埠口：" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portuguese" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portuguese (Brazilian)" @@ -4164,17 +4322,17 @@ msgstr "Portuguese (Brazilian)" msgid "Post-Processing Effect:" msgstr "後期處理著色器：" -#: Source/Core/Core/Src/Movie.cpp:735 +#: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:829 +#: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:806 +#: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4187,7 +4345,7 @@ msgstr "預設：" msgid "Prev Page" msgstr "上一頁" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 msgid "Previous Page" msgstr "上一頁" @@ -4238,7 +4396,7 @@ msgstr "R-類比" msgid "RAM" msgstr "RAM" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:179 msgid "RUSSIA" msgstr "RUSSIA" @@ -4251,7 +4409,7 @@ msgstr "範圍" msgid "Read-only mode" msgstr "唯讀模式" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 msgid "Real" msgstr "實體" @@ -4328,6 +4486,7 @@ msgstr "更新列表" msgid "Refresh game list" msgstr "更新遊戲列表" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:416 @@ -4346,6 +4505,12 @@ msgstr "更新遊戲列表" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 +#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "移除" @@ -4398,11 +4563,11 @@ msgstr "右 搖桿" msgid "Rumble" msgstr "震動" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "在獨立的線程中執行 DSP LLE (不推薦)。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Russian" @@ -4410,10 +4575,11 @@ msgstr "Russian" msgid "Sa&ve State" msgstr "儲存進度(&V)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "安全" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 @@ -4423,6 +4589,9 @@ msgstr "安全" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "取樣率：" @@ -4480,12 +4649,12 @@ msgstr "儲存至儲存格 8" msgid "Save State..." msgstr "另存進度..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:593 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:603 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:611 msgid "Save as..." msgstr "另存為..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1263 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1259 msgid "Save compressed GCM/ISO" msgstr "儲存已壓縮的 GCM/ISO" @@ -4493,11 +4662,11 @@ msgstr "儲存已壓縮的 GCM/ISO" msgid "Save current perspective" msgstr "儲存目前版式" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1252 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1248 msgid "Save decompressed GCM/ISO" msgstr "儲存已解壓縮的 GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:585 +#: Source/Core/Core/Src/Movie.cpp:623 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "儲存的影片 %s 是損毀的，影片錄製停止..." @@ -4507,6 +4676,7 @@ msgstr "儲存的影片 %s 是損毀的，影片錄製停止..." msgid "Scaled EFB Copy" msgstr "EFB 縮放複製" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 @@ -4516,15 +4686,18 @@ msgstr "EFB 縮放複製" ======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 +>>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "正在掃瞄..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:615 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:611 msgid "Scanning for ISOs" msgstr "正在掃瞄 ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:616 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:612 msgid "Scanning..." msgstr "正在掃瞄..." @@ -4540,12 +4713,12 @@ msgstr "滾動鎖定" msgid "Search Filter" msgstr "搜索篩選" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 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:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "項目 %s 在 SYSCONF 中找不到" @@ -4555,6 +4728,7 @@ msgstr "項目 %s 在 SYSCONF 中找不到" msgid "Select" msgstr "選擇" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:749 @@ -4579,6 +4753,14 @@ msgstr "選擇已錄製的檔案" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 +msgid "Select The Recording File" +msgstr "選擇已錄製的檔案" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "選擇要安裝的 Wii WAD" @@ -4604,16 +4786,21 @@ msgstr "選擇浮動視窗" msgid "Select the file to load" msgstr "選擇要讀取的檔案" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "選擇存檔" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1470 msgid "Select the state to load" msgstr "選擇要讀取的進度" +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 @@ -4633,6 +4820,9 @@ msgstr "選擇要讀取的進度" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "選擇要儲存的進度" @@ -4653,7 +4843,7 @@ msgstr "" "強制 4:3：拉伸畫面至 4:3。\n" "拉伸至視窗：拉伸畫面充滿視窗。" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:114 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Selected font" msgstr "選擇字型" @@ -4689,11 +4879,11 @@ msgstr "傳感器位置：" msgid "Separator" msgstr "分離器" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Serbian" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "埠口 1 - 這是類似於網卡等裝置使用的埠口。" @@ -4702,11 +4892,11 @@ msgstr "埠口 1 - 這是類似於網卡等裝置使用的埠口。" msgid "Set" msgstr "設定" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:938 msgid "Set as &default ISO" msgstr "設為預設 ISO (&D)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 #, c-format msgid "Set as default Memcard %c" msgstr "設定為預設記憶卡 %c" @@ -4716,7 +4906,7 @@ msgstr "設定為預設記憶卡 %c" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "SetARCode_IsActive：索引大於 ar 代碼列表大小 %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Settings..." msgstr "設定..." @@ -4728,7 +4918,7 @@ msgstr "SetupWiiMem：無法找到設定檔" msgid "Shake" msgstr "搖晃" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:496 msgid "Short Name:" msgstr "短名：" @@ -4757,7 +4947,7 @@ msgstr "顯示工具列(&T)" msgid "Show Drives" msgstr "顯示裝置" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:524 #, fuzzy msgid "Show EFB Copy Regions" msgstr "EFB 複製範圍" @@ -4774,7 +4964,7 @@ msgstr "顯示 France" msgid "Show GameCube" msgstr "顯示 GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Show Input Display" msgstr "輸入顯示" @@ -4790,7 +4980,7 @@ msgstr "顯示 JAP" msgid "Show Korea" msgstr "顯示 Korea" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:487 msgid "Show Language:" msgstr "顯示語系：" @@ -4810,7 +5000,7 @@ msgstr "顯示平台" msgid "Show Regions" msgstr "顯示區域" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 #, fuzzy msgid "Show Statistics" msgstr "各種統計數據" @@ -4831,11 +5021,11 @@ msgstr "顯示 Wad" msgid "Show Wii" msgstr "顯示 Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "在停止遊戲後顯示一個確認框。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 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 " @@ -4845,23 +5035,23 @@ msgstr "" "關閉此選項可以阻止全部非關鍵的錯誤訊息，但是它可能導致 Dolphin 在沒有任何徵兆" "的情況下崩潰。" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show first block" msgstr "顯示第一個區塊" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save blocks" msgstr "顯示存檔區塊" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 msgid "Show save comment" msgstr "顯示存檔描述" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save icon" msgstr "顯示存檔圖示" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820 msgid "Show save title" msgstr "顯示存檔標題" @@ -4892,7 +5082,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "橫握 Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Simplified Chinese" @@ -4900,12 +5090,12 @@ msgstr "Simplified Chinese" msgid "Size" msgstr "大小" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:655 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 #, fuzzy msgid "Skip BIOS" msgstr "略過 GC BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 #, fuzzy msgid "Skip Dest. Alpha Pass" msgstr "關閉 Dest. Alpha 通道" @@ -4938,11 +5128,11 @@ msgstr "" msgid "Slot %i" msgstr "儲存格 %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "插槽 A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:660 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "插槽 B" @@ -4962,7 +5152,7 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 msgid "Sound Settings" msgstr "聲音設定" @@ -4980,6 +5170,7 @@ msgstr "聲音緩衝建立失敗：%s" msgid "Space" msgstr "Space" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 @@ -4995,6 +5186,11 @@ msgstr "Space" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Spanish" @@ -5018,7 +5214,7 @@ msgstr "" msgid "Specify a video backend" msgstr "指定影像插件" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "加速光碟傳輸率" @@ -5026,7 +5222,7 @@ msgstr "加速光碟傳輸率" msgid "Square Stick" msgstr "Square Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:80 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" msgstr "標準控制器" @@ -5119,12 +5315,12 @@ msgstr "成功匯入存檔" msgid "Swing" msgstr "揮舞" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:684 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "系統語系：" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:187 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 msgid "TAIWAN" msgstr "TAIWAN" @@ -5164,7 +5360,7 @@ msgstr "Table 右" msgid "Take Screenshot" msgstr "截取畫面" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" msgstr "" @@ -5181,7 +5377,7 @@ msgstr "紋理" msgid "Texture Cache" msgstr "清理快取" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 #, fuzzy msgid "Texture Format Overlay" msgstr "紋理格式" @@ -5198,13 +5394,13 @@ msgstr "位址無效" msgid "The checksum was successfully fixed" msgstr "校驗已經被成功修復" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "The chosen directory is already in the list" msgstr "選取的資料夾已經在列表中" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1182 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1178 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1206 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1272 #, c-format msgid "" "The file %s already exists.\n" @@ -5225,7 +5421,7 @@ msgstr "檔案 %s 無法開啟進行寫入。請確認是否有別的程式正 msgid "The file %s was already open, the file header will not be written." msgstr "檔案 %s 已經開啟，檔頭無法被寫入。" -#: Source/Core/Core/Src/Boot/Boot.cpp:313 +#: Source/Core/Core/Src/Boot/Boot.cpp:316 #, c-format msgid "The file you specified (%s) does not exist" msgstr "指定的檔案 (%s) 不存在" @@ -5247,7 +5443,7 @@ msgid "" "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." +"If unsure, use the rightmost value." msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 @@ -5285,7 +5481,7 @@ msgstr "指定的檔案 \"%s\" 不存在" msgid "The value is invalid" msgstr "這個數值無效" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:577 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "佈景主題" @@ -5293,13 +5489,13 @@ msgstr "佈景主題" msgid "Theme selection went wrong" msgstr "佈景主題選擇錯誤" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:467 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:470 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 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5313,7 +5509,7 @@ msgid "" "Replay itself." msgstr "Action replay 模擬器不支援被 Action Replay 自身修改的代碼。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "這可能會使 Wii Menu 和部分遊戲降速。" @@ -5329,24 +5525,10 @@ msgid "" msgstr "" #: 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" -"But sometimes enabling this could cause constant noise.\n" -"\n" -"Keyboard Shortcut : Hold down to instantly disable Throttle." -msgstr "" -"這是用來控制遊戲速度的聲音節流閥。\n" -"關閉這個可能會導致遊戲速度不正常，如速度過快之類。\n" -"但開啟時也許會使部份遊戲產生雜音。\n" -"\n" -"鍵盤快捷鍵 ：按住可以立即關閉節流閥。" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "This is used to play music tracks, like BGM." msgstr "這是用來播放音樂曲目，如背景音樂 (BGM) 。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5356,7 +5538,7 @@ msgstr "" "這將分離影像和 CPU 線程，所以它們可以執行於獨立的內核中。\n" "可以在多核心的 PC 上取得非常大的加速，但是也可能導致偶爾崩潰或圖片問題。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:283 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "這將允許您手工編輯 INI 設定檔案" @@ -5380,7 +5562,7 @@ msgstr "標題" msgid "To" msgstr "上方" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" msgstr "全選/全部取消" @@ -5400,6 +5582,7 @@ msgstr "切換全螢幕" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 @@ -5407,14 +5590,17 @@ msgstr "切換全螢幕" ======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "上方" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Traditional Chinese" -#: Source/Core/Core/Src/Boot/Boot.cpp:407 +#: Source/Core/Core/Src/Boot/Boot.cpp:410 msgid "Tried to load an unknown file type." msgstr "已嘗試讀取從未知的檔案類型。" @@ -5422,7 +5608,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:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "嘗試讀取從無效的 SYSCONF" @@ -5434,7 +5620,7 @@ msgstr "" "嘗試讀取從無效的 SYSCONF\n" "Wiimote bt ids 是無效的" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Turkish" @@ -5455,11 +5641,11 @@ msgstr "UDP 埠口：" msgid "UDP Wiimote" msgstr "UDP Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:195 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:203 msgid "UNKNOWN" msgstr "未知" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:182 msgid "USA" msgstr "USA" @@ -5539,7 +5725,7 @@ msgstr "更新" msgid "Upright Wiimote" msgstr "直握 Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "使用 EuRGB60 模式 (PAL60)" @@ -5552,7 +5738,7 @@ msgstr "全螢幕(&F)" msgid "Use Hex" msgstr "使用 Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:583 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "顯示錯誤提示" @@ -5573,7 +5759,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:547 msgid "Utility" msgstr "工具" @@ -5597,25 +5783,29 @@ msgstr "數值：" msgid "Verbosity" msgstr "事件" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:388 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:396 msgid "Video" msgstr "影像" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:484 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Virtual" msgstr "虛擬" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:629 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "音量" -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:496 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:525 -#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:546 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:498 +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" msgstr "WAD installation 失敗：錯誤於建立 %s" +#: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 +#, fuzzy +msgid "WAD installation failed: error creating ticket" +msgstr "WAD installation 失敗：錯誤於建立 %s" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" @@ -5630,15 +5820,15 @@ msgstr "" msgid "Warning" msgstr "警告" -#: Source/Core/Core/Src/Boot/Boot.cpp:272 +#: Source/Core/Core/Src/Boot/Boot.cpp:275 msgid "Warning - starting DOL in wrong console mode!" msgstr "警告 - DOL 啟動於錯誤的主機模式！" -#: Source/Core/Core/Src/Boot/Boot.cpp:322 +#: Source/Core/Core/Src/Boot/Boot.cpp:325 msgid "Warning - starting ELF in wrong console mode!" msgstr "警告 - ELF 啟動於錯誤的主機模式！" -#: Source/Core/Core/Src/Boot/Boot.cpp:217 +#: Source/Core/Core/Src/Boot/Boot.cpp:220 msgid "Warning - starting ISO in wrong console mode!" msgstr "警告 - ISO 啟動於錯誤的主機模式！" @@ -5666,7 +5856,7 @@ msgstr "" "以及在您記憶卡中 相同檔案名的檔案\n" "要繼續嗎？" -#: Source/Core/Core/Src/Movie.cpp:629 +#: Source/Core/Core/Src/Movie.cpp:667 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5674,7 +5864,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:646 +#: Source/Core/Core/Src/Movie.cpp:684 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5682,7 +5872,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:655 +#: Source/Core/Core/Src/Movie.cpp:693 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5710,7 +5900,7 @@ msgstr "WaveFileWriter - 檔案無法開啟。" msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:564 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Widescreen Hack" msgstr "寬螢幕修正" @@ -5718,15 +5908,15 @@ msgstr "寬螢幕修正" msgid "Width" msgstr "寬度" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:368 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:376 msgid "Wii Console" msgstr "Wii 主機" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:784 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #, fuzzy msgid "Wii NAND Root:" msgstr "DVD 根：" @@ -5735,6 +5925,7 @@ msgstr "DVD 根：" msgid "Wii Save Import" msgstr "匯入 Wii 存檔" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 @@ -5744,6 +5935,9 @@ msgstr "匯入 Wii 存檔" ======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 存檔 (*.bin)|*.bin" @@ -5811,10 +6005,11 @@ msgstr "視窗 選單" msgid "Windows Right" msgstr "視窗 右" -#: Source/Core/DolphinWX/Src/LogWindow.cpp:129 +#: Source/Core/DolphinWX/Src/LogWindow.cpp:146 msgid "Word Wrap" msgstr "自動換行" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 @@ -5830,6 +6025,11 @@ msgstr "自動換行" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 >>>>>>> Update from master branch. +======= +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 +>>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "執行中..." @@ -5837,6 +6037,11 @@ msgstr "執行中..." msgid "Write to Console" msgstr "寫入至控制台" +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#, fuzzy +msgid "Write to Debugger" +msgstr "寫入至檔案" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" msgstr "寫入至檔案" @@ -5890,7 +6095,7 @@ msgstr "您必須輸入一個有效的十進制，十六進制或八進制的數 msgid "You must enter a valid profile name." msgstr "您必須輸入一個有效的設定檔名稱。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:881 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:880 msgid "You must restart Dolphin in order for the change to take effect." msgstr "You must restart Dolphin in order for the change to take effect." @@ -5913,7 +6118,7 @@ msgstr "" "應該是 0x%04x (而非 0x%04llx)\n" "是否要建立新的檔案？" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "ZTP hack" msgstr "ZTP 修正" @@ -5967,7 +6172,7 @@ msgstr "" msgid "^ ADD" msgstr "^ 新增" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "程式讀取器 (.img)" @@ -5998,12 +6203,12 @@ msgstr "不是一個 wii 存檔或讀取檔案頭部大小失敗 %x" msgid "s" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:443 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:446 #, c-format msgid "unknown cmd 0x%08x" msgstr "未知的 cmd 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1062 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1070 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute 返回 -1 在應用程式執行時！" @@ -6188,6 +6393,9 @@ msgstr "| 或" #~ msgid "Emulator Display Settings" #~ msgstr "模擬器顯示設定" +#~ msgid "Enable Audio Throttle" +#~ msgstr "開啟聲音節流閥" + #~ msgid "Enable CPU Access" #~ msgstr "開啟 CPU 存取" @@ -6497,6 +6705,19 @@ msgstr "| 或" #~ msgid "The file " #~ msgstr "檔案" +#~ msgid "" +#~ "This is used to control game speed by sound throttle.\n" +#~ "Disabling this could cause abnormal game speed, such as too fast.\n" +#~ "But sometimes enabling this could cause constant noise.\n" +#~ "\n" +#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." +#~ msgstr "" +#~ "這是用來控制遊戲速度的聲音節流閥。\n" +#~ "關閉這個可能會導致遊戲速度不正常，如速度過快之類。\n" +#~ "但開啟時也許會使部份遊戲產生雜音。\n" +#~ "\n" +#~ "鍵盤快捷鍵 ：按住可以立即關閉節流閥。" + #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "這通常是用來播放聲音和聲音效果。" From a7d142bed976166a157d1913a73cf882f03d8e17 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Fri, 9 Mar 2012 17:46:58 -0600 Subject: [PATCH 14/14] Rebase in preparation for merge. --- Languages/po/ar.po | 908 ------------------- Languages/po/ca.po | 703 --------------- Languages/po/cs.po | 1260 -------------------------- Languages/po/de.po | 694 -------------- Languages/po/dolphin-emu.pot | 692 -------------- Languages/po/el.po | 1649 ---------------------------------- Languages/po/en.po | 692 -------------- Languages/po/es.po | 898 ------------------ Languages/po/fr.po | 1248 ------------------------- Languages/po/he.po | 692 -------------- Languages/po/hu.po | 895 ------------------ Languages/po/it.po | 694 -------------- Languages/po/ja.po | 738 --------------- Languages/po/ko.po | 700 --------------- Languages/po/nb.po | 694 -------------- Languages/po/nl.po | 694 -------------- Languages/po/pl.po | 776 ---------------- Languages/po/pt.po | 703 --------------- Languages/po/pt_BR.po | 792 ---------------- Languages/po/ru.po | 694 -------------- Languages/po/sr.po | 692 -------------- Languages/po/tr.po | 747 --------------- Languages/po/zh_CN.po | 694 -------------- Languages/po/zh_TW.po | 694 -------------- 24 files changed, 19643 deletions(-) diff --git a/Languages/po/ar.po b/Languages/po/ar.po index 08cfb17be9..38454acd02 100644 --- a/Languages/po/ar.po +++ b/Languages/po/ar.po @@ -7,29 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< 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" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" -<<<<<<< HEAD -"PO-Revision-Date: 2011-07-20 13:33+0300\n" -"Last-Translator: \n" ->>>>>>> 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" -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "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" "Language: \n" "MIME-Version: 1.0\n" @@ -440,13 +420,6 @@ msgid "Accurate VBeam emulation" msgstr "Accurate VBeam emulation" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 -<<<<<<< HEAD -<<<<<<< HEAD -======= -#, fuzzy ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Arabic and Japanese translations. msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -558,27 +531,9 @@ msgstr "أضف باتش" msgid "Add new pane" msgstr "إضافة جزء جديد" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "أضف" @@ -632,23 +587,8 @@ msgstr "All GC/Wii images (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "جميع ملفات الجيم كيوب (gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "حفظ جميع الحالات (sav, s##)" @@ -676,24 +616,9 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -<<<<<<< HEAD -<<<<<<< HEAD -msgid "Alternate Wiimote Timing" -msgstr "بديل ويموت" -======= -#, fuzzy -msgid "Alternate Wiimote Timing" -msgstr "محاكاة ويموت" ->>>>>>> Update translation files for recent changes in the code. -======= -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Alternate Wiimote Timing" msgstr "بديل ويموت" ->>>>>>> Update Arabic and Japanese translations. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -748,19 +673,7 @@ msgstr "هل أنت متأكد أنك تريد حذف هذه الملف؟ " msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "هل أنت متأكد أنك تريد حذف هذه الملفات؟" -<<<<<<< HEAD -<<<<<<< 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/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "نسبة العرض :" @@ -782,19 +695,7 @@ msgstr "صوت الخلفية :" msgid "AudioCommon: Error opening AO device.\n" msgstr "" -<<<<<<< HEAD -<<<<<<< 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/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "تلقائي" @@ -909,19 +810,7 @@ msgid "Blue Right" msgstr "اليمين أزرق" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "أسفل" @@ -954,15 +843,7 @@ 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" @@ -1026,33 +907,11 @@ msgstr "إلغاء" msgid "Cannot open %s" msgstr "لا يمكن فتح %s" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:721 -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 -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1225,21 +1084,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< 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 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "إغلاق" @@ -1347,15 +1193,7 @@ 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 "توصيل" @@ -1547,21 +1385,8 @@ msgstr "الصوت" msgid "DSP Emulator Engine" msgstr "محرك محاكي الصوت" -<<<<<<< HEAD -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulation (سريع)" @@ -1798,19 +1623,7 @@ msgstr "" msgid "Divide" msgstr "انقسام" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "هل تريد اغلق اللعبة الحالية؟" @@ -1839,39 +1652,12 @@ msgstr "إعدادات تحكم الوي" msgid "Dolphin FIFO" msgstr "دولفين" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "إعدادات تحكم الجيم كيوب" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1965,27 +1751,9 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Dutch" @@ -2117,41 +1885,15 @@ msgstr "BAT تمكين" msgid "Enable Block Merging" msgstr "تمكين منع الدمج" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -msgid "Enable Bounding Box Calculation" -msgstr "" - -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "تمكين تنظيم حساب الإطار" ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "تمكين التخزين المؤقت" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "تمكين الاسرار " @@ -2299,27 +2041,9 @@ msgstr "" msgid "End" msgstr "نهاية" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "English" @@ -2348,45 +2072,10 @@ msgstr "المساواة" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -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/ConfigMain.cpp:1173 msgid "Error" msgstr "خطأ" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "خطأ في تحميل اللغة المختارة. يتراجع إلى النظام الافتراضية." @@ -2831,27 +2520,9 @@ msgstr "إطارات لتسجيل" msgid "Free Look" msgstr "تحكم بكاميرا اللعبة" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "French" @@ -2880,11 +2551,6 @@ msgstr "GCI File(*.gci)" msgid "GCMic Configuration" msgstr "GCMic اعدادات" -#: Source/Core/DolphinWX/Src/GCMicDlg.h:44 -#, fuzzy -msgid "GCMic Configuration" -msgstr "سجل الإعدادات" - #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" msgstr "تحكم الجيم كيوب" @@ -2922,19 +2588,7 @@ msgid "Gamecube &Pad Settings" msgstr "إعدادات تحكم جيم كيوب" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "بطاقه ذاكره الجيم كيوب (*.raw,*.gcp) " @@ -2959,21 +2613,8 @@ msgstr "" "(إما غير رمز سيئة أو نوع رمز غير مدعومة حتى الآن.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: 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/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "عام" @@ -2982,27 +2623,9 @@ msgstr "عام" msgid "General Settings" msgstr "الإعدادات العامة" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "German" @@ -3024,13 +2647,6 @@ msgid "Greater Than" msgstr "أكبر من" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -<<<<<<< HEAD -<<<<<<< HEAD -======= -#, fuzzy ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Arabic and Japanese translations. msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -3139,21 +2755,8 @@ msgid "Hotkey Configuration" 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 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "الاختصارات" @@ -3220,11 +2823,8 @@ 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:323 msgid "" @@ -3369,19 +2969,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "wad تثبيت" @@ -3460,27 +3048,9 @@ msgstr "تسجيل الملف غير صالح" msgid "Invalid state" msgstr "غير صالح حالة" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italian" @@ -3633,35 +3203,11 @@ msgstr "8 تحميل حالة" msgid "Load State..." msgstr "تحميل حالة" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "تحميل قائمة نظام الوي" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "تحميل قائمة نظام الوي" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "تحميل قائمة نظام الوي %d%c" @@ -3741,15 +3287,7 @@ 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 "العصا الأيسر" @@ -3780,19 +3318,7 @@ msgid "Memory Byte" msgstr "ذاكرة بايت" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "بطاقة الذاكرة" @@ -3988,19 +3514,7 @@ msgstr "التبويب" msgid "NP Up" msgstr "فوق" -<<<<<<< HEAD -<<<<<<< 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/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4087,15 +3601,7 @@ 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 "غير متصل" @@ -4156,14 +3662,7 @@ 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 "فتح" @@ -4294,23 +3793,8 @@ msgstr "باتش" msgid "Paths" msgstr "مسارات" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: 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/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "وقفة" @@ -4330,23 +3814,8 @@ msgstr "مشهد %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "بدأ اللعبه" @@ -4372,19 +3841,7 @@ msgstr "خيارات التشغيل" msgid "Players" msgstr "لاعبين" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "يرجى تأكيد" @@ -4595,31 +4052,10 @@ msgstr "تحديث قائمة" msgid "Refresh game list" msgstr "تحديث القائمة" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "إزالة" @@ -4638,14 +4074,7 @@ msgid "Render to Main Window" 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 "إعادة ضبط" @@ -4688,19 +4117,7 @@ msgstr "حفظ الحالة" msgid "Safe" msgstr "آمنة" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "معدل العينة :" @@ -4782,26 +4199,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Scaled EFB Copy" -<<<<<<< HEAD -<<<<<<< HEAD msgstr "EFB Copia a escala" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 -<<<<<<< HEAD -======= -msgstr "" -======= -msgstr "EFB Copia a escala" ->>>>>>> Update Arabic and Japanese translations. - -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "فحص %s" @@ -4841,39 +4241,12 @@ msgstr "" msgid "Select" msgstr "حدد" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "اختر ملف تسجيل" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "لتثبيت wad حدد ملف" @@ -4899,13 +4272,7 @@ msgstr "اختر النوافذ العائمة" msgid "Select the file to load" msgstr "حدد الملف لتحميل" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "حدد حفظ الملف" @@ -4913,29 +4280,7 @@ msgstr "حدد حفظ الملف" msgid "Select the state to load" msgstr "حدد حالة التحميل" -<<<<<<< HEAD -#: 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: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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "حدد حالة الحفظ" @@ -5309,27 +4654,9 @@ msgstr "فشل إنشاء المخزن المؤقت الصوت : %s" msgid "Space" msgstr "مجال" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Spanish" @@ -5373,15 +4700,7 @@ 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" @@ -5416,14 +4735,7 @@ msgstr "عصا" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: 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 "اغلق اللعبه" @@ -5500,57 +4812,25 @@ msgstr "الجدول الأيمن" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: 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:82 msgid "TaruKonga (Bongos)" -<<<<<<< HEAD -msgstr "" -======= msgstr "TaruKonga (Bongos)" ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" msgstr "اختبار" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 -<<<<<<< HEAD -<<<<<<< HEAD msgid "Texture" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 msgid "Texture Cache" -<<<<<<< HEAD -msgstr "" -======= -#, fuzzy -======= ->>>>>>> Update Arabic and Japanese translations. -msgid "Texture" -msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 -msgid "Texture Cache" -<<<<<<< HEAD -msgstr "إزالة التخزين المؤقت" ->>>>>>> Update translation files for recent changes in the code. -======= -msgstr "" ->>>>>>> Update Arabic and Japanese translations. -======= msgstr "Texture Cache" ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 msgid "Texture Format Overlay" @@ -5752,31 +5032,12 @@ 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 -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "أعلى" @@ -5883,21 +5144,6 @@ 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 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"مؤشر غير معروف %#08x\n" -"مواصلة?" - ->>>>>>> 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" @@ -6055,44 +5301,6 @@ msgstr "" "%s\n" "ولها نفس اسم الملف على بطاقة ذاكرة الخاصة بك\n" "تستمر?" -<<<<<<< HEAD - -#: 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 "" -======= ->>>>>>> Update Arabic and Japanese translations. #: Source/Core/Core/Src/Movie.cpp:667 #, c-format @@ -6162,19 +5370,7 @@ msgstr "Wii NAND Root:" msgid "Wii Save Import" msgstr "استيراد حفظ الوي" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "ملفات حفظ الوي (*.bin)|*.bin" @@ -6205,15 +5401,7 @@ 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 "ويموت متصل" @@ -6245,27 +5433,9 @@ msgstr "نوافذ اليمين" msgid "Word Wrap" msgstr "كلمة ختامية" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "العمل" @@ -6501,19 +5671,10 @@ msgstr "أو" #~ msgid "< as Default Profile >" #~ msgstr "< الوضع الافتراضي >" -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update Arabic and Japanese translations. #, fuzzy #~ msgid "AOSound" #~ msgstr "&الصوت" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Arabic and Japanese translations. #~ msgid "Accurate Texture Cache" #~ msgstr "دقة المظهر السطحي المؤقت" @@ -6551,10 +5712,6 @@ msgstr "أو" #~ "the EFB scale.\n" #~ "ومن الأفضل ل تعيين نسبة العرض إلى الارتفاع لتمتد عند استخدامه." -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update Arabic and Japanese translations. #~ msgid "Bad gameini filename" #~ msgstr "Nombre de archivo gameini incorrecto" @@ -6582,27 +5739,13 @@ 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 "إعدادات" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Arabic and Japanese translations. #~ msgid "Configuration profile" #~ msgstr "التكوين الشخصي" @@ -6706,10 +5849,6 @@ msgstr "أو" #~ msgid "Enable CPU Access" #~ msgstr "CPU Access تمكين" -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update Arabic and Japanese translations. #~ msgid "Enable Copy to EFB" #~ msgstr "Habilitar Copiado al EFB" @@ -6725,21 +5864,12 @@ msgstr "أو" #~ msgid "Enable JIT Dynarec" #~ msgstr "تمكين صفحات" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Arabic and Japanese translations. #~ msgid "Enable OpenCL" #~ msgstr "OpenCL تمكين " #~ msgid "Enable Screen Saver (burn-in reduction)" #~ msgstr "تمكين شاشة التوقف" -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update Arabic and Japanese translations. #, fuzzy #~ msgid "" #~ "Enables dynamic recompilation of DSP code.\n" @@ -6813,11 +5943,6 @@ msgstr "أو" #~ msgid "Force Bi/Trilinear Filtering" #~ msgstr "Forzar Filtro Bi/Tri-linear" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Arabic and Japanese translations. #~ msgid "Fractional" #~ msgstr "جزئي" @@ -6960,10 +6085,6 @@ msgstr "أو" #~ msgid "Required for using the Japanese ROM font." #~ msgstr "اللازمة لاستعمال الخط القرص اليابانية." -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update Arabic and Japanese translations. #, fuzzy #~ msgid "Run" #~ msgstr "Enter" @@ -6971,11 +6092,6 @@ msgstr "أو" #~ msgid "Running script...\n" #~ msgstr "Ejecutando script...\n" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Arabic and Japanese translations. #~ msgid "Scale:" #~ msgstr "النطاق :" @@ -7033,10 +6149,6 @@ msgstr "أو" #~ "عرض إحصاءات مختلفة.\n" #~ "وهذا مفيد فقط لأغراض التصحيح." -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update Arabic and Japanese translations. #~ msgid "Skies of Arcadia" #~ msgstr "Skies of Arcadia" @@ -7076,21 +6188,12 @@ msgstr "أو" #~ msgid "Specify an audio plugin" #~ msgstr "حدد الخلفية ملف فيديو" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Arabic and Japanese translations. #~ msgid "Start Renderer in Fullscreen" #~ msgstr "بدء في كمال ملء الشاشة" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "بدء التقديم في إطار وضع ملء الشاشة." -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update Arabic and Japanese translations. #~ msgid "The file " #~ msgstr "El archivo " @@ -7117,10 +6220,6 @@ msgstr "أو" #~ msgid "Type %d config not supported in plugin %s" #~ msgstr "Configuración de tipo %d no soportado en el plugin %s" -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. #~ msgid "" #~ "Unknown pointer %#08x\n" #~ "Continue?" @@ -7128,13 +6227,6 @@ 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 2cdcaf6800..25d8f756a8 100644 --- a/Languages/po/ca.po +++ b/Languages/po/ca.po @@ -7,19 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< 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. -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-08-19 08:36-0500\n" "Last-Translator: Jordi Coma \n" "Language-Team: Catalan \n" @@ -576,27 +564,9 @@ msgstr "Afegeix Pegat" msgid "Add new pane" msgstr "Afegeix un nou panell" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Afegir ..." @@ -664,23 +634,8 @@ 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 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Tots els Estats (savi, s##\")" @@ -769,19 +724,7 @@ 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 -<<<<<<< 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/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Relació d'aspecte:" @@ -803,19 +746,7 @@ msgstr "Suport d'àudio:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error en obrir el dispositiu AO \n" -<<<<<<< HEAD -<<<<<<< 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/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -931,19 +862,7 @@ msgid "Blue Right" msgstr "Blau dret" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Abaix" @@ -976,15 +895,7 @@ 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" @@ -1239,21 +1150,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< 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 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Tancar" @@ -1361,15 +1259,7 @@ 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 ..." @@ -1559,21 +1449,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "Motor d'emulació DSP" -<<<<<<< HEAD -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulació DSP HLE (ràpid)" @@ -1812,19 +1689,7 @@ msgstr "" msgid "Divide" msgstr "Divideix" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Voleu aturar l'emulació actual?" @@ -1853,39 +1718,12 @@ msgstr "Configuració de Wiimote emulat" msgid "Dolphin FIFO" msgstr "FIFO Dolphin" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Configuració del control GC Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin Pel·lícules TAS (*.dtm)" @@ -1982,27 +1820,9 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Holandès" @@ -2143,40 +1963,15 @@ msgstr "Habilitar les millors tècniques disponibles" msgid "Enable Block Merging" msgstr "Habilitar fusió de Bloc" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. 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 -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Activar Trucs" @@ -2329,27 +2124,9 @@ msgstr "" msgid "End" msgstr "Fi" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Anglès" @@ -2378,45 +2155,10 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -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/ConfigMain.cpp:1173 msgid "Error" msgstr "Error" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2885,27 +2627,9 @@ msgstr "Imatges a Enregistrar" msgid "Free Look" msgstr "Visió lliure" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Francès" @@ -2972,19 +2696,7 @@ msgid "Gamecube &Pad Settings" msgstr "Configuració control «&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 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Targetes de memòria per GameCube (*.raw, *.gcp)" @@ -3009,21 +2721,8 @@ msgstr "" "(Pot ser un codi incorrecte o el tipus de codi encara no està suportat.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: 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/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "General" @@ -3032,27 +2731,9 @@ msgstr "General" msgid "General Settings" msgstr "Configuració General" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Alemany" @@ -3186,21 +2867,8 @@ msgid "Hotkey Configuration" 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 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Tecles d'accés" @@ -3427,19 +3095,7 @@ msgstr "" "InstallExceptionHandler cridat, però aquesta plataforma no està suportada " "encara." -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Instal·lant WAD ..." @@ -3521,27 +3177,9 @@ msgstr "Enregistrament de fitxer invàlid" msgid "Invalid state" msgstr "Estat invàlid" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italià" @@ -3699,35 +3337,11 @@ msgstr "Carregar ranura d'estat 8" msgid "Load State..." msgstr "Carregar Estat..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "Carregar el menú del sistema Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar menú del sistema Wii %d%c" @@ -3809,15 +3423,7 @@ 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" @@ -3848,19 +3454,7 @@ msgid "Memory Byte" msgstr "Byte de memòria" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Targeta de memòria" @@ -4060,19 +3654,7 @@ msgstr "NP Tabulador" msgid "NP Up" msgstr "NP Amunt" -<<<<<<< HEAD -<<<<<<< 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/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4159,15 +3741,7 @@ 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" @@ -4228,14 +3802,7 @@ 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" @@ -4366,23 +3933,8 @@ msgstr "Pegats" msgid "Paths" msgstr "Camins" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: 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/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -4402,23 +3954,8 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Executar" @@ -4444,19 +3981,7 @@ msgstr "Opcions de reproducció" msgid "Players" msgstr "Jugadors" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Confirmeu ..." @@ -4668,31 +4193,10 @@ msgstr "Actualitzar llista" msgid "Refresh game list" msgstr "Actualitza la llista de jocs" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Treure" @@ -4711,14 +4215,7 @@ msgid "Render to Main Window" 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" @@ -4761,19 +4258,7 @@ msgstr "&Desa l'estat" msgid "Safe" msgstr "Segur" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Freqüència de mostreig:" @@ -4857,19 +4342,7 @@ msgstr "La pal·lícula guardada %s és corrupta, s'atura la gravació..." msgid "Scaled EFB Copy" msgstr "Copia EFB escalada" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Escanejant %s" @@ -4909,39 +4382,12 @@ msgstr "La secció %s no trobada a SYSCONF" msgid "Select" msgstr "Seleccionar" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Seleccionar el fitxer de gravació" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Seleccionar un fitxer WAD de Wii per instal·lar" @@ -4966,26 +4412,7 @@ msgstr "Seleccioneu finestres flotants" msgid "Select the file to load" msgstr "Seleccioneu el fitxer a carregar" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -msgid "Select the save file" -msgstr "Seleccioneu el fitxer de partida desada" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Seleccioneu el fitxer de partida desada" @@ -4993,16 +4420,7 @@ msgstr "Seleccioneu el fitxer de partida desada" msgid "Select the state to load" msgstr "Seleccioneu l'estat a carregar" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Seleccioneu l'estat a desar" @@ -5385,27 +4803,9 @@ msgstr "Ha fallat la creació del buffer de so: %s" msgid "Space" msgstr "Espai" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Espanyol" @@ -5450,15 +4850,7 @@ 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" @@ -5493,14 +4885,7 @@ msgstr "Palanca" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: 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" @@ -5577,14 +4962,7 @@ msgstr "Taula dreta" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: 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" @@ -5817,31 +5195,12 @@ 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 -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Dalt" @@ -5951,21 +5310,6 @@ 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 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Punter desconegud %#08x\n" -"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" @@ -6195,19 +5539,7 @@ msgstr "Arrel de la NAND:" msgid "Wii Save Import" msgstr "Importar partida guardada Wii" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Arxius de partida guardada Wii (*.bin)|*.bin" @@ -6238,15 +5570,7 @@ 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" @@ -6278,27 +5602,9 @@ msgstr "Finestra dreta" msgid "Word Wrap" msgstr "Envoltant de paraula" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Treballant ..." @@ -6878,10 +6184,6 @@ msgstr "| O" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Iniciar la finestra de renderitzat a pantalla completa." -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" @@ -6902,11 +6204,6 @@ 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 d9d24e6b40..597af6dc22 100644 --- a/Languages/po/cs.po +++ b/Languages/po/cs.po @@ -7,35 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< 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" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" -"PO-Revision-Date: 2011-08-10 20:37+0100\n" ->>>>>>> Update translation files for recent changes in the code. -======= -"POT-Creation-Date: 2011-08-10 08:30-0500\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" ->>>>>>> The actual update of the Greek and Czech translations. The last commit -"PO-Revision-Date: 2011-10-15 14:50+0100\n" ->>>>>>> Update Greek and Czech translations -======= -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "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" @@ -453,19 +426,7 @@ msgstr "Přesnost:" msgid "Accurate VBeam emulation" msgstr "Precizní emulace VBeam" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 -<<<<<<< HEAD -======= -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 ->>>>>>> Update Greek and Czech translations -#, fuzzy ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 ->>>>>>> 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 " @@ -591,39 +552,9 @@ msgstr "Přidat Záplatu" msgid "Add new pane" msgstr "Přidat nový panel" -<<<<<<< HEAD -<<<<<<< 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 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: 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/ConfigMain.cpp:747 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Přidat..." @@ -691,33 +622,8 @@ msgstr "Všechny obrazy GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Všechny soubory Gamecube GCM )gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: 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:1457 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update Greek and Czech translations -======= -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Všechny Uložené Stavy (sav, s##)" @@ -745,33 +651,11 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -<<<<<<< HEAD -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ->>>>>>> Update the pot file to reflect recent changes in the code. -msgid "Alternate Wiimote Timing" -msgstr "Střídat časování Wiimote" -======= -#, fuzzy -msgid "Alternate Wiimote Timing" -msgstr "Emulovaný Wiimote" ->>>>>>> Update translation files for recent changes in the code. - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Alternate Wiimote Timing" msgstr "Střídat časování Wiimote" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 ->>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Anisotropic Filtering:" msgstr "Anizotropní Filtrování:" @@ -826,28 +710,8 @@ 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 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 -======= -#: 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/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 ->>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Aspect Ratio:" msgstr "Poměr Stran:" @@ -868,28 +732,8 @@ 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 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 -======= -#: 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/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 ->>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Auto" msgstr "Auto" @@ -1002,30 +846,8 @@ msgstr "Modrá vlevo" msgid "Blue Right" msgstr "Modrá vpravo" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< 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:272 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 ->>>>>>> Update Greek and Czech translations -======= -#: 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Dole" @@ -1058,25 +880,7 @@ msgstr "Procházet pro výstupní adresář" msgid "Buffer:" msgstr "Vyrovnávací paměť:" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< 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/DolphinWX/Src/UDPConfigDiag.cpp:23 -======= ->>>>>>> Update Greek and Czech translations -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 -======= ->>>>>>> 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" @@ -1317,29 +1121,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= -#: 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 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Zavřít" @@ -1447,23 +1230,7 @@ msgstr "Připojit Wiimote 3" msgid "Connect Wiimote 4" msgstr "Připojit Wiimote 4" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< 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:608 ->>>>>>> Update Greek and Czech translations -======= -#: 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..." @@ -1652,31 +1419,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "Jádro Emulátoru DSP" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< 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:248 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 ->>>>>>> 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulace (rychlé)" @@ -1915,27 +1659,7 @@ msgstr "" msgid "Divide" msgstr "Rozdělit" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< 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:1051 ->>>>>>> Update Greek and Czech translations -======= -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Chcete současnou emulaci zastavit?" @@ -1964,55 +1688,12 @@ msgstr "Nastavení Emulovaného Dolphin Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1202 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GCPad Nastavení" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 ->>>>>>> Update Greek and Czech translations -======= -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Nastavení" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Doplhin Filmy TAS (*.dtm)" @@ -2108,39 +1789,9 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odškrtnuté." -<<<<<<< HEAD -<<<<<<< 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 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: 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/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Nizozemština" @@ -2279,49 +1930,15 @@ msgstr "Zapnout BAT" msgid "Enable Block Merging" msgstr "Zapnout Slučování Bloků" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. 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 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -======= ->>>>>>> Update Greek and Czech translations -======= ->>>>>>> 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Povolit Cheaty" @@ -2477,39 +2094,9 @@ msgstr "" msgid "End" msgstr "End" -<<<<<<< HEAD -<<<<<<< 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 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: 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/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Angličtina" @@ -2536,66 +2123,13 @@ msgstr "Záznam 1/%d" msgid "Equal" msgstr "Rovná se" -<<<<<<< HEAD -<<<<<<< HEAD #: 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 "Chyba" - -#: 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 Greek and Czech translations -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -======= ->>>>>>> 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: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 ->>>>>>> Update Greek and Czech translations -======= -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "Chyba" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 ->>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Error loading selected language. Falling back to system default." msgstr "" "Chyba při nahrávání zvoleného jazyka. Vracím se na výchozí jazyk systému." @@ -3063,39 +2597,9 @@ msgstr "Snímky k Nahrání" msgid "Free Look" msgstr "Rozhlížení pomocí myši" -<<<<<<< HEAD -<<<<<<< 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 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: 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/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Francouzština" @@ -3160,30 +2664,8 @@ msgstr "Gamecube" msgid "Gamecube &Pad Settings" msgstr "Nastavení Gamecube &Pad" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< 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:1007 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD ->>>>>>> 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Paměťové karty Gamecube (*.raw,*.gcp)" @@ -3207,31 +2689,10 @@ msgstr "" "Nelze spustit GeckoKód (CT%i CST%i) (%s)\n" "(buď špatný kód, nebo typ kódu není ještě podporován.)" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: 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/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:200 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: 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" msgstr "Obecné" @@ -3239,39 +2700,9 @@ msgstr "Obecné" msgid "General Settings" msgstr "Obecná Nastavení" -<<<<<<< HEAD -<<<<<<< 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 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: 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/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Němčina" @@ -3292,19 +2723,7 @@ msgstr "Grafická nastavení" msgid "Greater Than" msgstr "Větší než" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -<<<<<<< HEAD -======= -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 ->>>>>>> Update Greek and Czech translations -#, fuzzy ->>>>>>> Update translation files for recent changes in the code. -======= -#: 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" @@ -3412,32 +2831,9 @@ msgstr "Hostovat" msgid "Hotkey Configuration" msgstr "Nastavení klávesových zkratek" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: 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/ConfigMain.cpp:570 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 ->>>>>>> Update Greek and Czech translations -======= -#: 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Klávesové zkratky" @@ -3662,27 +3058,7 @@ msgstr "" "Byl zavolán InstallExceptionHandler, ale tato platforma toto ještě " "nepodporuje." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< 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:1361 ->>>>>>> Update Greek and Czech translations -======= -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Instaluji WAD..." @@ -3764,39 +3140,9 @@ msgstr "Neplatný soubor s nahrávkou" msgid "Invalid state" msgstr "Neplatný stav" -<<<<<<< HEAD -<<<<<<< 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 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: 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/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italština" @@ -3954,51 +3300,11 @@ msgstr "Nahrát Slot Stavu 8" msgid "Load State..." msgstr "Nahrát Stav..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -msgstr "Nahrát Systémové Menu Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1400 -msgid "Load Wii System Menu" -msgstr "Nahrát Systémové Menu Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "Nahrát Systémové Menu Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Nahrát Systémové Menu Wii %d%c" @@ -4080,23 +3386,7 @@ msgstr "MMU Hack Rychlosti" msgid "MadCatz Gameshark files(*.gcs)" 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 ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Greek and Czech translations -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 -======= ->>>>>>> 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" @@ -4126,30 +3416,8 @@ msgstr "Pam. karta již otevřena" msgid "Memory Byte" msgstr "Bajt Paměti" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< 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:84 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 ->>>>>>> Update Greek and Czech translations -======= -#: 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Paměťová karta" @@ -4347,26 +3615,7 @@ msgstr "NK Tab" msgid "NP Up" msgstr "NK Nahoru" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< 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. -======= ->>>>>>> Update Greek and Czech translations -======= -#: 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/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4453,23 +3702,7 @@ msgstr "Nerovná se" msgid "Not Set" msgstr "Nenastaven" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< 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:607 ->>>>>>> Update Greek and Czech translations -======= -#: 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" @@ -4528,24 +3761,9 @@ msgstr "Logická Adresa:" msgid "Only %d blocks available" msgstr "Pouze bloky %d jsou dostupné" -<<<<<<< HEAD -#: 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/FrameTools.cpp:433 ->>>>>>> Update Greek and Czech translations -======= #: 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" @@ -4675,31 +3893,8 @@ msgstr "Záplaty" msgid "Paths" msgstr "Cesty" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Greek and Czech translations -======= -#: 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/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pozastavit" @@ -4717,37 +3912,10 @@ msgstr "Dokonalá" msgid "Perspective %d" msgstr "Perspektiva %d" -<<<<<<< HEAD -#: 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:1612 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1613 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 ->>>>>>> Update Greek and Czech translations -======= #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Spustit" @@ -4773,27 +3941,7 @@ msgstr "Možnosti Přehrávání" msgid "Players" msgstr "Hráči" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< 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:1052 ->>>>>>> Update Greek and Czech translations -======= -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Prosím potvrďte..." @@ -5004,45 +4152,10 @@ msgstr "Obnovit Seznam" msgid "Refresh game list" msgstr "Obnovit seznam her" -<<<<<<< HEAD -<<<<<<< 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 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: 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/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Odstranit" @@ -5060,18 +4173,6 @@ msgstr "" msgid "Render to Main Window" msgstr "Vykreslit do Hlavního okna" -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Greek and Czech translations -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 -======= ->>>>>>> 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 @@ -5112,36 +4213,11 @@ msgstr "Ruština" msgid "Sa&ve State" msgstr "Uložit Sta&v" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 -msgid "Safe" -msgstr "Bezpečná" - -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -======= -======= ->>>>>>> Update Greek and Czech translations -======= ->>>>>>> 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. -======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 msgid "Safe" msgstr "Bezpečná" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Vzorkovací frekvence:" @@ -5221,32 +4297,11 @@ msgstr "Uložit dekomprimované GCM/ISO" msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Uložený stav filmu %s je poškozen, nahrávání filmu je zastaveno..." -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Scaled EFB Copy" msgstr "EFB Kopie Změněné Velikosti" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 -======= -======= ->>>>>>> Update Greek and Czech translations -======= ->>>>>>> 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. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Skenuji %s" @@ -5286,47 +4341,12 @@ msgstr "Sekce %s nebyla v SYSCONF nalezena" msgid "Select" msgstr "Vybrat" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "Vyberte Soubor s Nahrávkou" - -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1349 ->>>>>>> Update Greek and Czech translations -======= -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Vyberte Soubor s Nahrávkou" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Vyberte soubor Wii WAD k instalování" @@ -5352,34 +4372,7 @@ msgstr "Vybrat plovoucí okna" msgid "Select the file to load" msgstr "Vyberte soubor k nahrání" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -msgid "Select the save file" -msgstr "Vyberte soubor s uloženou hrou" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -msgstr "Vyberte stav k nahrání" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1306 ->>>>>>> Update Greek and Czech translations -======= -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Vyberte soubor s uloženou hrou" @@ -5387,24 +4380,7 @@ msgstr "Vyberte soubor s uloženou hrou" msgid "Select the state to load" msgstr "Vyberte stav k nahrání" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1469 ->>>>>>> Update Greek and Czech translations -======= -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Vyberte stav k uložení" @@ -5783,39 +4759,9 @@ msgstr "Vytvoření vyrovnávací paměti zvuku selhalo: %s" msgid "Space" msgstr "Mezerník" -<<<<<<< HEAD -<<<<<<< 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 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: 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/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Španělština" @@ -5859,22 +4805,7 @@ msgstr "Čtvercový Stick" msgid "Standard Controller" msgstr "Standardní Ovladač" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< 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. -======= ->>>>>>> Update Greek and Czech translations -======= -#: 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" @@ -5906,26 +4837,10 @@ msgstr "Ukládání stavu" msgid "Stick" msgstr "Stick" -<<<<<<< HEAD -#: 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/FrameTools.cpp:438 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 ->>>>>>> Update Greek and Czech translations -======= #: 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" @@ -6001,22 +4916,8 @@ msgstr "Deska vpravo" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> 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" @@ -6245,25 +5146,6 @@ msgstr "Do" msgid "Toggle All Log Types" msgstr "Zapnout Všechny Typy Záznamů" -<<<<<<< HEAD -#: 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. -msgid "Toggle Fullscreen" -msgstr "Přepnout na Celou Obrazovku" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -======= ->>>>>>> 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 @@ -6271,19 +5153,7 @@ msgid "Toggle Fullscreen" msgstr "Přepnout na Celou Obrazovku" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Nahoře" @@ -6392,29 +5262,6 @@ 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 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Neznámý ukazatel %#08x\n" -"Pokračovat?" - -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 -======= ->>>>>>> Update Greek and Czech translations -#: 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" @@ -6663,27 +5510,7 @@ msgstr "Wii Kořen NAND:" msgid "Wii Save Import" msgstr "Import uložených pozic Wii" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< 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:1308 ->>>>>>> Update Greek and Czech translations -======= -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii soubory s uložením (*.bin)|*.bin" @@ -6714,23 +5541,7 @@ msgstr "" "nebo je to vypršení limitu neaktivity, nebo z jiného důvodu.\n" "Chcete ho hned znovu připojit?" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< 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:609 ->>>>>>> Update Greek and Czech translations -======= -#: 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" @@ -6762,35 +5573,9 @@ msgstr "Klávesa Windows Vpravo" msgid "Word Wrap" msgstr "Zalamování textu" -<<<<<<< HEAD -<<<<<<< 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1362 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Pracuji..." @@ -7419,12 +6204,6 @@ msgstr "| NEBO" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Spustí vykreslovací okno v režimu celé obrazovky." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" @@ -7446,45 +6225,6 @@ msgstr "| NEBO" #~ "Neznámý ukazatel %#08x\n" #~ "Pokračovat?" -<<<<<<< HEAD -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#~ 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" -#~ "\n" -#~ "If unsure, leave this checked." -#~ msgstr "" -#~ "Ukládat EFB kopie do objektů textury grafického procesoru.\n" -#~ "Toto není přesné, ale pro většinu her funguje dostatečně dobře a dává " -#~ "větší zrychlení než EFB do RAM.\n" -#~ "\n" -#~ "Pokud si nejste jisti, nechejte toto odškrtnuté." - -#~ msgid "Texture" -#~ msgstr "Textura" - -#~ msgid "Texture Cache" -#~ msgstr "Vyrovnávací Paměť Textur" - -#~ msgid "" -#~ "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 "" -#~ "Čím bezpečnější toto bude, tím bude méně pravděpodobné, že emulátoru " -#~ "budou chybět jakékoliv aktualizace textur z RAM.\n" -#~ "\n" -#~ "Pokud si nejste jisti, použijte druhou nejrychlejší hodnotu zprava." - ->>>>>>> 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 6ed4fa1ca7..c37a4a9f10 100644 --- a/Languages/po/de.po +++ b/Languages/po/de.po @@ -7,19 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< 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. -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-02-17 01:23+0100\n" "Last-Translator: LucasX \n" "Language-Team: \n" @@ -563,27 +551,9 @@ msgstr "Patch hinzufügen" msgid "Add new pane" msgstr "Neue Palette hinzufügen" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Hinzufügen..." @@ -652,23 +622,8 @@ msgstr "Alle GC/Wii Images (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Alle Gamecube GCM Dateien (gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Alle Speicherstände (sav, s##)" @@ -751,19 +706,7 @@ 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 -<<<<<<< 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/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Seitenverhältnis:" @@ -785,19 +728,7 @@ msgstr "Audio Backend:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Fehler beim öffnen des AO-Gerätes.\n" -<<<<<<< HEAD -<<<<<<< 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/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automatisch" @@ -911,19 +842,7 @@ msgid "Blue Right" msgstr "Blau rechts" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Unten" @@ -956,15 +875,7 @@ 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" @@ -1201,21 +1112,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< 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 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Schließen" @@ -1324,15 +1222,7 @@ 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..." @@ -1523,21 +1413,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "DSP Emulator Engine" -<<<<<<< HEAD -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE Emulation (schnell)" @@ -1762,19 +1639,7 @@ msgstr "" msgid "Divide" msgstr "Dividieren" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Laufende Emulation stoppen?" @@ -1804,39 +1669,12 @@ msgstr "Dolphin Emulierte-Wiimote Einstellungen" msgid "Dolphin FIFO" msgstr "Dolphin" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Konfiguration" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Filme (*.dtm)" @@ -1924,27 +1762,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Holländisch" @@ -2068,41 +1888,16 @@ msgstr "BAT aktivieren" msgid "Enable Block Merging" msgstr "Blockvereinigung aktivieren" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. 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 -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Cheats aktivieren" @@ -2241,27 +2036,9 @@ msgstr "" msgid "End" msgstr "Ende" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Englisch" @@ -2290,45 +2067,10 @@ msgstr "Gleich" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -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/ConfigMain.cpp:1173 msgid "Error" msgstr "Fehler" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2799,27 +2541,9 @@ msgstr "" msgid "Free Look" msgstr "Frei Umsehen" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Französisch" @@ -2888,19 +2612,7 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube-&Pad Einstellungen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube Memory Cards (*.raw,*.gcp)" @@ -2926,21 +2638,8 @@ msgstr "" "unterstützt.)" #: 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 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Allgemein" @@ -2950,27 +2649,9 @@ msgstr "Allgemein" msgid "General Settings" msgstr "Interface Einstellungen" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Deutsch" @@ -3095,21 +2776,8 @@ msgid "Hotkey Configuration" 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 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Tastenkürzel" @@ -3326,19 +2994,7 @@ msgstr "" "InstallExceptionHandler aufgerufen, aber diese Platform unterstüzt diesn " "noch nicht." -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Installing WAD..." msgstr "WAD ins Wii-Menü installieren..." @@ -3424,27 +3080,9 @@ msgstr "Ungültige Aufnahmedatei" msgid "Invalid state" msgstr "Ungültiger Status" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italienisch" @@ -3603,36 +3241,12 @@ msgstr "Status aus Slot 8 laden" msgid "Load State..." msgstr "Status laden..." -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "Wii-Menü laden (%d %c)" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii-Menü laden (%d %c)" @@ -3717,15 +3331,7 @@ 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" @@ -3757,19 +3363,7 @@ msgid "Memory Byte" msgstr "Speicher" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Memory Card" @@ -3956,19 +3550,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Hoch" -<<<<<<< HEAD -<<<<<<< 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/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4056,15 +3638,7 @@ 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" @@ -4125,14 +3699,7 @@ 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" @@ -4264,23 +3831,8 @@ msgstr "Patches" msgid "Paths" msgstr "Pfade" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: 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/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -4301,23 +3853,8 @@ msgstr "Perspektive %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Start" @@ -4344,19 +3881,7 @@ msgstr "Optionen" msgid "Players" msgstr "Spieler" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Bitte Bestätigen..." @@ -4572,31 +4097,10 @@ msgstr "Liste aktualisieren" msgid "Refresh game list" msgstr "Spieleliste aktualisieren" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Entfernen" @@ -4615,14 +4119,7 @@ msgid "Render to Main Window" 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" @@ -4665,19 +4162,7 @@ msgstr "S&tatus speichern" msgid "Safe" msgstr "Sicher" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Abtastrate:" @@ -4762,19 +4247,7 @@ msgstr "Film-Status %s ist fehlerhaft, breche die Filmaufnahme ab..." msgid "Scaled EFB Copy" msgstr "EFB Scaled Copy" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "Suche..." @@ -4814,39 +4287,12 @@ msgstr "Ausgewähltes %s nicht gefunden in SYSCONF" msgid "Select" msgstr "Auswählen" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Aufnahmedatei auswählen" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Speicherdatei zum Importieren auswählen" @@ -4873,13 +4319,7 @@ msgstr "Wähle unverankerte Fenster" msgid "Select the file to load" msgstr "Datei zum Laden auswählen" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Wii-Spielstand auswählen" @@ -4887,29 +4327,7 @@ msgstr "Wii-Spielstand auswählen" msgid "Select the state to load" msgstr "Status zum Laden auswählen" -<<<<<<< HEAD -#: 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: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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Status zum Speichern auswählen" @@ -5265,27 +4683,9 @@ msgstr "Erstellen des Sound-Buffer fehlgeschlagen: %s" msgid "Space" msgstr "Leertaste" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Spanisch" @@ -5321,15 +4721,7 @@ 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" @@ -5364,14 +4756,7 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: 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" @@ -5444,14 +4829,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: 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" @@ -5681,31 +5059,12 @@ 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 -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Oben" @@ -5810,21 +5169,6 @@ 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 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Unbekanter Pointer %#08x\n" -"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" @@ -6039,19 +5383,7 @@ msgstr "DVD Laufwerk:" msgid "Wii Save Import" msgstr "Wii Spielstand importieren" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii Speicherdateien (*.bin)|*.bin" @@ -6082,15 +5414,7 @@ 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" @@ -6123,27 +5447,9 @@ msgstr "Windows Rechts" msgid "Word Wrap" msgstr "Zeilenumbruch" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Arbeite..." diff --git a/Languages/po/dolphin-emu.pot b/Languages/po/dolphin-emu.pot index 0f5636c238..3bfb569233 100644 --- a/Languages/po/dolphin-emu.pot +++ b/Languages/po/dolphin-emu.pot @@ -8,19 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< 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. -======= "POT-Creation-Date: 2012-03-09 16:56-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -518,27 +506,9 @@ msgstr "" msgid "Add new pane" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "" @@ -592,23 +562,8 @@ msgstr "" msgid "All Gamecube GCM files (gcm)" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "" @@ -686,19 +641,7 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" -<<<<<<< HEAD -<<<<<<< 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/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -720,19 +663,7 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" -<<<<<<< HEAD -<<<<<<< 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/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "" @@ -840,19 +771,7 @@ msgid "Blue Right" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "" @@ -885,15 +804,7 @@ 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" @@ -1113,21 +1024,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< 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 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "" @@ -1235,15 +1133,7 @@ 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 "" @@ -1417,21 +1307,8 @@ msgstr "" msgid "DSP Emulator Engine" msgstr "" -<<<<<<< HEAD -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "" @@ -1649,19 +1526,7 @@ msgstr "" msgid "Divide" msgstr "" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "" @@ -1690,39 +1555,12 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1805,27 +1643,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "" @@ -1944,40 +1764,15 @@ msgstr "" msgid "Enable Block Merging" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. 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 -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "" @@ -2103,27 +1898,9 @@ msgstr "" msgid "End" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "" @@ -2152,45 +1929,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -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/ConfigMain.cpp:1173 msgid "Error" msgstr "" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2615,27 +2357,9 @@ msgstr "" msgid "Free Look" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "" @@ -2701,19 +2425,7 @@ msgid "Gamecube &Pad Settings" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2736,21 +2448,8 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: 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/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2759,27 +2458,9 @@ msgstr "" msgid "General Settings" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "" @@ -2894,21 +2575,8 @@ msgid "Hotkey Configuration" 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 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "" @@ -3099,19 +2767,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "" @@ -3188,27 +2844,9 @@ msgstr "" msgid "Invalid state" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "" @@ -3359,35 +2997,11 @@ msgstr "" msgid "Load State..." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -3464,15 +3078,7 @@ 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 "" @@ -3503,19 +3109,7 @@ msgid "Memory Byte" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "" @@ -3692,19 +3286,7 @@ msgstr "" msgid "NP Up" msgstr "" -<<<<<<< HEAD -<<<<<<< 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/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3791,15 +3373,7 @@ 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 "" @@ -3860,14 +3434,7 @@ 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 "" @@ -3993,23 +3560,8 @@ msgstr "" msgid "Paths" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: 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/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "" @@ -4029,23 +3581,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "" @@ -4071,19 +3608,7 @@ msgstr "" msgid "Players" msgstr "" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "" @@ -4289,31 +3814,10 @@ msgstr "" msgid "Refresh game list" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "" @@ -4329,14 +3833,7 @@ msgid "Render to Main Window" 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 "" @@ -4379,19 +3876,7 @@ msgstr "" msgid "Safe" msgstr "" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "" @@ -4475,19 +3960,7 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "" @@ -4527,39 +4000,12 @@ msgstr "" msgid "Select" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "" @@ -4582,26 +4028,7 @@ msgstr "" msgid "Select the file to load" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -msgid "Select the save file" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "" @@ -4609,16 +4036,7 @@ msgstr "" msgid "Select the state to load" msgstr "" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "" @@ -4952,27 +4370,9 @@ msgstr "" msgid "Space" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "" @@ -5008,15 +4408,7 @@ 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" @@ -5051,14 +4443,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: 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 "" @@ -5130,14 +4515,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: 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 "" @@ -5340,31 +4718,12 @@ 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 -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "" @@ -5466,19 +4825,6 @@ msgstr "" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -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" @@ -5683,19 +5029,7 @@ msgstr "" msgid "Wii Save Import" msgstr "" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5722,15 +5056,7 @@ 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 "" @@ -5762,27 +5088,9 @@ msgstr "" msgid "Word Wrap" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "" diff --git a/Languages/po/el.po b/Languages/po/el.po index 74d89374e1..2f7ef538fc 100644 --- a/Languages/po/el.po +++ b/Languages/po/el.po @@ -7,31 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-12-18 13:39-0600\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" -"PO-Revision-Date: 2011-09-13 17:28+0200\n" ->>>>>>> Update translation files for recent changes in the code. -======= -"POT-Creation-Date: 2011-08-10 08:30-0500\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" ->>>>>>> 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" @@ -447,49 +424,15 @@ msgstr "Σχετικά με το Dolphin" msgid "Acceleration" msgstr "Επιτάχυνση" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 -msgid "Accuracy:" -<<<<<<< HEAD -msgstr "Ακρίβεια:" -======= -msgstr "" ->>>>>>> Update translation files for recent changes in the code. - -======= ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 -msgid "Accuracy:" -msgstr "Ακρίβεια:" - ->>>>>>> The actual update of the Greek and Czech translations. The last commit -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 -======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:467 msgid "Accuracy:" msgstr "Ακρίβεια:" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Accurate VBeam emulation" msgstr "Ακριβής VBeam εξομοίωση" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 -<<<<<<< HEAD -======= -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 ->>>>>>> Update Greek and Czech translations -#, fuzzy ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 ->>>>>>> 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 " @@ -617,39 +560,9 @@ msgstr "Προσθήκη Patch" msgid "Add new pane" msgstr "Προσθήκη νέου pane" -<<<<<<< HEAD -<<<<<<< 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 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: 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/ConfigMain.cpp:747 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Προσθήκη..." @@ -705,33 +618,8 @@ msgstr "Όλες οι εικόνες GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Όλα τα αρχεία Gamecube GCM (gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: 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:1457 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update Greek and Czech translations -======= -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Όλα τα Σημεία Αποθήκευσης(sav, s##)" @@ -759,33 +647,11 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -<<<<<<< HEAD -msgid "Alternate Wiimote Timing" -msgstr "Εναλλακτικός Χρονισμός Wiimote" -======= -#, fuzzy -msgid "Alternate Wiimote Timing" -msgstr "Εξομοιωμένο Wiimote" ->>>>>>> Update translation files for recent changes in the code. - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Alternate Wiimote Timing" msgstr "Εναλλακτικός Χρονισμός Wiimote" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 ->>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Anisotropic Filtering:" msgstr "Ανισοτροπικό Φιλτράρισμα:" @@ -842,28 +708,8 @@ msgstr "" "Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το αρχείο; Θα εξαφανιστεί για " "πάντα!" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725 -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 -======= -#: 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:" msgstr "Αναλογία Οθόνης:" @@ -884,28 +730,8 @@ msgstr "Backend Ήχου:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Σφάλμα ανοίγματος AO συσκευής.\n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 -======= -#: 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" msgstr "Αυτόματα" @@ -932,10 +758,6 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Automatically generate mipmaps rather than decoding them from memory.\n" @@ -943,26 +765,12 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -"Δημιουργεί αυτόματα τα mipmaps αντί να τα αποκωδικοποιεί από την μνήμη.\n" -"Αυξάνει λίγο τις επιδόσεις, αλλά μπορεί να προκαλέσει μικρά ελαττώματα στις " -"υφές.\n" -"\n" -"Αν δεν είστε σίγουροι, αφήστε το επιλεγμένο." -======= ->>>>>>> Update translation files for recent changes in the code. - -======= ->>>>>>> Update Greek and Czech translations -======= "Δημιουργεί αυτόματα τα mipmaps αντί να τα αποκωδικοποιεί από την μνήμη.\n" "Αυξάνει λίγο τις επιδόσεις, αλλά μπορεί να προκαλέσει μικρά ελαττώματα στις " "υφές.\n" "\n" "Αν δεν είστε σίγουροι, αφήστε το επιλεγμένο." ->>>>>>> The actual update of the Greek and Czech translations. The last commit #: Source/Core/DolphinWX/Src/WXInputBase.cpp:27 msgid "Back" msgstr "Πίσω" @@ -1038,30 +846,8 @@ msgstr "Αριστερό Μπλε" msgid "Blue Right" msgstr "Δεξί Μπλε" -<<<<<<< HEAD -<<<<<<< HEAD #: 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:272 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 ->>>>>>> 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Βάση" @@ -1094,25 +880,7 @@ msgstr "Εύρεση φακέλου προορισμού" msgid "Buffer:" msgstr "Buffer:" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< 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/DolphinWX/Src/UDPConfigDiag.cpp:23 -======= ->>>>>>> Update Greek and Czech translations -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 -======= ->>>>>>> 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" @@ -1313,33 +1081,13 @@ msgstr "Επιλέξτε ένα αρχείο για άνοιγμα" msgid "Choose a memory card:" msgstr "Επιλέξτε μια κάρτα μνήμης:" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 ->>>>>>> Update the pot file to reflect recent changes in the code. 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:776 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 @@ -1375,29 +1123,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559 -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= -#: 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 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Κλείσιμο" @@ -1505,23 +1232,7 @@ msgstr "Σύνδεση Wiimote 3" msgid "Connect Wiimote 4" msgstr "Σύνδεση Wiimote 4" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< 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:608 ->>>>>>> Update Greek and Czech translations -======= -#: 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 "Γίνεται Σύνδεση..." @@ -1640,32 +1351,12 @@ msgstr "Δημιουργία νέας οπτικής" msgid "Created by KDE-Look.org" msgstr "Δημιουργήθηκε από KDE-Look.org" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 ->>>>>>> Update the pot file to reflect recent changes in the code. 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:498 msgid "Created by VistaIcons.com" @@ -1736,31 +1427,8 @@ msgstr "Ήχος (DSP)" msgid "DSP Emulator Engine" msgstr "Μηχανή Εξομοίωσης DSP" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< 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:248 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 ->>>>>>> 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE εξομοίωση (γρήγορη)" @@ -1999,27 +1667,7 @@ msgstr "" msgid "Divide" msgstr "Divide" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< 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:1051 ->>>>>>> Update Greek and Czech translations -======= -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Θέλετε να σταματήσετε την τρέχουσα εξομοίωση;" @@ -2048,55 +1696,12 @@ msgstr "Ρυθμίσεις Εξοιμοιωμένου Dolphin Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1202 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -msgid "Dolphin GCPad Configuration" -msgstr "Ρυθμίσεις Dolphin GCPad" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:742 -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 ->>>>>>> Update Greek and Czech translations -======= -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Ρυθμίσεις Dolphin GCPad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Ταινίες (*.dtm)" @@ -2108,51 +1713,21 @@ 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. Κάντε διπλό κλίκ εδώ για εύρεση αρχείων..." ->>>>>>> The actual update of the Greek and Czech translations. The last commit - -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 -======= -#: 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 @@ -2224,39 +1799,9 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." -<<<<<<< HEAD -<<<<<<< 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 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: 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/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Ολλανδικά" @@ -2397,51 +1942,15 @@ msgstr "Ενεργοποίηση BAT" msgid "Enable Block Merging" msgstr "Ενεργοποίηση Block Merging" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. 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 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 -#, fuzzy -msgid "Enable Cache" -msgstr "Ενεργοποίηση Cheat" - -======= ->>>>>>> Update Greek and Czech translations -======= ->>>>>>> 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Ενεργοποίηση Cheat" @@ -2542,33 +2051,13 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 ->>>>>>> Update the pot file to reflect recent changes in the code. 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:319 msgid "" @@ -2618,39 +2107,9 @@ msgstr "" msgid "End" msgstr "Τέλος" -<<<<<<< HEAD -<<<<<<< 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 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: 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/ConfigMain.cpp:262 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Αγγλικά" @@ -2677,91 +2136,19 @@ msgstr "Εγγραφή 1/%d" msgid "Equal" msgstr "Ίσο" -<<<<<<< HEAD -<<<<<<< HEAD #: 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 "Σφάλμα" - -#: 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 Greek and Czech translations -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -======= ->>>>>>> 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:1175 -msgid "Error" -msgstr "Σφάλμα" - -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -#: Source/Core/DolphinWX/Src/Main.cpp:346 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:356 ->>>>>>> Update Greek and Czech translations -msgid "Error loading selected language. Falling back to system default." -msgstr "" -"Αποτυχία φόρτωσης της επιλεγμένης γλώσσας. Επαναφορά στην προεπιλογή " -"συστήματος." -<<<<<<< HEAD -======= -#: Source/Core/DolphinWX/Src/Main.cpp:346 -msgid "Error loading selected language. Falling back to system default." -msgstr "Αποτυχία φόρτωσης της επιλεγμένης γλώσσας. Επαναφορά στην προεπιλογή συστήματος." ->>>>>>> The actual update of the Greek and Czech translations. The last commit - -#: 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 "" -======= ->>>>>>> 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 in PlayWiimote. %u != %u, byte %d.\n" -"Sorry, Wii recording is temporarily broken." -msgstr "" - -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "Σφάλμα" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "Αποτυχία φόρτωσης της επιλεγμένης γλώσσας. Επαναφορά στην προεπιλογή " "συστήματος." -<<<<<<< HEAD -#: Source/Core/Common/Src/ChunkFile.h:180 ->>>>>>> Update from master branch. -======= #: Source/Core/Common/Src/ChunkFile.h:194 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " @@ -3038,47 +2425,19 @@ msgstr "Αποτυχία εγγραφής της κεφαλίδας για το msgid "Failed to write header for file %d" msgstr "Αποτυχία εγγραφής της κεφαλίδας για το αρχείο %d" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 -msgid "Fast" -<<<<<<< HEAD -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475 -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Farsi" msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Fast" ->>>>>>> The actual update of the Greek and Czech translations. The last commit msgstr "Γρήγορη" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Fast Mipmaps" msgstr "Γρήγορα Mipmaps" -<<<<<<< HEAD -======= -msgstr "" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Fast Mipmaps" -msgstr "" ->>>>>>> Update translation files for recent changes in the code. - -======= ->>>>>>> Update Greek and Czech translations -======= - ->>>>>>> The actual update of the Greek and Czech translations. The last commit -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Fast version of the MMU. Does not work for every game." msgstr "Γρήγορη έκδοση του MMU. Δε δουλεύει για όλα τα παιχνίδια." @@ -3252,39 +2611,9 @@ msgstr "Καρέ Προς Εγγραφή" msgid "Free Look" msgstr "Ελεύθερη Ματιά" -<<<<<<< HEAD -<<<<<<< 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 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: 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/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Γαλλικά" @@ -3350,30 +2679,8 @@ msgstr "Gamecube" msgid "Gamecube &Pad Settings" msgstr "Ρυθμίσεις Gamecube &Pad" -<<<<<<< HEAD -<<<<<<< HEAD #: 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:1007 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD ->>>>>>> Update Greek and Czech translations -======= -#: 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Κάρτες Μνήμης Gamecube (*.raw,*.gcp)" @@ -3397,31 +2704,10 @@ msgstr "" "Ο Κωδικός Gecko απέτυχε να εκτελεστεί (CT%i CST%i) (%s)\n" "(ή είναι ένας κακός κωδικός ή ο τύπος του κωδικού δεν υποστηρίζεται.)" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: 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/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:200 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: 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" msgstr "Γενικά" @@ -3429,39 +2715,9 @@ msgstr "Γενικά" msgid "General Settings" msgstr "Γενικές Ρυθμίσεις" -<<<<<<< HEAD -<<<<<<< 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 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: 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/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Γερμανικά" @@ -3484,19 +2740,7 @@ msgstr "Ρυθμίσεις Γραφικών" msgid "Greater Than" msgstr "Μεγαλύτερο από" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -<<<<<<< HEAD -======= -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 ->>>>>>> Update Greek and Czech translations -#, fuzzy ->>>>>>> Update translation files for recent changes in the code. -======= -#: 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" @@ -3606,32 +2850,9 @@ msgstr "Host" msgid "Hotkey Configuration" msgstr "Ρυθμίσεις Πλήκτρων Συντόμευσης" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< 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/ConfigMain.cpp:570 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 ->>>>>>> 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 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Πλήκτρα Συντόμευσης" @@ -3712,34 +2933,12 @@ msgstr "" "Αν τα FPS διακυμαίνονται, αυτή η επιλογή μπορείο να βοηθήσει. (Ενεργό = " "Συμβατό, Ανενεργό = Γρήγορο)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -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." -======= -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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 #, fuzzy msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " "constant noise depending on the game)." ->>>>>>> Update the pot file to reflect recent changes in the code. msgstr "" "Αν θέσετε τιμή υψηλότερη από την πλήρη ταχύτητα του παιχνιδιού (NTSC:60, " "PAL:50),\n" @@ -3882,27 +3081,7 @@ msgstr "" "InstallExceptionHandler καλέστηκε, αλλά αυτή η πλατφόρμα δεν το υποστηρίζει " "ακόμα." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< 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:1361 ->>>>>>> Update Greek and Czech translations -======= -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Γίνεται εγκατάσταση WAD..." @@ -3984,39 +3163,9 @@ msgstr "Μη έγκυρο αρχείο εγγραφής" msgid "Invalid state" msgstr "Μη έγκυρο κατάσταση" -<<<<<<< HEAD -<<<<<<< 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 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: 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/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Ιταλικά" @@ -4174,51 +3323,11 @@ msgstr "Φόρτωση Σημείου Αποθήκευσης 8" msgid "Load State..." msgstr "Φόρτωση Σημείου Αποθήκευσης..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Φόρτωση Μενού Συστήματος Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -msgstr "Φόρτωση Μενού Συστήματος Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1400 -msgid "Load Wii System Menu" -msgstr "Φόρτωση Μενού Συστήματος Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "Φόρτωση Μενού Συστήματος Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Φόρτωση Μενού Συστήματος Wii %d%c" @@ -4300,23 +3409,7 @@ msgstr "MMU Speed Hack" msgid "MadCatz Gameshark files(*.gcs)" msgstr "Αρχεία MadCatz Gameshark (*.gcs)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< 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. -======= ->>>>>>> Update Greek and Czech translations -#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 -======= ->>>>>>> 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" @@ -4346,30 +3439,8 @@ msgstr "Η κάρτα μνήμης είναι ήδη ανοιχτή" msgid "Memory Byte" msgstr "Memory Byte" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< 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:84 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Κάρτα Μνήμης" @@ -4569,26 +3640,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< 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. -======= ->>>>>>> Update Greek and Czech translations -======= -#: 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/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4675,23 +3727,7 @@ msgstr "Όχι ίσο" msgid "Not Set" msgstr "Μη Ορισμένο" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< 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:607 ->>>>>>> Update Greek and Czech translations -======= -#: 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 "Μη Συνδεδεμένο" @@ -4750,24 +3786,9 @@ msgstr "Offset:" msgid "Only %d blocks available" msgstr "Διαθέσιμα μόνο %d μπλοκ" -<<<<<<< HEAD -#: 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/FrameTools.cpp:433 ->>>>>>> Update Greek and Czech translations -======= #: 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 "Άνοιγμα" @@ -4899,31 +3920,8 @@ msgstr "Patches" msgid "Paths" msgstr "Φάκελοι" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606 ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Greek and Czech translations -======= -#: 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/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Παύση" @@ -4941,37 +3939,10 @@ msgstr "Τέλειο" msgid "Perspective %d" msgstr "Οπτική %d" -<<<<<<< HEAD -#: 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:1612 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1613 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 ->>>>>>> Update Greek and Czech translations -======= #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Αναπαραγωγή" @@ -4997,27 +3968,7 @@ msgstr "Ρυθμίσεις Αναπαραγωγής" msgid "Players" msgstr "Παίχτες" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< 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:1052 ->>>>>>> Update Greek and Czech translations -======= -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Παρακαλώ επιβεβαιώστε..." @@ -5228,45 +4179,10 @@ msgstr "Ανανέωση Λίστας" msgid "Refresh game list" msgstr "Ανανέωση λίστας παιχνιδιών" -<<<<<<< HEAD -<<<<<<< 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 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: 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/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Αφαίρεση" @@ -5284,18 +4200,6 @@ msgstr "" msgid "Render to Main Window" msgstr "Αναπαραγωγή στο Κεντρικό Παράθυρο" -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -======= ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Greek and Czech translations -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 -======= ->>>>>>> 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 @@ -5336,38 +4240,11 @@ msgstr "Ρώσικα" msgid "Sa&ve State" msgstr "Απ&οθήκευση Σημείου Αποθήκευσης" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 -======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 ->>>>>>> Update the pot file to reflect recent changes in the code. -msgid "Safe" -<<<<<<< HEAD -msgstr "Ασφαλής" - -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 -<<<<<<< HEAD -======= -msgstr "" - -======= ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 msgid "Safe" 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Ρυθμός Δειγματοληψίας:" @@ -5453,27 +4330,7 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "Κλιμακούμενα EFB Αντίγραφα" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 -msgid "Scaled EFB Copy" -<<<<<<< HEAD -msgstr "Κλιμακούμενα EFB Αντίγραφα" -======= -msgstr "" ->>>>>>> Update translation files for recent changes in the code. - -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Ανίχνευση %s" @@ -5513,47 +4370,12 @@ msgstr "Η ενότητα %s δε βρέθηκε στο SYSCONF" msgid "Select" msgstr "Επιλογή" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "Επιλέξτε το Αρχείο Εγγραφής" - -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1349 ->>>>>>> Update Greek and Czech translations -======= -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Επιλέξτε το Αρχείο Εγγραφής" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Επιλέξτε ένα Wii WAD αρχείο για εγκατάσταση" @@ -5579,15 +4401,7 @@ msgstr "Επιλέξτε αιωρούμενα παράθυρα" msgid "Select the file to load" msgstr "Επιλέξτε το αρχείο για φόρτωση" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Επιλέξτε αρχείο αποθήκευσης" @@ -5595,43 +4409,7 @@ msgstr "Επιλέξτε αρχείο αποθήκευσης" msgid "Select the state to load" msgstr "Επιλέξτε το σημείο φόρτωσης" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1306 ->>>>>>> Update Greek and Czech translations -======= -#: 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:1473 -msgid "Select the state to load" -msgstr "Επιλέξτε το σημείο φόρτωσης" - -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1469 ->>>>>>> Update Greek and Czech translations -======= -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Επιλέξτε το σημείο αποθήκευσης" @@ -5707,32 +4485,12 @@ msgstr "Διαχωριστής" msgid "Serbian" msgstr "Σερβικά" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 ->>>>>>> Update the pot file to reflect recent changes in the code. 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" @@ -5955,16 +4713,7 @@ msgstr "Παράλειψη Dest. Alpha Pass" msgid "Skip EFB Access from CPU" msgstr "Παράλειψη EFB Πρόσβασης από τη CPU" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 -<<<<<<< HEAD -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 ->>>>>>> Update Greek and Czech translations -======= -#: 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" @@ -5993,46 +4742,6 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 -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" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Επιταχύνει ελαφρώς τα EFB σε RAM αντίγραφα θυσιάζοντας την ακρίβεια της " -"εξομοίωσης.\n" -"Μερικές φορές μπορεί να βελτιώσει την οπτική ποιότητα.\n" -"Αν αντιμετωπίζετε προβλήματα, δοκιμάστε να αυξήσετε την ακρίβεια της cache " -"υφών ή απενεργοποιήστε αυτήν την επιλογή.\n" -======= -msgid "" -"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" ->>>>>>> Update translation files for recent changes in the code. -"\n" -"Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 -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" -"\n" -"If unsure, leave this unchecked." -msgstr "" - -======= ->>>>>>> Update Greek and Czech translations #: Source/Core/DolphinWX/Src/FrameTools.cpp:387 #: Source/Core/DolphinWX/Src/FrameTools.cpp:399 #, c-format @@ -6086,39 +4795,9 @@ msgstr "Αποτυχία δημιουργίας buffer ήχου: %s" msgid "Space" msgstr "Space" -<<<<<<< HEAD -<<<<<<< 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 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: 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/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Ισπανικά" @@ -6163,22 +4842,7 @@ msgstr "Τετράγωνο Stick" msgid "Standard Controller" msgstr "Τυπικός Controller" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< 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. -======= ->>>>>>> Update Greek and Czech translations -======= -#: 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" @@ -6210,54 +4874,14 @@ msgstr "Σημεία Αποθήκευσης" msgid "Stick" msgstr "Stick" -<<<<<<< HEAD -#: 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/FrameTools.cpp:438 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 ->>>>>>> Update Greek and Czech translations -======= #: 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 "Διακοπή" -<<<<<<< HEAD -<<<<<<< HEAD -#: 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" -"\n" -"If unsure, leave this checked." -msgstr "" -<<<<<<< HEAD -"Αποθήκευση των EFB αντιγράφων σε GPU αντικείμενα υφών.\n" -"Αυτό δεν είναι τόσο ακριβές, αλλά δουλεύει αρκετά καλά για τα περισσότερα " -"παιχνίδια και προσφέρει μεγάλη επιτάχυνση σε σχέση με EFB σε RAM.\n" -"\n" -"Αν δεν είστε σίγουροι, αφήστε το επιλεγμένο." -======= ->>>>>>> Update translation files for recent changes in the code. - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 ->>>>>>> Update Greek and Czech translations -======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Store EFB copies in GPU texture objects.\n" @@ -6273,7 +4897,6 @@ msgstr "" "Αν δεν είστε σίγουροι, αφήστε το επιλεγμένο." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 ->>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Stretch to Window" msgstr "Προσαρμογή στο Παράθυρο" @@ -6330,22 +4953,8 @@ msgstr "Δεξί Table" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -<<<<<<< HEAD -<<<<<<< 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. -======= ->>>>>>> Update Greek and Czech translations -======= -#: 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 "Δημιουργία Στιγμιότυπου" @@ -6357,43 +4966,15 @@ msgstr "" msgid "Test" msgstr "Τέστ" -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 -<<<<<<< HEAD -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 ->>>>>>> The actual update of the Greek and Czech translations. The last commit msgid "Texture" msgstr "Υφή" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 msgid "Texture Cache" msgstr "Cache Υφών" -<<<<<<< HEAD -======= -#, fuzzy -msgid "Texture" -msgstr "Εξαγωγή Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455 -#, fuzzy -msgid "Texture Cache" -msgstr "Καθαρισμός Cache" ->>>>>>> Update translation files for recent changes in the code. - -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 -======= -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 ->>>>>>> Update Greek and Czech translations -======= - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -======= #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Texture Format Overlay" msgstr "Επικάλυψη Του Format Υφών" @@ -6469,24 +5050,6 @@ msgstr "" "\n" "Αν δεν είστε σίγουροι, χρησιμοποιήστε την δεύτερη γρηγορότερη τιμή από δεξιά." -<<<<<<< HEAD -#: 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" -"\n" -"If unsure, use the second-fastest value from the right." -msgstr "" -<<<<<<< HEAD -"Όσο πιο ασφαλής είναι αυτή η ρύθμιση, τόσο λιγότερο πιθανό ο εξομοιωτής να " -"χάσει ανανεώσεις των υφών από την RAM.\n" -"\n" -"Αν δεν είστε σίγουροι, χρησιμοποιήστε την δεύτερη γρηγορότερη τιμή από δεξιά." -======= ->>>>>>> Update translation files for recent changes in the code. - -======= ->>>>>>> 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 "" @@ -6628,25 +5191,6 @@ msgstr "Εώς" msgid "Toggle All Log Types" msgstr "Εναλλαγή Όλων Τύπων Καταγραφής " -<<<<<<< HEAD -#: 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. -msgid "Toggle Fullscreen" -msgstr "Εναλλαγή Πλήρους Οθόνης" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update translation files for recent changes in the code. -======= -======= ->>>>>>> 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 @@ -6654,19 +5198,7 @@ msgid "Toggle Fullscreen" msgstr "Εναλλαγή Πλήρους Οθόνης" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Κορυφή" @@ -6776,29 +5308,6 @@ 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 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Άγνωστος δείκτης %#08x\n" -"Συνέχεια;" - -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 -======= ->>>>>>> Update Greek and Czech translations -#: 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" @@ -7029,27 +5538,7 @@ msgstr "Wii NAND Ρίζα:" msgid "Wii Save Import" msgstr "Εισαγωγή Αποθήκευσης Wii" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< 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:1308 ->>>>>>> Update Greek and Czech translations -======= -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Αρχεία αποθήκευσης Wii (*.bin)|*.bin" @@ -7080,23 +5569,7 @@ msgstr "" "ή πιθανόν να οφείλεται σε χρόνο αδράνειας ή κάποιον άλλο λόγο.\n" "Θέλετε να γίνει άμεση επανασύνδεση;" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< 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:609 ->>>>>>> Update Greek and Czech translations -======= -#: 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" @@ -7128,35 +5601,9 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "Αναδίπλωση Λέξεων" -<<<<<<< HEAD -<<<<<<< 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1362 ->>>>>>> Update Greek and Czech translations -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> The actual update of the Greek and Czech translations. The last commit -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Σε εργασία..." @@ -7373,12 +5820,6 @@ msgstr "zNear Διόρθωση: " msgid "| OR" msgstr "| OR" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. #~ msgid "Cannot record movies in read-only mode." #~ msgstr "" #~ "Δεν μπορεί να γίνει εγγραφή ταινιών σε λειτουργία μόνο για ανάγνωση." @@ -7409,93 +5850,3 @@ msgstr "| OR" #~ msgstr "" #~ "Άγνωστος δείκτης %#08x\n" #~ "Συνέχεια;" -<<<<<<< HEAD -======= -#~ msgid "Disable Wiimote Speaker" -#~ msgstr "Απενεργοποίηση Ηχείου Wiimote" ->>>>>>> Update translation files for recent changes in the code. -======= -#~ msgid "Accuracy:" -#~ msgstr "Ακρίβεια:" - -#~ msgid "Alternate Wiimote Timing" -#~ msgstr "Εναλλακτικός Χρονισμός Wiimote" - -#~ msgid "" -#~ "Automatically generate mipmaps rather than decoding them from memory.\n" -#~ "Increases performance a bit but might cause minor texture defects.\n" -#~ "\n" -#~ "If unsure, leave this checked." -#~ msgstr "" -#~ "Δημιουργεί αυτόματα τα mipmaps αντί να τα αποκωδικοποιεί από την μνήμη.\n" -#~ "Αυξάνει λίγο τις επιδόσεις, αλλά μπορεί να προκαλέσει μικρά ελαττώματα " -#~ "στις υφές.\n" -#~ "\n" -#~ "Αν δεν είστε σίγουροι, αφήστε το επιλεγμένο." - -#~ msgid "Enable Cache" -#~ msgstr "Ενεργοποίηση Cache" - -#~ msgid "Fast" -#~ msgstr "Γρήγορη" - -#~ msgid "Fast Mipmaps" -#~ msgstr "Γρήγορα Mipmaps" - -#~ msgid "Safe" -#~ msgstr "Ασφαλής" - -#~ msgid "Scaled EFB Copy" -#~ msgstr "Κλιμακούμενα EFB Αντίγραφα" - -#~ 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" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "Επιταχύνει ελαφρώς τα EFB σε RAM αντίγραφα θυσιάζοντας την ακρίβεια της " -#~ "εξομοίωσης.\n" -#~ "Μερικές φορές μπορεί να βελτιώσει την οπτική ποιότητα.\n" -#~ "Αν αντιμετωπίζετε προβλήματα, δοκιμάστε να αυξήσετε την ακρίβεια της " -#~ "cache υφών ή απενεργοποιήστε αυτήν την επιλογή.\n" -#~ "\n" -#~ "Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο." - -#~ 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" -#~ "\n" -#~ "If unsure, leave this checked." -#~ msgstr "" -#~ "Αποθήκευση των EFB αντιγράφων σε GPU αντικείμενα υφών.\n" -#~ "Αυτό δεν είναι τόσο ακριβές, αλλά δουλεύει αρκετά καλά για τα περισσότερα " -#~ "παιχνίδια και προσφέρει μεγάλη επιτάχυνση σε σχέση με EFB σε RAM.\n" -#~ "\n" -#~ "Αν δεν είστε σίγουροι, αφήστε το επιλεγμένο." - -#~ msgid "Texture" -#~ msgstr "Υφή" - -#~ msgid "Texture Cache" -#~ msgstr "Cache Υφών" - -#~ msgid "" -#~ "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" -#~ "\n" -#~ "Αν δεν είστε σίγουροι, χρησιμοποιήστε την δεύτερη γρηγορότερη τιμή από " -#~ "δεξιά." ->>>>>>> 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 a5b3cab7a4..aa648c3fc8 100644 --- a/Languages/po/en.po +++ b/Languages/po/en.po @@ -7,19 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< 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. -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-01-06 14:53+0100\n" "Last-Translator: BhaaL \n" "Language-Team: \n" @@ -517,27 +505,9 @@ msgstr "" msgid "Add new pane" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "" @@ -591,23 +561,8 @@ msgstr "" msgid "All Gamecube GCM files (gcm)" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "" @@ -685,19 +640,7 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" -<<<<<<< HEAD -<<<<<<< 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/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -719,19 +662,7 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" -<<<<<<< HEAD -<<<<<<< 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/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "" @@ -839,19 +770,7 @@ msgid "Blue Right" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "" @@ -884,15 +803,7 @@ 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" @@ -1112,21 +1023,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< 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 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "" @@ -1234,15 +1132,7 @@ 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 "" @@ -1416,21 +1306,8 @@ msgstr "" msgid "DSP Emulator Engine" msgstr "" -<<<<<<< HEAD -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "" @@ -1648,19 +1525,7 @@ msgstr "" msgid "Divide" msgstr "" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "" @@ -1689,39 +1554,12 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1804,27 +1642,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "" @@ -1943,40 +1763,15 @@ msgstr "" msgid "Enable Block Merging" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. 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 -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "" @@ -2102,27 +1897,9 @@ msgstr "" msgid "End" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "" @@ -2151,45 +1928,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -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/ConfigMain.cpp:1173 msgid "Error" msgstr "" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2614,27 +2356,9 @@ msgstr "" msgid "Free Look" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "" @@ -2700,19 +2424,7 @@ msgid "Gamecube &Pad Settings" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2735,21 +2447,8 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: 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/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2758,27 +2457,9 @@ msgstr "" msgid "General Settings" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "" @@ -2893,21 +2574,8 @@ msgid "Hotkey Configuration" 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 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "" @@ -3098,19 +2766,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "" @@ -3187,27 +2843,9 @@ msgstr "" msgid "Invalid state" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "" @@ -3358,35 +2996,11 @@ msgstr "" msgid "Load State..." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -3463,15 +3077,7 @@ 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 "" @@ -3502,19 +3108,7 @@ msgid "Memory Byte" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "" @@ -3691,19 +3285,7 @@ msgstr "" msgid "NP Up" msgstr "" -<<<<<<< HEAD -<<<<<<< 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/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3790,15 +3372,7 @@ 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 "" @@ -3859,14 +3433,7 @@ 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 "" @@ -3992,23 +3559,8 @@ msgstr "" msgid "Paths" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: 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/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "" @@ -4028,23 +3580,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "" @@ -4070,19 +3607,7 @@ msgstr "" msgid "Players" msgstr "" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "" @@ -4288,31 +3813,10 @@ msgstr "" msgid "Refresh game list" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "" @@ -4328,14 +3832,7 @@ msgid "Render to Main Window" 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 "" @@ -4378,19 +3875,7 @@ msgstr "" msgid "Safe" msgstr "" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "" @@ -4474,19 +3959,7 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "" @@ -4526,39 +3999,12 @@ msgstr "" msgid "Select" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "" @@ -4581,26 +4027,7 @@ msgstr "" msgid "Select the file to load" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -msgid "Select the save file" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "" @@ -4608,16 +4035,7 @@ msgstr "" msgid "Select the state to load" msgstr "" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "" @@ -4951,27 +4369,9 @@ msgstr "" msgid "Space" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "" @@ -5007,15 +4407,7 @@ 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" @@ -5050,14 +4442,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: 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 "" @@ -5129,14 +4514,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: 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 "" @@ -5339,31 +4717,12 @@ 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 -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "" @@ -5465,19 +4824,6 @@ msgstr "" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -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" @@ -5682,19 +5028,7 @@ msgstr "" msgid "Wii Save Import" msgstr "" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5721,15 +5055,7 @@ 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 "" @@ -5761,27 +5087,9 @@ msgstr "" msgid "Word Wrap" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "" diff --git a/Languages/po/es.po b/Languages/po/es.po index 3e31ea03ed..6e2a488d32 100644 --- a/Languages/po/es.po +++ b/Languages/po/es.po @@ -7,26 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -"PO-Revision-Date: 2011-12-09 00:28+0100\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" -<<<<<<< HEAD -"PO-Revision-Date: 2011-08-11 15:30+0100\n" ->>>>>>> Update translation files for recent changes in the code. -======= -"PO-Revision-Date: 2011-10-15 23:23+0100\n" ->>>>>>> Updated Spanish translation -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "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" @@ -449,13 +431,6 @@ msgid "Accurate VBeam emulation" msgstr "Emulación de VBeam Precisa" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 -<<<<<<< HEAD -<<<<<<< HEAD -======= -#, fuzzy ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Updated Spanish translation msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -584,27 +559,9 @@ msgstr "Añadir Parche" msgid "Add new pane" msgstr "Añadir nueva ventana" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Añadir..." @@ -673,23 +630,8 @@ 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 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Todos los estados guardados (sav, s##)" @@ -717,24 +659,9 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -<<<<<<< HEAD -<<<<<<< HEAD -msgid "Alternate Wiimote Timing" -msgstr "Sincronización alternativa del Wiimote" -======= -#, fuzzy -msgid "Alternate Wiimote Timing" -msgstr "Wiimote emulado" ->>>>>>> Update translation files for recent changes in the code. -======= -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Alternate Wiimote Timing" msgstr "Sincronización alternativa del Wiimote" ->>>>>>> Updated Spanish translation #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -791,19 +718,7 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "¿Seguro que quieres borrar este archivo? ¡Desaparecerá para siempre!" -<<<<<<< HEAD -<<<<<<< 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/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Relación de aspecto:" @@ -825,19 +740,7 @@ msgstr "Motor de Audio:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error al abrir dispositivo AO.\n" -<<<<<<< HEAD -<<<<<<< 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/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automático" @@ -953,19 +856,7 @@ msgid "Blue Right" msgstr "Azul derecha" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Inferior" @@ -998,15 +889,7 @@ 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" @@ -1211,19 +1094,7 @@ msgstr "Escoge un archivo a abrir" msgid "Choose a memory card:" msgstr "Escoge una tarjeta de memoria:" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1265,21 +1136,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< 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 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Cerrar" @@ -1387,15 +1245,7 @@ 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..." @@ -1513,19 +1363,7 @@ msgstr "Crear nueva perspectiva" msgid "Created by KDE-Look.org" msgstr "Creado por KDE-Look.org" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" @@ -1598,21 +1436,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "Motor de emulación DSP" -<<<<<<< HEAD -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulación DSP HLE (rápido)" @@ -1851,19 +1676,7 @@ msgstr "" msgid "Divide" msgstr "Dividir" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "¿Quieres detener la emulación actual?" @@ -1892,39 +1705,12 @@ msgstr "Configuración de wiimote emulado de Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Configuración de GCPad Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Películas TAS de Dolphin (*.dtm)" @@ -1936,15 +1722,7 @@ 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..." @@ -1952,15 +1730,7 @@ 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..." @@ -2036,27 +1806,9 @@ msgstr "" "\n" "Si está inseguro, déjelo sin marcar." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Holandés" @@ -2191,41 +1943,15 @@ msgstr "Habilitar BAT" msgid "Enable Block Merging" msgstr "Habilitar asociación de bloques" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -msgid "Enable Bounding Box Calculation" -msgstr "" - -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. 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 -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Habilitar trucos" @@ -2325,19 +2051,7 @@ msgstr "" "\n" "Si no estás seguro, déjalo sin marcar." -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2393,27 +2107,9 @@ msgstr "" msgid "End" msgstr "Fin" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Inglés" @@ -2442,59 +2138,16 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -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/ConfigMain.cpp:1173 msgid "Error" msgstr "Error" ->>>>>>> Update the pot file to reflect recent changes in the code. #: 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." -<<<<<<< HEAD -#: Source/Core/Common/Src/ChunkFile.h:180 -<<<<<<< HEAD -======= -======= #: Source/Core/Common/Src/ChunkFile.h:194 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " @@ -2503,24 +2156,9 @@ 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..." -<<<<<<< HEAD -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 ->>>>>>> Update from master branch. -======= #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "" -<<<<<<< HEAD -"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 "" -======= ->>>>>>> Update translation files for recent changes in the code. "Error: Trying to access %s fonts but they are not loaded. Games may not show " "fonts correctly, or crash." msgstr "" @@ -2974,27 +2612,9 @@ msgstr "Frames a grabar" msgid "Free Look" msgstr "Cámara libre" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Francés" @@ -3020,14 +2640,8 @@ 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" @@ -3066,19 +2680,7 @@ msgid "Gamecube &Pad Settings" msgstr "&Configuración del mando 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 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Tarjetas de memoria de Gamecube (*.raw,*.gcp)" @@ -3103,21 +2705,8 @@ msgstr "" "(puede ser un código incorrecto o su tipo no es soportado todavía.)" #: 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 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "General" @@ -3126,27 +2715,9 @@ msgstr "General" msgid "General Settings" msgstr "Ajustes generales" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Alemán" @@ -3169,13 +2740,6 @@ msgid "Greater Than" msgstr "Mayor que" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -<<<<<<< HEAD -<<<<<<< HEAD -======= -#, fuzzy ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Updated Spanish translation msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -3185,29 +2749,10 @@ msgid "" "\n" "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" "Reduce ligeramente el desempeño y posiblemente cause fallos (altamente " -======= -"Aumenta bastante la calidad de las texturas generadas utilizando los efectos " -"de renderización para la textura.\n" -<<<<<<< HEAD -"Aumentar la resolución interna va a mejorar el efecto de esta definición.\n" -"Diminuye ligeramente el desempenño y probablemente provoca fallos (aunque es " ->>>>>>> Update translation files for recent changes in the code. -======= -"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." @@ -3305,21 +2850,8 @@ msgid "Hotkey Configuration" msgstr "Configuración de atajos" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Atajos" @@ -3392,11 +2924,8 @@ 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:323 msgid "" @@ -3405,20 +2934,8 @@ msgstr "" "Si los FPS son erróneos, esta opción puede ayudar. (ON = Compatible, OFF = " "Rápido)" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 #, fuzzy ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " @@ -3563,19 +3080,7 @@ msgstr "" "Se ha llamado InstallExceptionHandler, pero esta plataforma no lo soporta " "todavía." -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Instalando WAD..." @@ -3657,27 +3162,9 @@ msgstr "Archivo de grabación no válido" msgid "Invalid state" msgstr "Estado no válido" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italiano" @@ -3835,35 +3322,11 @@ msgstr "&Cargar estado 8" msgid "Load State..." msgstr "Cargar estado..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "Cargar Menú de sistema Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Cargar Menú de sistema Wii %d %c" @@ -3945,15 +3408,7 @@ 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" @@ -3984,19 +3439,7 @@ msgid "Memory Byte" msgstr "Byte de memoria" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Tarjeta de memoria" @@ -4094,12 +3537,6 @@ msgid "" msgstr "" "Mueva el puntero del ratón sobre una opción para obtener una descripción " "detallada.\n" -<<<<<<< HEAD -"\n" -"\n" -"\n" -======= ->>>>>>> Update translation files for recent changes in the code. "\n" "\n" "\n" @@ -4203,19 +3640,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Arriba" -<<<<<<< HEAD -<<<<<<< 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/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4302,15 +3727,7 @@ msgstr "No igual" msgid "Not Set" 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" @@ -4371,14 +3788,7 @@ 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" @@ -4510,23 +3920,8 @@ msgstr "Parches" msgid "Paths" msgstr "Directorios" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: 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/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -4546,23 +3941,8 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Reproducir" @@ -4588,19 +3968,7 @@ msgstr "Opciones de reproducción" msgid "Players" msgstr "Jugadores" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Confirma, por favor..." @@ -4652,29 +4020,17 @@ msgstr "Efecto de posprocesado:" #: Source/Core/Core/Src/Movie.cpp:759 #, 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:853 #, 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:830 #, 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: " @@ -4823,31 +4179,10 @@ msgstr "Actualizar lista" msgid "Refresh game list" msgstr "Actualizar lista de juegos" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Eliminar" @@ -4866,14 +4201,7 @@ msgid "Render to Main Window" 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" @@ -4916,19 +4244,7 @@ msgstr "Guardar estado" msgid "Safe" msgstr "Seguro" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Frecuencia del sonido:" @@ -5054,39 +4370,12 @@ msgstr "No se ha encontrado la sección %s en SYSCONF" msgid "Select" msgstr "Seleccionar" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Seleccionar archivo de grabación" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Elige un WAD de Wii para instalar" @@ -5112,13 +4401,7 @@ msgstr "Selecciona las ventanas flotantes" msgid "Select the file to load" msgstr "Selecciona el archivo para cargar" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Selecciona el archivo de guardado" @@ -5126,29 +4409,7 @@ msgstr "Selecciona el archivo de guardado" msgid "Select the state to load" msgstr "Selecciona el estado para cargar" -<<<<<<< HEAD -#: 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: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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Selecciona el estado para guardar" @@ -5223,19 +4484,7 @@ msgstr "Separador" msgid "Serbian" msgstr "Serbio" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -5464,7 +4713,6 @@ msgid "Skip EFB Access from CPU" msgstr "Saltar el acceso al EFB desde la CPU" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 -<<<<<<< HEAD msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -5485,28 +4733,6 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -======= -msgid "" -"Skip the destination alpha pass used in many games for various graphical " -"effects.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Salta el destino del pase alfa usado en muchos juegos para varios efectos " -"gráficos.\n" -"\n" -"Si está inseguro, déjelo sin marcar." - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 -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" -"\n" -"If unsure, leave this unchecked." -msgstr "" ->>>>>>> Update translation files for recent changes in the code. "Aumenta ligeramente las copias de EFB a la RAM al sacrificar exactitud de " "emulación.\n" "A veces también aumenta la calidad visual.\n" @@ -5567,27 +4793,9 @@ msgstr "Falló la creación del búfer de sonido: %s" msgid "Space" msgstr "Espacio" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Español" @@ -5631,15 +4839,7 @@ 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" @@ -5674,14 +4874,7 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: 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" @@ -5761,24 +4954,13 @@ msgstr "Tabla derecha" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: 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:82 msgid "TaruKonga (Bongos)" -<<<<<<< HEAD -msgstr "" -======= msgstr "TaruKonga (Bongos)" ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" @@ -6009,31 +5191,12 @@ 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 -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Superior" @@ -6140,23 +5303,9 @@ msgstr "Se recibió un mensaje desconocido de id: %d" #: Source/Core/Core/Src/NetPlayServer.cpp:504 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" -<<<<<<< HEAD -======= 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 "" -"Unknown pointer %#08x\n" -"Continue?" ->>>>>>> Update translation files for recent changes in the code. -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" @@ -6326,12 +5475,9 @@ 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:684 #, c-format @@ -6340,13 +5486,10 @@ 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:693 #, c-format @@ -6366,8 +5509,6 @@ 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 " @@ -6383,7 +5524,6 @@ msgstr "" "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 @@ -6418,19 +5558,7 @@ msgstr "Raíz de la NAND de Wii:" msgid "Wii Save Import" msgstr "Importar guardado de Wii" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Archivos de guardado Wii (*.bin)|*.bin" @@ -6461,15 +5589,7 @@ 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" @@ -6501,27 +5621,9 @@ msgstr "Windows Derecha" msgid "Word Wrap" msgstr "Word Wrap" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Trabajando..." diff --git a/Languages/po/fr.po b/Languages/po/fr.po index f50163bd39..73410c8858 100644 --- a/Languages/po/fr.po +++ b/Languages/po/fr.po @@ -7,31 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-10-28 23:40+0100\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" -<<<<<<< HEAD -"PO-Revision-Date: 2011-08-10 17:42+0100\n" ->>>>>>> Update translation files for recent changes in the code. -======= -"PO-Revision-Date: 2011-10-28 23:40+0100\n" ->>>>>>> Update french translation. -======= -"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" @@ -452,13 +429,6 @@ msgid "Accurate VBeam emulation" msgstr "Emulation fidèle VBeam" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 -<<<<<<< HEAD -<<<<<<< HEAD -======= -#, fuzzy ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update french translation. msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -586,33 +556,9 @@ msgstr "Ajouter un patch" msgid "Add new pane" msgstr "Ajouter un nouveau panneau" -<<<<<<< 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 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: 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:411 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Ajouter..." @@ -681,28 +627,8 @@ msgstr "Toutes les images GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Tous les fichiers GameCube GCM (gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: 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: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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Tous les états sauvegardés (sav, s##)" @@ -730,24 +656,9 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -<<<<<<< HEAD -<<<<<<< HEAD -msgid "Alternate Wiimote Timing" -msgstr "Délai alternatif de communication avec la Wiimote" -======= -#, fuzzy -msgid "Alternate Wiimote Timing" -msgstr "Wiimote émulée" ->>>>>>> Update translation files for recent changes in the code. -======= -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Alternate Wiimote Timing" msgstr "Délai alternatif de communication avec la Wiimote" ->>>>>>> Update french translation. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -807,23 +718,7 @@ msgstr "" "Êtes-vous sûr de vouloir supprimer ce fichier ? Il sera supprimé " "définitivement !" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< 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:725 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Format d'écran :" @@ -845,23 +740,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 -<<<<<<< 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:238 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -980,23 +859,7 @@ msgid "Blue Right" msgstr "Bleu Droite" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< 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:272 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Bas" @@ -1029,19 +892,7 @@ msgstr "Parcourir un dossier de destination" msgid "Buffer:" msgstr "Buffer :" -<<<<<<< HEAD -<<<<<<< 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: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" @@ -1247,37 +1098,13 @@ msgstr "Choisir un fichier à ouvrir" msgid "Choose a memory card:" msgstr "Choisir une carte mémoire :" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< 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:755 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" "Choisir un fichier comme apploader : (uniquement pour les disques créés à " "partir de dossiers)" -<<<<<<< HEAD -======= -msgid "Choose file to use as apploader: (applies to discs constructed from directories only)" -msgstr "Choisir un fichier comme apploader : (uniquement pour les disques créés à partir de dossiers)" ->>>>>>> Update french translation. -======= ->>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 @@ -1313,25 +1140,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< 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:559 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Fermer" @@ -1439,19 +1249,7 @@ msgstr "Connecter la 3è Wiimote" msgid "Connect Wiimote 4" msgstr "Connecter la 4è Wiimote" -<<<<<<< HEAD -<<<<<<< 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:598 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:597 ->>>>>>> Update from master branch. msgid "Connecting..." msgstr "Connexion..." @@ -1570,35 +1368,11 @@ msgstr "Créer une nouvelle perspective" msgid "Created by KDE-Look.org" msgstr "Créé par KDE-Look.org" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< 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:491 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Créé par Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -<<<<<<< HEAD -======= -msgid "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -msgstr "Créé par Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" ->>>>>>> Update french translation. -======= ->>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "Created by VistaIcons.com" @@ -1667,25 +1441,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "Moteur d'émulation du DSP (Audio)" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -<<<<<<< HEAD -<<<<<<< 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:248 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulation du DSP en HLE (rapide)" @@ -1924,23 +1681,7 @@ msgstr "" msgid "Divide" msgstr "Diviser" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< 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:1052 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Voulez-vous arrêter l'émulation en cours ?" @@ -1969,48 +1710,12 @@ msgstr "Configuration de la Wiimote pour Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -msgstr "Configuration de la manette GC pour 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:1204 -msgid "Dolphin GCPad Configuration" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Configuration de la manette GC pour Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Films TAS Dolphin (*.dtm)" @@ -2022,59 +1727,21 @@ 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 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the 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..." msgstr "" "Dolphin n'a pas trouvé d'ISO GC/Wii. Double-cliquez ici pour chercher des " "fichiers..." -<<<<<<< HEAD -======= -msgid "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for files..." -msgstr "Dolphin n'a pas trouvé d'ISO GC/Wii. Double-cliquez ici pour chercher des fichiers..." ->>>>>>> Update french translation. -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343 -======= -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307 -<<<<<<< HEAD ->>>>>>> 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..." msgstr "" "Dolphin est paramétré pour cacher tous les jeux. Double-cliquez ici pour " "afficher tous les jeux..." -<<<<<<< HEAD -======= -msgid "Dolphin is currently set to hide all games. Doubleclick here to show all games..." -msgstr "Dolphin est paramétré pour cacher tous les jeux. Double-cliquez ici pour afficher tous les jeux..." ->>>>>>> Update french translation. -======= ->>>>>>> Update Hungarian and Turkish translations. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 @@ -2145,33 +1812,9 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -<<<<<<< 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 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: 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:481 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Néerlandais" @@ -2311,47 +1954,15 @@ msgstr "Activer BAT" msgid "Enable Block Merging" msgstr "Activer l'assemblage de blocs" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. 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 -<<<<<<< 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:536 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Activer les Cheats" @@ -2452,37 +2063,13 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< 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:329 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "" "Activer ceci pour accélérer La légende de Zelda : Twilight Princess. " "Désactiver pour TOUS les autres jeux." -<<<<<<< HEAD -======= -msgid "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for ANY other game." -msgstr "Activer ceci pour accélérer La légende de Zelda : Twilight Princess. Désactiver pour TOUS les autres jeux." ->>>>>>> Update french translation. -======= ->>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" @@ -2532,33 +2119,9 @@ msgstr "" msgid "End" msgstr "Fin" -<<<<<<< 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 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: 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:476 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Anglais" @@ -2587,65 +2150,15 @@ msgstr "Egal" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -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/ConfigMain.cpp:1169 -msgid "Error" -msgstr "Erreur" - ->>>>>>> Update translation files for recent changes in the code. -#: Source/Core/DolphinWX/Src/Main.cpp:346 -msgid "Error loading selected language. Falling back to system default." -msgstr "Erreur lors du chargement de la langue sélectionnée. Retour à la langue par défaut du système." - -#: Source/Core/Common/Src/ChunkFile.h:180 -#, c-format -msgid "" -<<<<<<< HEAD -"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " -"Aborting savestate load..." -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/ConfigMain.cpp:1173 msgid "Error" msgstr "Erreur" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" "Erreur lors du chargement de la langue sélectionnée. Retour à la langue par " "défaut du système." ->>>>>>> Update Hungarian and Turkish translations. #: Source/Core/Common/Src/ChunkFile.h:194 #, c-format @@ -2656,26 +2169,12 @@ msgstr "" #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format -<<<<<<< HEAD -<<<<<<< HEAD msgid "" -======= ->>>>>>> Update translation files for recent changes in the code. -======= -msgid "" ->>>>>>> Update Hungarian and Turkish translations. "Error: Trying to access %s fonts but they are not loaded. Games may not show " "fonts correctly, or crash." msgstr "" "Erreur : essai d'accès aux polices %s mais elles ne sont pas chargées. Les " "jeux peuvent ne pas afficher les polices correctement, ou planter." -<<<<<<< HEAD -======= -msgid "Error: Trying to access %s fonts but they are not loaded. Games may not show fonts correctly, or crash." -msgstr "Erreur : essai d'accès aux polices %s mais elles ne sont pas chargées. Les jeux peuvent ne pas afficher les polices correctement, ou planter." ->>>>>>> Update french translation. -======= ->>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:30 msgid "Escape" @@ -3126,33 +2625,9 @@ msgstr "Images à enregistrer :" msgid "Free Look" msgstr "Vue libre" -<<<<<<< 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 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: 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:478 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Français" @@ -3177,20 +2652,11 @@ msgstr "Résolution en Plein écran :" 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" @@ -3228,23 +2694,7 @@ msgid "Gamecube &Pad Settings" msgstr "Paramètres de la &manette GameCube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< 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:1007 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Carte mémoires de GameCube (*.raw,*.gcp)" @@ -3269,25 +2719,8 @@ msgstr "" "(ou c'est un mauvais code, ou il n'est pas encore pris en charge.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< 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/ConfigMain.cpp:525 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Général" @@ -3296,33 +2729,9 @@ msgstr "Général" msgid "General Settings" msgstr "Paramètres généraux" -<<<<<<< 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 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: 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:477 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Allemand" @@ -3345,13 +2754,6 @@ msgid "Greater Than" msgstr "Plus grand que" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -<<<<<<< HEAD -<<<<<<< HEAD -======= -#, fuzzy ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update french translation. msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -3361,29 +2763,12 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update Hungarian and Turkish translations. "Améliore significativement la qualité des textures générées en utilisant les " "effets de rendu vers texture.\n" "Le fait d'augmenter la résolution interne améliore l'impact de cette " "option.\n" -<<<<<<< HEAD -<<<<<<< HEAD "Baisse légèrement les performances et peut provoquer quelques pépins (mais " "peu probable).\n" -======= ->>>>>>> Update translation files for recent changes in the code. -======= -"Améliore significativement la qualité des textures générées en utilisant les effets de rendu vers texture.\n" -"Le fait d'augmenter la résolution interne améliore l'impact de cette option.\n" -"Baisse légèrement les performances et peut provoquer quelques pépins (mais peu probable).\n" ->>>>>>> Update french translation. -======= -"Baisse légèrement les performances et peut provoquer quelques pépins (mais " -"peu probable).\n" ->>>>>>> Update Hungarian and Turkish translations. "\n" "Dans le doute, cochez cette case." @@ -3482,25 +2867,8 @@ msgid "Hotkey Configuration" msgstr "Configuration des raccourcis clavier" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: 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/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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Raccourcis clavier" @@ -3568,55 +2936,21 @@ msgstr "Italie" msgid "Icon" msgstr "Icône" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update Hungarian and Turkish translations. -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "Si les FPS ne sont pas corrects, cette option peut résoudre le souci. (ON = " "Compatible, OFF = Vitesse)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 #, fuzzy ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " @@ -3625,13 +2959,6 @@ msgstr "" "Si vous définissez le limitateur de vitesse (Image /s max) à une valeur plus " "élevée que la vitesse du jeu (NTSC:60, PAL:50), vous devez aussi désactiver " "le contrôle audio dans le DSP pour que cela fonctionne." -<<<<<<< HEAD -======= -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." -msgstr "Si vous définissez le limitateur de vitesse (Image /s max) à une valeur plus élevée que la vitesse du jeu (NTSC:60, PAL:50), vous devez aussi désactiver le contrôle audio dans le DSP pour que cela fonctionne." ->>>>>>> Update french translation. -======= ->>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "Ignore Format Changes" @@ -3768,23 +3095,7 @@ msgstr "" "InstallExceptionHandler a été appelé, mais cette plateforme ne le prend pas " "encore en charge." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< 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:1363 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Installation du WAD..." @@ -3866,33 +3177,9 @@ msgstr "Fichier d'enregitrement non valide" msgid "Invalid state" msgstr "Etat non valide" -<<<<<<< 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 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: 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:480 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italien" @@ -4050,43 +3337,11 @@ msgstr "Charger l'état du Slot 8" msgid "Load State..." msgstr "Charger un état..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -msgstr "Charger le Menu Système Wii" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "Charger le Menu Système Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Charger le Menu Système Wii %d%c" @@ -4170,19 +3425,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 -======= -#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73 ->>>>>>> Update translation files for recent changes in the code. -======= -#: 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" @@ -4213,23 +3456,7 @@ msgid "Memory Byte" msgstr "Octet mémoire" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< 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:84 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Carte mémoire" @@ -4430,23 +3657,7 @@ msgstr "NP Tabulation" msgid "NP Up" msgstr "NP Haut" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< 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:451 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4533,19 +3744,7 @@ msgstr "Différent" msgid "Not Set" msgstr "Non défini" -<<<<<<< HEAD -<<<<<<< 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:597 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/Main.cpp:596 ->>>>>>> Update from master branch. msgid "Not connected" msgstr "Non connectée" @@ -4606,17 +3805,7 @@ msgstr "%d blocs disponibles seulement" #: Source/Core/DolphinWX/Src/FrameTools.cpp:433 #: 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" @@ -4748,28 +3937,8 @@ msgstr "Patchs" msgid "Paths" msgstr "Chemins" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: 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: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/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -4789,28 +3958,8 @@ msgstr "Perspective %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< 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: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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Démarrer" @@ -4836,23 +3985,7 @@ msgstr "Options de lecture" msgid "Players" msgstr "Joueurs" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< 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:1053 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Veuillez confirmer..." @@ -4901,15 +4034,7 @@ msgstr "Portugais (brésilien)" msgid "Post-Processing Effect:" msgstr "Effet de Post-processing :" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/Core/Src/Movie.cpp:735 -======= #: Source/Core/Core/Src/Movie.cpp:759 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" @@ -4924,11 +4049,6 @@ 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 :" @@ -5077,38 +4197,10 @@ msgstr "Rafraîchir la liste" msgid "Refresh game list" msgstr "Rafraîchir la liste des jeux" -<<<<<<< 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 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: 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:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Retirer" @@ -5127,17 +4219,7 @@ msgid "Render to Main Window" 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" @@ -5180,23 +4262,7 @@ msgstr "Sau&vegarder l'état" msgid "Safe" msgstr "Sûr " -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< 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:632 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Echantillonnage :" @@ -5322,48 +4388,12 @@ msgstr "La section %s n'a pas été trouvée dans SYSCONF" msgid "Select" msgstr "Select" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "Sélectionner le fichier d'enregistrement" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Sélectionner le fichier d'enregistrement" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Sélectionner un fichier WAD de Wii à installer" @@ -5389,31 +4419,7 @@ msgstr "Sélectionner les fenêtres flottantes" msgid "Select the file to load" msgstr "Sélectionner le fichier à charger" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 ->>>>>>> Update Hungarian and Turkish translations. -msgid "Select the save file" -msgstr "Sélectionner le fichier à enregistrer" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457 -msgid "Select the state to load" -msgstr "Sélectionner l'état à charger" - -<<<<<<< HEAD -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Sélectionner le fichier à enregistrer" @@ -5421,19 +4427,7 @@ msgstr "Sélectionner le fichier à enregistrer" msgid "Select the state to load" msgstr "Sélectionner l'état à charger" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Sélectionner l'état à enregistrer" @@ -5509,36 +4503,12 @@ msgstr "Séparateur" msgid "Serbian" msgstr "Serbe" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< 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:506 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" "Port série 1 - C'est le port que les périphériques tels que l'adaptateur " "ethernet utilisent" -<<<<<<< HEAD -======= -msgid "Serial Port 1 - This is the port which devices such as the net adapter use" -msgstr "Port série 1 - C'est le port que les périphériques tels que l'adaptateur ethernet utilisent" ->>>>>>> Update french translation. -======= ->>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 msgid "Set" @@ -5762,7 +4732,6 @@ msgid "Skip EFB Access from CPU" msgstr "Ignorer l'accès à l'EFB depuis le CPU" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 -<<<<<<< HEAD msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -5783,39 +4752,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -======= -msgid "" -"Skip the destination alpha pass used in many games for various graphical " -"effects.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Saute la passe alpha de destination, utilisée dans beaucoup de jeux pour " -"divers effets graphiques.\n" -"\n" -"Dans le doute, décochez cette case." - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 -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" -"\n" -"If unsure, leave this unchecked." -msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. "Accélère légèrement les copies d'EFB vers la RAM en sacrifiant la précision " "de l'émulation.\n" -======= -"Accélère légèrement les copies d'EFB vers la RAM en sacrifiant la précision de l'émulation.\n" ->>>>>>> Update french translation. -======= -"Accélère légèrement les copies d'EFB vers la RAM en sacrifiant la précision " -"de l'émulation.\n" ->>>>>>> Update Hungarian and Turkish translations. "Améliore parfois la qualité visuelle.\n" "Si vous rencontrez des problèmes, essayez d'augmenter la précision du cache " "ou désactivez cette option.\n" @@ -5875,33 +4813,9 @@ msgstr "Echec de la création du buffer audio : %s" msgid "Space" msgstr "Espace" -<<<<<<< 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 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: 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:479 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Espagnol" @@ -5945,19 +4859,7 @@ msgstr "Stick carré" msgid "Standard Controller" msgstr "Contrôleur standard" -<<<<<<< HEAD -<<<<<<< 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: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" @@ -5992,17 +4894,7 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 #: 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" @@ -6079,12 +4971,7 @@ msgstr "Table Droite" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: 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. msgid "Take Screenshot" msgstr "Capture d'écran" @@ -6092,21 +4979,6 @@ msgstr "Capture d'écran" msgid "TaruKonga (Bongos)" msgstr "" -======= -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" @@ -6334,38 +5206,12 @@ msgstr "Activer tous les types de journaux" #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: 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 -<<<<<<< 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:273 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Haut" @@ -6472,38 +5318,9 @@ msgstr "Reception d'un message inconnu avec l'ID : %d" #: Source/Core/Core/Src/NetPlayServer.cpp:504 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= msgstr "" "Message inconnu avec l'ID %d reçue du lecteur %d. Banissement du lecteur !" -======= -msgstr "Message inconnu avec l'ID %d reçue du lecteur %d. Banissement du lecteur !" ->>>>>>> Update french translation. -======= -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 "" -"Unknown pointer %#08x\n" -"Continue?" -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -msgstr "" -"Message inconnu avec l'ID %d reçue du lecteur %d. Banissement du lecteur !" -======= -msgstr "" -"Pointeur inconnu %#08x\n" -"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" @@ -6665,15 +5482,7 @@ msgstr "" "et vont avoir le même nom que le fichier sur votre carte mémoire\n" "Continuer ?" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/Core/Src/Movie.cpp:629 -======= #: Source/Core/Core/Src/Movie.cpp:667 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -6708,11 +5517,6 @@ 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." @@ -6746,23 +5550,7 @@ msgstr "Racine de la NAND (Wii) :" msgid "Wii Save Import" msgstr "Importer une sauvegarde Wii" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< 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:1310 ->>>>>>> Update Hungarian and Turkish translations. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Fichiers de sauvegarde Wii (*.bin)|*.bin" @@ -6793,19 +5581,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 -======= -#: Source/Core/DolphinWX/Src/Main.cpp:599 ->>>>>>> Update translation files for recent changes in the code. -======= -#: 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" @@ -6837,33 +5613,9 @@ msgstr "Windows Droit" msgid "Word Wrap" msgstr "Casse" -<<<<<<< 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: 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:1364 -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Travail..." diff --git a/Languages/po/he.po b/Languages/po/he.po index 51453ebfe0..e1252b7c89 100644 --- a/Languages/po/he.po +++ b/Languages/po/he.po @@ -7,19 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< 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. -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-01-08 20:50+0200\n" "Last-Translator: Ely \n" "Language-Team: \n" @@ -518,27 +506,9 @@ msgstr "" msgid "Add new pane" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "" @@ -592,23 +562,8 @@ msgstr "" msgid "All Gamecube GCM files (gcm)" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "" @@ -686,19 +641,7 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" -<<<<<<< HEAD -<<<<<<< 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/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -720,19 +663,7 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" -<<<<<<< HEAD -<<<<<<< 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/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "" @@ -841,19 +772,7 @@ msgid "Blue Right" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "" @@ -886,15 +805,7 @@ 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,21 +1025,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< 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 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "" @@ -1236,15 +1134,7 @@ 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 "" @@ -1418,21 +1308,8 @@ msgstr "קול" msgid "DSP Emulator Engine" msgstr "" -<<<<<<< HEAD -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "" @@ -1650,19 +1527,7 @@ msgstr "" msgid "Divide" msgstr "" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "" @@ -1691,40 +1556,13 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Dolphin GCPad Configuration" msgstr "הגדרות גרפיקה" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1807,27 +1645,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "" @@ -1946,40 +1766,15 @@ msgstr "" msgid "Enable Block Merging" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. 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 -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "" @@ -2105,27 +1900,9 @@ msgstr "" msgid "End" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "" @@ -2154,45 +1931,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -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/ConfigMain.cpp:1173 msgid "Error" msgstr "" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2617,27 +2359,9 @@ msgstr "" msgid "Free Look" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "" @@ -2706,19 +2430,7 @@ msgid "Gamecube &Pad Settings" msgstr "הגדרות קול" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2741,21 +2453,8 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: 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/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2765,27 +2464,9 @@ msgstr "" msgid "General Settings" msgstr "הגדרות קול" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "" @@ -2900,21 +2581,8 @@ msgid "Hotkey Configuration" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "" @@ -3105,19 +2773,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "" @@ -3194,27 +2850,9 @@ msgstr "" msgid "Invalid state" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "" @@ -3365,35 +3003,11 @@ msgstr "" msgid "Load State..." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -3471,15 +3085,7 @@ 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 "" @@ -3510,19 +3116,7 @@ msgid "Memory Byte" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "" @@ -3699,19 +3293,7 @@ msgstr "" msgid "NP Up" msgstr "" -<<<<<<< HEAD -<<<<<<< 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/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3798,15 +3380,7 @@ 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 "" @@ -3867,14 +3441,7 @@ 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 "" @@ -4000,23 +3567,8 @@ msgstr "" msgid "Paths" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: 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/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "" @@ -4036,23 +3588,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "" @@ -4078,19 +3615,7 @@ msgstr "" msgid "Players" msgstr "" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "" @@ -4296,31 +3821,10 @@ msgstr "" msgid "Refresh game list" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "" @@ -4336,14 +3840,7 @@ msgid "Render to Main Window" 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 "" @@ -4386,19 +3883,7 @@ msgstr "" msgid "Safe" msgstr "" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "" @@ -4482,19 +3967,7 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "" @@ -4534,39 +4007,12 @@ msgstr "" msgid "Select" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "" @@ -4589,13 +4035,7 @@ msgstr "" msgid "Select the file to load" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "" @@ -4603,29 +4043,7 @@ msgstr "" msgid "Select the state to load" msgstr "" -<<<<<<< HEAD -#: 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: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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "" @@ -4961,27 +4379,9 @@ msgstr "" msgid "Space" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "" @@ -5017,15 +4417,7 @@ 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" @@ -5060,14 +4452,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: 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 "" @@ -5139,14 +4524,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: 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 "" @@ -5349,31 +4727,12 @@ 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 -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "" @@ -5475,19 +4834,6 @@ msgstr "" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -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" @@ -5693,19 +5039,7 @@ msgstr "" msgid "Wii Save Import" msgstr "" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5732,15 +5066,7 @@ 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 "" @@ -5772,27 +5098,9 @@ msgstr "" msgid "Word Wrap" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "" diff --git a/Languages/po/hu.po b/Languages/po/hu.po index fb426b13e9..f4ed971576 100644 --- a/Languages/po/hu.po +++ b/Languages/po/hu.po @@ -7,30 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -"PO-Revision-Date: 2011-12-18 13:41-0600\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" -<<<<<<< HEAD -"PO-Revision-Date: 2011-06-04 14:29+0100\n" ->>>>>>> Update translation files for recent changes in the code. -======= -"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" -<<<<<<< HEAD -"PO-Revision-Date: 2011-12-27 08:22-0600\n" ->>>>>>> Update from master branch. -======= -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-12-28 09:44+0100\n" ->>>>>>> Update Hungarian translation. "Last-Translator: Delirious \n" "Language-Team: Delirious \n" "Language: Hungarian\n" @@ -96,15 +74,7 @@ msgid "%s failed to be scrubbed. Probably the image is corrupt." msgstr "%s tisztítása sikertelen. Valószínűleg a képfájl sérült." #: Source/Core/Core/Src/HW/GCMemcard.cpp:97 -<<<<<<< HEAD -<<<<<<< HEAD #, c-format -======= -#, fuzzy, c-format ->>>>>>> Update translation files for recent changes in the code. -======= -#, c-format ->>>>>>> Update Hungarian and Turkish translations. msgid "" "%s failed to load as a memorycard \n" " Card file size is invalid (0x%x bytes)" @@ -113,15 +83,7 @@ msgstr "" " A kártya fájlmérete nem megfelelő (0x%x bájt)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:112 -<<<<<<< HEAD -<<<<<<< HEAD #, c-format -======= -#, fuzzy, c-format ->>>>>>> Update translation files for recent changes in the code. -======= -#, c-format ->>>>>>> Update Hungarian and Turkish translations. msgid "" "%s failed to load as a memorycard \n" " Card size is invalid (0x%x bytes)" @@ -467,13 +429,6 @@ msgid "Accurate VBeam emulation" msgstr "Pontos VBeam emuláció" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 -<<<<<<< HEAD -<<<<<<< HEAD -======= -#, fuzzy ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Hungarian and Turkish translations. msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -599,27 +554,9 @@ msgstr "Patch hozzáadása" msgid "Add new pane" msgstr "Új mező hozzáadása" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Hozzáadás..." @@ -689,23 +626,8 @@ 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 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Minden állásmentés (sav, s##)" @@ -733,24 +655,9 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -<<<<<<< HEAD -<<<<<<< HEAD -msgid "Alternate Wiimote Timing" -msgstr "Változtatható Wiimote időzítés" -======= -#, fuzzy -msgid "Alternate Wiimote Timing" -msgstr "Emulált Wiimote" ->>>>>>> Update translation files for recent changes in the code. -======= -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Alternate Wiimote Timing" msgstr "Változtatható Wiimote időzítés" ->>>>>>> Update Hungarian and Turkish translations. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -808,19 +715,7 @@ 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 -<<<<<<< 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/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Képarány:" @@ -842,19 +737,7 @@ msgstr "Hang feldolgozó:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Hiba az AO eszköz megnyitásakor.\n" -<<<<<<< HEAD -<<<<<<< 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/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automatikus" @@ -971,19 +854,7 @@ msgid "Blue Right" msgstr "Kék jobbra" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Gomb" @@ -1016,15 +887,7 @@ 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" @@ -1090,33 +953,11 @@ msgstr "Mégse" msgid "Cannot open %s" msgstr "%s nem nyitható meg" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:721 -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ény bejegyzéseket törölni függőben lévő eseményekkel" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1018 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1290,21 +1131,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< 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 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Bezárás" @@ -1412,15 +1240,7 @@ 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..." @@ -1609,21 +1429,8 @@ msgstr "Hang" msgid "DSP Emulator Engine" msgstr "DSP emulátor motor" -<<<<<<< HEAD -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emuláció (gyors)" @@ -1864,19 +1671,7 @@ msgstr "" msgid "Divide" msgstr "Megosztás" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Le akarod állítani az éppen működő emulációt?" @@ -1905,39 +1700,12 @@ msgstr "Dolphin emulált Wiimote beállítások" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad beállítások" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS videók (*.dtm)" @@ -2034,27 +1802,9 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Holland" @@ -2194,41 +1944,15 @@ msgstr "BAT használata" msgid "Enable Block Merging" msgstr "Blokk csatlakozás használata" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -msgid "Enable Bounding Box Calculation" -msgstr "" - -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. 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 -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Csalások használata" @@ -2384,27 +2108,9 @@ msgstr "" msgid "End" msgstr "Vége" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Angol" @@ -2433,47 +2139,10 @@ msgstr "Egyenlő" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -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/ConfigMain.cpp:1173 msgid "Error" msgstr "Hiba" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2482,28 +2151,12 @@ msgstr "" #: Source/Core/Common/Src/ChunkFile.h:194 #, c-format -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" -<<<<<<< HEAD -<<<<<<< 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. -======= -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..." ->>>>>>> Update Hungarian translation. -======= -"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 the pot file to reflect recent changes in the code. #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format @@ -2961,27 +2614,9 @@ msgstr "Rögzítendő képkockák" msgid "Free Look" msgstr "Szabad nézet" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Francia" @@ -3007,14 +2642,8 @@ 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" @@ -3053,19 +2682,7 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube &irányító beállítások" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube memóriakártyák (*.raw,*.gcp)" @@ -3090,21 +2707,8 @@ msgstr "" "(vagy rossz a kód vagy a kód típus még nem támogatott.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: 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/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Általános" @@ -3113,27 +2717,9 @@ msgstr "Általános" msgid "General Settings" msgstr "Általános beállítások" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Német" @@ -3155,13 +2741,6 @@ msgid "Greater Than" msgstr "Nagyobb mint" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -<<<<<<< HEAD -<<<<<<< HEAD -======= -#, fuzzy ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Hungarian and Turkish translations. msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -3272,21 +2851,8 @@ msgid "Hotkey Configuration" 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 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Gyorsbill." @@ -3354,30 +2920,13 @@ msgstr "OLASZORSZÁG" msgid "Icon" msgstr "Ikon" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329 -<<<<<<< HEAD -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -<<<<<<< HEAD -<<<<<<< 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. -======= -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." ->>>>>>> Update Hungarian translation. -======= -"Kijelölés esetén a bounding box regiszterek frissítve lesznek. A Paper Mario " -"játékok használják." ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" @@ -3532,19 +3081,7 @@ msgid "" msgstr "" "InstallExceptionHandler előidézve, de ez a platform még nem támogatja azt." -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "WAD telepítése..." @@ -3626,27 +3163,9 @@ msgstr "Nem megfelelő rögzített fájl" msgid "Invalid state" msgstr "Nem megfelelő mentés" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Olasz" @@ -3804,35 +3323,11 @@ msgstr "Állás betöltése a 8. helyről" msgid "Load State..." msgstr "Állás betöltése..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "Wii rendszer menü betöltése" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii rendszer menü betöltése %d%c" @@ -3914,15 +3409,7 @@ 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" @@ -3953,19 +3440,7 @@ msgid "Memory Byte" msgstr "Memória bájt" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Memóriakártya" @@ -4163,19 +3638,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" -<<<<<<< HEAD -<<<<<<< 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/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4262,15 +3725,7 @@ 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" @@ -4331,14 +3786,7 @@ 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" @@ -4469,23 +3917,8 @@ msgstr "Javítások" msgid "Paths" msgstr "Mappák" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: 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/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Szünet" @@ -4505,23 +3938,8 @@ msgstr "%d perspektíva" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Indítás" @@ -4547,19 +3965,7 @@ msgstr "Visszajátszási lehetőségek" msgid "Players" msgstr "Játékosok" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Változtatás jóváhagyása..." @@ -4611,29 +4017,17 @@ msgstr "Utófeldolgozási effektus:" #: Source/Core/Core/Src/Movie.cpp:759 #, 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:853 #, 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:830 #, 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: " @@ -4782,31 +4176,10 @@ msgstr "A lista frissítése" msgid "Refresh game list" msgstr "Játéklista frissítése" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Törlés" @@ -4825,14 +4198,7 @@ msgid "Render to Main Window" 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" @@ -4875,19 +4241,7 @@ msgstr "Ál&lás mentése" msgid "Safe" msgstr "Biztonságos" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Mintavételezési frekvencia:" @@ -4971,19 +4325,7 @@ 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 -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Keresés %s" @@ -5023,39 +4365,12 @@ msgstr "%s rész nem található a SYSCONF fájlban" msgid "Select" msgstr "Választás" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Válassz rögzítendő fájlt" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Válassz telepítendő Wii WAD fájlt" @@ -5081,26 +4396,7 @@ msgstr "Válassz lebegő ablakokat" msgid "Select the file to load" msgstr "Betöltendő fájl kiválasztása" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -msgid "Select the save file" -msgstr "Válassz mentési fájlt" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Válassz mentési fájlt" @@ -5108,16 +4404,7 @@ msgstr "Válassz mentési fájlt" msgid "Select the state to load" msgstr "Válassz betöltendő állásmentést" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Válassz mentendő állást" @@ -5499,27 +4786,9 @@ msgstr "Hang puffer létrehozása sikertelen: %s" msgid "Space" msgstr "Szóköz" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Spanyol" @@ -5563,15 +4832,7 @@ msgstr "Négyzetes 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" @@ -5606,14 +4867,7 @@ msgstr "Kar" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: 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" @@ -5669,13 +4923,6 @@ msgstr "TAJVAN" #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 -<<<<<<< HEAD -<<<<<<< HEAD -======= -#, fuzzy ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Hungarian and Turkish translations. msgid "TAS Input" msgstr "TAS bemenet" @@ -5698,24 +4945,13 @@ msgstr "Tábla jobbra" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: 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:82 msgid "TaruKonga (Bongos)" -<<<<<<< HEAD -msgstr "" -======= msgstr "TaruKonga (Bongos)" ->>>>>>> Update from master branch. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" @@ -5941,31 +5177,12 @@ 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 -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Fent" @@ -6076,21 +5293,6 @@ 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 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Ismeretlen mutató %#08x\n" -"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" @@ -6252,54 +5454,18 @@ msgstr "" #: Source/Core/Core/Src/Movie.cpp:667 #, c-format -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update the pot file to reflect recent changes in the code. 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 "" -<<<<<<< HEAD -<<<<<<< HEAD -======= -======= ->>>>>>> Update the pot file to reflect recent changes in the code. "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." -<<<<<<< HEAD ->>>>>>> Update from master branch. - -#: 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 "" -<<<<<<< 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. -======= -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." -======= ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/Core/Src/Movie.cpp:684 #, c-format -<<<<<<< HEAD -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." ->>>>>>> Update Hungarian translation. -======= 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-" @@ -6309,7 +5475,6 @@ msgstr "" "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 the pot file to reflect recent changes in the code. #: Source/Core/Core/Src/Movie.cpp:693 #, c-format @@ -6329,22 +5494,10 @@ 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 -<<<<<<< HEAD -<<<<<<< HEAD -======= -======= ->>>>>>> Update the pot file to reflect recent changes in the code. "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" -<<<<<<< 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" ->>>>>>> Update Hungarian translation. -======= ->>>>>>> Update the pot file to reflect recent changes in the code. "\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" @@ -6354,18 +5507,8 @@ msgstr "" "%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" -<<<<<<< HEAD -<<<<<<< HEAD "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. -======= -"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 Hungarian translation. -======= -"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 the pot file to reflect recent changes in the code. #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 @@ -6400,19 +5543,7 @@ msgstr "Wii NAND gyökér könyvtár:" msgid "Wii Save Import" msgstr "Wii mentés importálása" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii mentés fájlok (*.bin)|*.bin" @@ -6443,15 +5574,7 @@ 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" @@ -6483,27 +5606,9 @@ msgstr "Jobb Windows" msgid "Word Wrap" msgstr "Word Wrap" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Folyamatban..." diff --git a/Languages/po/it.po b/Languages/po/it.po index bc89c73efc..dc19d18fea 100644 --- a/Languages/po/it.po +++ b/Languages/po/it.po @@ -7,19 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< 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. -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-04-08 20:40+0100\n" "Last-Translator: RebuMan, Dolphin Team\n" "Language-Team: \n" @@ -564,27 +552,9 @@ msgstr "Aggiungi Patch" msgid "Add new pane" msgstr "Aggiungi nuovo riquadro" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Aggiungi..." @@ -656,23 +626,8 @@ 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 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Tutti gli Stati di Gioco Salvati (sav, s##)" @@ -756,19 +711,7 @@ 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 -<<<<<<< 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/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Aspetto:" @@ -790,19 +733,7 @@ msgstr "Interfaccia Audio:" msgid "AudioCommon: Error opening AO device.\n" msgstr "Audiocommon: Errore nell'apertura della periferica AO.\n" -<<<<<<< HEAD -<<<<<<< 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/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -915,19 +846,7 @@ msgid "Blue Right" msgstr "Blu Destro" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Sotto" @@ -960,15 +879,7 @@ 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" @@ -1204,21 +1115,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< 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 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Chiudi" @@ -1327,15 +1225,7 @@ 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..." @@ -1523,21 +1413,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "Motore di Emulazione DSP" -<<<<<<< HEAD -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulazione DSP HLE (veloce)" @@ -1765,19 +1642,7 @@ msgstr "Visualizza i tasti di input letti dall'emulatore." msgid "Divide" msgstr "/" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Vuoi interrompere l'emulazione in corso?" @@ -1806,39 +1671,12 @@ msgstr "Dolphin - Configurazione Wiimote Emulato" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Dolphin - Configurazione Controlli GC" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmati TAS Dolphin (*.dtm)" @@ -1927,27 +1765,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Olandese" @@ -2072,41 +1892,16 @@ msgstr "Attiva BAT" msgid "Enable Block Merging" msgstr "Attiva Unione Blocchi" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. 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 -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Abilita Trucchi" @@ -2247,27 +2042,9 @@ msgstr "" msgid "End" msgstr "Fine" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Inglese" @@ -2296,45 +2073,10 @@ msgstr "Uguale" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -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/ConfigMain.cpp:1173 msgid "Error" msgstr "Errore/i" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2809,27 +2551,9 @@ msgstr "Fotogrammi da Registrare:" msgid "Free Look" msgstr "Visuale Libera" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Francese" @@ -2897,19 +2621,7 @@ msgid "Gamecube &Pad Settings" msgstr "Impostazioni &Controlli 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 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Schede di Memoria GameCube (*.raw,*.gcp)" @@ -2934,21 +2646,8 @@ msgstr "" "(codice corrotto oppure tipo di codice non ancora supportato.)" #: 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 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Generale" @@ -2958,27 +2657,9 @@ msgstr "Generale" msgid "General Settings" msgstr "Impostazioni Interfaccia" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Tedesco" @@ -3103,21 +2784,8 @@ msgid "Hotkey Configuration" 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 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Tasti di Scelta Rapida" @@ -3333,19 +3001,7 @@ msgstr "" "E' stata sollevata un'Eccezione all'Installazione, tuttavia questa " "piattaforma non la supporta ancora." -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Installazione WAD..." @@ -3429,27 +3085,9 @@ msgstr "File di registrazione non valido" msgid "Invalid state" msgstr "Stato non valido" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italiano" @@ -3608,36 +3246,12 @@ msgstr "Carica Stato di Gioco dall'Ingresso 8" msgid "Load State..." msgstr "Carica Stato di Gioco..." -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "Carica il Menu di Sistema Wii %d%c" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carica il Menu di Sistema Wii %d%c" @@ -3720,15 +3334,7 @@ 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" @@ -3759,19 +3365,7 @@ msgid "Memory Byte" msgstr "Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Scheda di Memoria" @@ -3957,19 +3551,7 @@ msgstr "TN Tab" msgid "NP Up" msgstr "TN Su" -<<<<<<< HEAD -<<<<<<< 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/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4056,15 +3638,7 @@ 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" @@ -4125,14 +3699,7 @@ 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" @@ -4266,23 +3833,8 @@ msgstr "Patches" msgid "Paths" msgstr "Percorsi" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: 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/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -4303,23 +3855,8 @@ msgstr "Prospettiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Gioca" @@ -4345,19 +3882,7 @@ msgstr "Opzioni di Riproduzione" msgid "Players" msgstr "Giocatori" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Per favore confermare..." @@ -4571,31 +4096,10 @@ msgstr "Aggiorna Elenco" msgid "Refresh game list" msgstr "Aggiorna elenco giochi" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Rimuovi" @@ -4614,14 +4118,7 @@ msgid "Render to Main Window" 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" @@ -4664,19 +4161,7 @@ msgstr "Sa&lva Stato di Gioco" msgid "Safe" msgstr "Accurata" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Frequenza di Campionamento:" @@ -4761,19 +4246,7 @@ msgstr "Il salvataggio del filmato %s è corrotto, arresto registrazione..." msgid "Scaled EFB Copy" msgstr "Scala Copie EFB" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "Ricerca..." @@ -4813,39 +4286,12 @@ msgstr "Sezione %s non trovata in SYSCONF" msgid "Select" msgstr "Seleziona" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Seleziona il File di Registrazione" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Seleziona un file WAD Wii da installare" @@ -4871,13 +4317,7 @@ msgstr "Seleziona finestre libere/mobili" msgid "Select the file to load" msgstr "Seleziona il file da caricare" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Seleziona il file di salvataggio" @@ -4885,29 +4325,7 @@ msgstr "Seleziona il file di salvataggio" msgid "Select the state to load" msgstr "Seleziona lo stato di gioco da caricare" -<<<<<<< HEAD -#: 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: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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Seleziona lo stato di gioco da salvare" @@ -5262,27 +4680,9 @@ msgstr "Creazione buffer audio non riuscita: %s" msgid "Space" msgstr "Spazio" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Spagnolo" @@ -5318,15 +4718,7 @@ 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" @@ -5361,14 +4753,7 @@ msgstr "Levetta" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: 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" @@ -5441,14 +4826,7 @@ msgstr "Semipiano destro" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: 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" @@ -5675,31 +5053,12 @@ 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 -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Sopra" @@ -5805,21 +5164,6 @@ msgstr "" "Messaggio sconosciuto avente id:%d ricevuto dal giocatore:%d Giocatore " "espluso!!" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Puntatore %#08x sconosciuto\n" -"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" @@ -6036,19 +5380,7 @@ msgstr "Origine DVD:" msgid "Wii Save Import" msgstr "Importa Salvataggi Wii" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Salva i file Wii (*.bin)|*.bin" @@ -6079,15 +5411,7 @@ 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" @@ -6120,27 +5444,9 @@ msgstr "Windows Destro" msgid "Word Wrap" msgstr "Adatta Testo" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Attività in corso..." diff --git a/Languages/po/ja.po b/Languages/po/ja.po index eec5710d55..f69337fcf9 100644 --- a/Languages/po/ja.po +++ b/Languages/po/ja.po @@ -7,25 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-10-12 20:45+0900\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" -<<<<<<< HEAD -"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" "Language-Team: \n" "Language: Japanese\n" @@ -443,13 +426,6 @@ msgid "Accurate VBeam emulation" msgstr "Accurate VBeam emulation" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 -<<<<<<< HEAD -<<<<<<< HEAD -======= -#, fuzzy ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Arabic and Japanese translations. msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -574,27 +550,9 @@ msgstr "パッチを追加" msgid "Add new pane" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "追加" @@ -660,23 +618,8 @@ msgstr "全ての GC/Wii イメージ (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "GC GCMファイル (gcm)|*.gcm" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "全てのステートセーブファイル (sav, s##)" @@ -704,24 +647,9 @@ msgstr "" "\n" "よく分からなければ、チェックを入れないでください。" -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -<<<<<<< HEAD -<<<<<<< HEAD -msgid "Alternate Wiimote Timing" -msgstr "Wii リモコンの同期調整" -======= -#, fuzzy -msgid "Alternate Wiimote Timing" -msgstr "Wii リモコンをエミュレート" ->>>>>>> Update translation files for recent changes in the code. -======= -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Alternate Wiimote Timing" msgstr "Wii リモコンの同期調整" ->>>>>>> Update Arabic and Japanese translations. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372 msgid "Anisotropic Filtering:" @@ -779,19 +707,7 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "このタイトルの実体ファイルを削除しますか？元に戻すことはできません！" -<<<<<<< HEAD -<<<<<<< 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/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "アスペクト比：" @@ -813,19 +729,7 @@ msgstr "出力API (Audio Backend)" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error opening AO device.\n" -<<<<<<< HEAD -<<<<<<< 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/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "自動" @@ -940,19 +844,7 @@ msgid "Blue Right" msgstr "青 - 右" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "下部" @@ -985,15 +877,7 @@ 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" @@ -1238,21 +1122,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< 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 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "閉じる" @@ -1360,15 +1231,7 @@ 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 "接続中..." @@ -1558,21 +1421,8 @@ msgstr "サウンド" msgid "DSP Emulator Engine" msgstr "DSPエミュレーション方式" -<<<<<<< HEAD -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP-HLE エミュレーション (高速)" @@ -1811,19 +1661,7 @@ msgstr "" msgid "Divide" msgstr "Divide" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "動作中のゲームを停止しますか？" @@ -1852,39 +1690,12 @@ msgstr "Wii リモコンのエミュレーション設定" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "GCコントローラ設定" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS ムービー (*.dtm)" @@ -1981,27 +1792,9 @@ msgstr "" "\n" "よく分からなければ、チェックを入れないでください。" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "オランダ語" @@ -2141,40 +1934,15 @@ msgstr "Enable BAT" msgid "Enable Block Merging" msgstr "Enable Block Merging" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. 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 -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "チートコードを有効化" @@ -2328,27 +2096,9 @@ msgstr "" msgid "End" msgstr "End" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "英語" @@ -2377,45 +2127,10 @@ msgstr "に一致する" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -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/ConfigMain.cpp:1173 msgid "Error" msgstr "エラー" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2884,27 +2599,9 @@ msgstr "録画フレーム数設定" msgid "Free Look" msgstr "フリールック" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "フランス語" @@ -2971,19 +2668,7 @@ msgid "Gamecube &Pad Settings" msgstr "ゲームキューブ入力設定(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "メモリーカードファイル (*.raw,*.gcp)|*.raw;*.gcp" @@ -3008,21 +2693,8 @@ 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 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "一般" @@ -3031,27 +2703,9 @@ msgstr "一般" msgid "General Settings" msgstr "一般" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "ドイツ語" @@ -3074,13 +2728,6 @@ msgid "Greater Than" msgstr "より大きい" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -<<<<<<< HEAD -<<<<<<< HEAD -======= -#, fuzzy ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Update Arabic and Japanese translations. msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -3190,21 +2837,8 @@ msgid "Hotkey Configuration" msgstr "ホットキーの設定" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -<<<<<<< HEAD -#: 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "ホットキー" @@ -3429,19 +3063,7 @@ msgstr "" "InstallExceptionHandler が呼び出されましたが、このプラットフォームはまだサ" "ポートされていません" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "WADファイルを追加しています..." @@ -3523,27 +3145,9 @@ msgstr "不正な録画ファイル" msgid "Invalid state" msgstr "不正なセーブ／ロードファイル" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "イタリア語" @@ -3701,35 +3305,11 @@ msgstr "ステートロード - スロット 8" msgid "Load State..." msgstr "ファイルからロード" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Wiiメニューを起動" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "Wiiメニューを起動" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wiiメニューを起動 ( バージョン：%d %c )" @@ -3812,15 +3392,7 @@ 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 "コントロールスティック" @@ -3851,19 +3423,7 @@ msgid "Memory Byte" msgstr "メモリバイト" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "メモリーカード" @@ -4059,19 +3619,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" -<<<<<<< HEAD -<<<<<<< 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/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4158,15 +3706,7 @@ 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 "未接続" @@ -4227,14 +3767,7 @@ 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 "開く" @@ -4365,23 +3898,8 @@ msgstr "パッチ" msgid "Paths" msgstr "フォルダ" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: 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/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "一時停止" @@ -4401,23 +3919,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "開始" @@ -4443,19 +3946,7 @@ msgstr "再生オプション" msgid "Players" msgstr "プレイヤー一覧" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "確認" @@ -4667,31 +4158,10 @@ msgstr "ゲームリストを再更新" msgid "Refresh game list" msgstr "ゲームリストを再更新します" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "削除" @@ -4710,14 +4180,7 @@ msgid "Render to Main Window" 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 "初期化" @@ -4760,19 +4223,7 @@ msgstr "ステートセーブ(&V)" msgid "Safe" msgstr "Safe" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "サンプルレート" @@ -4856,19 +4307,7 @@ msgstr "Savestate movie %s の破損を確認しました。録画を中止し msgid "Scaled EFB Copy" msgstr "Scaled EFB Copy" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "確認中... .%s" @@ -4908,39 +4347,12 @@ msgstr "Section %s not found in SYSCONF" msgid "Select" msgstr "選択" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "録画ファイルを選択" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "追加するWADファイルを選択" @@ -4966,13 +4378,7 @@ msgstr "" msgid "Select the file to load" msgstr "ロードするファイルを選択" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "セーブファイルを選択" @@ -4980,29 +4386,7 @@ msgstr "セーブファイルを選択" msgid "Select the state to load" msgstr "ロードするステートセーブファイルを選択" -<<<<<<< HEAD -#: 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: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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "ステートセーブの保存先を選択" @@ -5381,27 +4765,9 @@ msgstr "Sound buffer creation failed: %s" msgid "Space" msgstr "Space" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "スペイン語" @@ -5445,15 +4811,7 @@ 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" @@ -5488,14 +4846,7 @@ msgstr "スティック" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: 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 "停止" @@ -5572,14 +4923,7 @@ msgstr "右テーブル" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: 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 "スクリーンショット" @@ -5815,31 +5159,12 @@ 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 -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "上部" @@ -5948,21 +5273,6 @@ 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 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Unknown pointer %#08x\n" -"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" @@ -6190,19 +5500,7 @@ msgstr "Wii NANDルート" msgid "Wii Save Import" msgstr "Wiiのセーブデータをインポート" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wiiセーブデータ (*.bin)|*.bin" @@ -6233,15 +5531,7 @@ 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 リモコン接続中" @@ -6273,27 +5563,9 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "ワードラップ" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "動作中..." @@ -7013,16 +6285,6 @@ msgstr "| (...もしくは)" #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "音声や効果音の再生によく使用されます" -<<<<<<< HEAD - -#~ msgid "" -#~ "Unknown pointer %#08x\n" -#~ "Continue?" -#~ msgstr "" -#~ "Unknown pointer %#08x\n" -#~ "Continue?" -======= ->>>>>>> Update translation files for recent changes in the code. #~ msgid "" #~ "Unknown pointer %#08x\n" diff --git a/Languages/po/ko.po b/Languages/po/ko.po index 338b22dab0..41813f2e85 100644 --- a/Languages/po/ko.po +++ b/Languages/po/ko.po @@ -7,24 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -<<<<<<< HEAD -======= -"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" -======= -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2012-01-19 11:47+0900\n" ->>>>>>> Update Korean translations. "Last-Translator: \n" "Language-Team: \n" "Language: Korean\n" @@ -566,27 +550,9 @@ msgstr "패치 추가" msgid "Add new pane" msgstr "새로운 창 추가" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "추가..." @@ -654,23 +620,8 @@ msgstr "모든 GC/Wii 이미지들 (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "모든 게임큐브 GCM 파일들 (gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "모든 상태들 저장 (sav, s##)" @@ -757,19 +708,7 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "이 파일을 정말로 지우고 싶습니까? 그것은 영원히 사라집니다!" -<<<<<<< HEAD -<<<<<<< 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/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "종횡비:" @@ -791,19 +730,7 @@ msgstr "오디오 백엔드:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: AO 장치를 열기 에러.\n" -<<<<<<< HEAD -<<<<<<< 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/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "자동" @@ -918,19 +845,7 @@ msgid "Blue Right" msgstr "파랑 오른쪽" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "아래" @@ -963,15 +878,7 @@ 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" @@ -1211,21 +1118,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< 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 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "닫기" @@ -1333,15 +1227,7 @@ 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 "연결중..." @@ -1531,21 +1417,8 @@ msgstr "오디오" msgid "DSP Emulator Engine" msgstr "DSP 에뮬레이터 엔진" -<<<<<<< HEAD -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE 에뮬레이션 (빠름)" @@ -1782,19 +1655,7 @@ msgstr "" msgid "Divide" msgstr "나누기" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "현재 에뮬레이션을 중단하고 싶습니까?" @@ -1823,39 +1684,12 @@ msgstr "돌핀 에뮬된 위모트 환경설정" msgid "Dolphin FIFO" msgstr "돌핀 FIFO" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "돌핀 GC패드 환경설정" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "돌핀 TAS 동영상 (*.dtm)" @@ -1951,27 +1785,9 @@ msgstr "" "\n" "모르겠으면, 이것을 언체크로 두세요." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "네덜란드어" @@ -2110,40 +1926,15 @@ msgstr "BAT 활성" msgid "Enable Block Merging" msgstr "블록 합치기 활성" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. 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 -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "치트 활성" @@ -2294,27 +2085,9 @@ msgstr "" msgid "End" msgstr "끝" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "영어" @@ -2343,47 +2116,10 @@ msgstr "같음" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -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 "" -"PlayWiimote에 에러발생. %u != %u, byte %d.\n" -"죄송합니다, Wii 녹화가 일시적으로 깨졌습니다." - ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "에러" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "선택된 언어 로딩 에러. 시스템 기본으로 돌아갑니다." @@ -2850,27 +2586,9 @@ msgstr "녹화할 프레임" msgid "Free Look" msgstr "자유로운 보기" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "프랑스어" @@ -2936,19 +2654,7 @@ msgid "Gamecube &Pad Settings" msgstr "게임큐브 패드 설정(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "게임큐브 메모리 카드들 (*.raw,*.gcp)" @@ -2973,21 +2679,8 @@ msgstr "" "(잘못된 코드이거나 코드 타입이 아직 지원않된다.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: 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/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "일반" @@ -2996,27 +2689,9 @@ msgstr "일반" msgid "General Settings" msgstr "일반 설정" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "독일어" @@ -3147,21 +2822,8 @@ msgid "Hotkey Configuration" 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 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "단축키들" @@ -3387,19 +3049,7 @@ msgstr "" "InstallExceptionHandler 호출됨, 하지만 이 플랫폼은 아직 그것을 지원하지 않습" "니다." -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "WAD 설치하기..." @@ -3481,27 +3131,9 @@ msgstr "비적합 기록 파일" msgid "Invalid state" msgstr "비적합 상태" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "이탈리아어" @@ -3659,35 +3291,11 @@ msgstr "슬롯8 상태 로드" msgid "Load State..." msgstr "상태 로드..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Wii 시스템 메뉴 로드" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "Wii 시스템 메뉴 로드" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii 시스템 메뉴 %d %c 로드" @@ -3769,15 +3377,7 @@ 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 "메인 스틱" @@ -3808,19 +3408,7 @@ msgid "Memory Byte" msgstr "메모리 바이트" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "메모리 카드" @@ -4018,19 +3606,7 @@ msgstr "NP 탭" msgid "NP Up" msgstr "NP 위" -<<<<<<< HEAD -<<<<<<< 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/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4117,15 +3693,7 @@ 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 "연결되지 않음" @@ -4186,14 +3754,7 @@ 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 "열기" @@ -4321,23 +3882,8 @@ msgstr "패치" msgid "Paths" msgstr "경로" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: 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/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "일시정지" @@ -4357,23 +3903,8 @@ msgstr "관점 %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr " 실행 " @@ -4399,19 +3930,7 @@ msgstr "재생 옵션" msgid "Players" msgstr "플레이어" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "확인해주세요..." @@ -4622,31 +4141,10 @@ msgstr "목록 새로 고침" msgid "Refresh game list" msgstr "게임 목록 새로 고침" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "제거" @@ -4665,14 +4163,7 @@ msgid "Render to Main Window" 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 "리셋" @@ -4715,19 +4206,7 @@ msgstr "상태 저장(&v) " msgid "Safe" msgstr "안전" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "샘플율:" @@ -4811,19 +4290,7 @@ msgstr "%s 영상 상태저장이 손상되었습니다, 영상 기록 중지... msgid "Scaled EFB Copy" msgstr "스케일된 EFB 복사" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "스캐닝 %s" @@ -4863,39 +4330,12 @@ msgstr "섹션 %s를 SYSCONF에서 찾을 수 없음" msgid "Select" msgstr "선택" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "기록 파일 선택" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "설치할 Wii WAD 파일 선택" @@ -4921,26 +4361,7 @@ msgstr "유동적인 윈도우즈 선택" msgid "Select the file to load" msgstr "로드할 파일 선택" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -msgid "Select the save file" -msgstr "저장 파일을 선택" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "저장 파일을 선택" @@ -4948,16 +4369,7 @@ msgstr "저장 파일을 선택" msgid "Select the state to load" msgstr "로드할 상태 선택" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "저장할 상태 선택" @@ -5332,27 +4744,9 @@ msgstr "사운드 버퍼 생성 실패했습니다: %s" msgid "Space" msgstr "스페이스" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "스페인어" @@ -5396,15 +4790,7 @@ 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" @@ -5439,14 +4825,7 @@ msgstr "스틱" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: 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 "중지" @@ -5522,14 +4901,7 @@ msgstr "테이블 오른쪽" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: 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 "스크린샷 찍기" @@ -5759,31 +5131,12 @@ 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 -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "위" @@ -5893,21 +5246,6 @@ 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 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"알려지지 않은 포인터 %#08x\n" -"계속합니까?" - ->>>>>>> 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" @@ -6153,19 +5491,7 @@ msgstr "Wii NAND 루트:" msgid "Wii Save Import" msgstr "Wii 저장 가져오기" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 저장 파일들 (*.bin)|*.bin" @@ -6196,15 +5522,7 @@ 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 "위모트가 연결됨" @@ -6236,27 +5554,9 @@ msgstr "윈도우즈 오른쪽" msgid "Word Wrap" msgstr "자동 줄바꿈" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "작동중..." diff --git a/Languages/po/nb.po b/Languages/po/nb.po index d2fa9aa314..aa491a3b56 100644 --- a/Languages/po/nb.po +++ b/Languages/po/nb.po @@ -7,19 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< 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. -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-06-06 20:15+0100\n" "Last-Translator: Knut \n" "Language-Team: Norwegian \n" @@ -567,27 +555,9 @@ msgstr "Legg til Patch" msgid "Add new pane" msgstr "Legg til ny rute" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Legg til..." @@ -655,23 +625,8 @@ msgstr "Alle GC/Wii-bildefiler (gcm, iso, ciso, wad)" msgid "All Gamecube GCM files (gcm)" msgstr "Alle GameCube GCM-filer (gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Alle Save States (sav, s##)" @@ -763,19 +718,7 @@ msgstr "" "Er du sikker på at du vil slette denne filen?\n" "Den vil bli borte for alltid!" -<<<<<<< HEAD -<<<<<<< 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/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Aspektforhold:" @@ -797,19 +740,7 @@ msgstr "Audio Backend:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Feil ved åpning av AO-device.\n" -<<<<<<< HEAD -<<<<<<< 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/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automatisk" @@ -924,19 +855,7 @@ msgid "Blue Right" msgstr "Blå Høyre" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Bunn" @@ -969,15 +888,7 @@ 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" @@ -1218,21 +1129,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< 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 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Lukk" @@ -1340,15 +1238,7 @@ 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..." @@ -1537,21 +1427,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "CPU Emulatormotor" -<<<<<<< HEAD -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE-emulering (raskt)" @@ -1790,19 +1667,7 @@ msgstr "" msgid "Divide" msgstr "Del" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Vil du stoppe pågående emulering?" @@ -1831,39 +1696,12 @@ msgstr "Dolphin Emulert Wiimote Konfigurasjon" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC-kontroll konfigurasjon" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS-Filmer (*.dtm)" @@ -1959,27 +1797,9 @@ msgstr "" "\n" "Hvis usikker, la stå avslått." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Nederlansk" @@ -2118,40 +1938,15 @@ msgstr "Aktiver BAT" msgid "Enable Block Merging" msgstr "Aktiver Block Merging" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. 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 -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Aktiver Juksekoder" @@ -2306,27 +2101,9 @@ msgstr "" msgid "End" msgstr "Slutt" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Engelsk" @@ -2355,45 +2132,10 @@ msgstr "Lik" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -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/ConfigMain.cpp:1173 msgid "Error" msgstr "Feil" ->>>>>>> Update the pot file to reflect recent changes in the code. #: 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." @@ -2859,27 +2601,9 @@ msgstr "Bilder Til Opptak" msgid "Free Look" msgstr "Fri Utkikk" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Fransk" @@ -2946,19 +2670,7 @@ msgid "Gamecube &Pad Settings" msgstr "Innstillinger for &GameCube-kontroll" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "GameCube-minnekort (*.raw,*.gcp)" @@ -2983,21 +2695,8 @@ msgstr "" "(Enten en dårlig kode, eller så støttes ikke kodeformatet.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: 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/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Generelt" @@ -3006,27 +2705,9 @@ msgstr "Generelt" msgid "General Settings" msgstr "Generelle Innstillinger" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Tysk" @@ -3157,21 +2838,8 @@ msgid "Hotkey Configuration" 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 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Snarveistaster" @@ -3392,19 +3060,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "InstallExceptionHandler kalt, men denne plattformen støtter den ikke." -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Installer WAD..." @@ -3486,27 +3142,9 @@ msgstr "Ugyldig opptaksfil" msgid "Invalid state" msgstr "Ugyldig save state" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italiensk" @@ -3664,35 +3302,11 @@ msgstr "Last Inn Save State Slot 8" msgid "Load State..." msgstr "Last Inn Save State..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "Last inn Wii System Meny" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Last inn Wii System Meny %d %c" @@ -3774,15 +3388,7 @@ 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" @@ -3813,19 +3419,7 @@ msgid "Memory Byte" msgstr "Memory Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Minnekort" @@ -4023,19 +3617,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Opp" -<<<<<<< HEAD -<<<<<<< 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/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4122,15 +3704,7 @@ 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" @@ -4191,14 +3765,7 @@ 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" @@ -4329,23 +3896,8 @@ msgstr "Patcher" msgid "Paths" msgstr "Mappestier" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: 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/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -4365,23 +3917,8 @@ msgstr "Perspektiv %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Spill" @@ -4407,19 +3944,7 @@ msgstr "Avspillingsalterntiver" msgid "Players" msgstr "Spillere" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Vennligst bekreft..." @@ -4632,31 +4157,10 @@ msgstr "Oppdater liste" msgid "Refresh game list" msgstr "Oppdater spilliste" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Fjern" @@ -4675,14 +4179,7 @@ msgid "Render to Main Window" 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" @@ -4725,19 +4222,7 @@ msgstr "Lagre Sa&ve State" msgid "Safe" msgstr "Sikker" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Samplingsratio:" @@ -4821,19 +4306,7 @@ msgstr "Save State-film %s er korrupt, opptak avsluttes..." msgid "Scaled EFB Copy" msgstr "Skalert EFB-kopi" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Søker i %s" @@ -4873,39 +4346,12 @@ msgstr "Seksjon %s ikke funnet i SYSCONF" msgid "Select" msgstr "Velg" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Velg Opptaksfil" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Velg en Wii WAD-fil å innstallere" @@ -4931,26 +4377,7 @@ msgstr "Velg flytvindu" msgid "Select the file to load" msgstr "Velg fil å laste" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -msgid "Select the save file" -msgstr "Velg lagringsfil" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Velg lagringsfil" @@ -4958,16 +4385,7 @@ msgstr "Velg lagringsfil" msgid "Select the state to load" msgstr "Velg en save state å laste" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Velg en save state å lagre" @@ -5344,27 +4762,9 @@ msgstr "Laging av lydbuffer mislyktes: %s" msgid "Space" msgstr "Mellomrom" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Spansk" @@ -5407,15 +4807,7 @@ 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" @@ -5450,14 +4842,7 @@ msgstr "Joystick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: 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" @@ -5535,14 +4920,7 @@ msgstr "Tabell Høyre" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: 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" @@ -5772,31 +5150,12 @@ 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 -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Topp" @@ -5903,21 +5262,6 @@ 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 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Ukjent peker %#08x\n" -"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" @@ -6144,19 +5488,7 @@ msgstr "Wii NAND-rot:" msgid "Wii Save Import" msgstr "Importer Wii-lagringsfil" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii-lagringsfiler (*.bin)|*.bin" @@ -6187,15 +5519,7 @@ 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" @@ -6228,27 +5552,9 @@ msgstr "Windows Høyre" msgid "Word Wrap" msgstr "Ordkrumning" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Arbeider..." diff --git a/Languages/po/nl.po b/Languages/po/nl.po index 017f33c5c1..6462e84f3c 100644 --- a/Languages/po/nl.po +++ b/Languages/po/nl.po @@ -7,19 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< 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. -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-08-07 16:43+0100\n" "Last-Translator: Goost \n" "Language-Team: DevPro Team. \n" @@ -568,27 +556,9 @@ msgstr "Voeg Patch toe" msgid "Add new pane" msgstr "Voeg een nieuwe paneel toe" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Voeg toe..." @@ -656,23 +626,8 @@ msgstr "Alle GC/Wii images (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Alle Gamecube GCM bestanden (gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Alle Opgeslagen Staten (sav, s##)" @@ -763,19 +718,7 @@ msgstr "" "Weet je zeker dat je dit bestand wilt verwijderen? Deze gegevens zijn niet " "terug te halen!" -<<<<<<< HEAD -<<<<<<< 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/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Beeldverhouding:" @@ -797,19 +740,7 @@ msgstr "Geluid Backend:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Fout bij het openen van een AO toestel. \n" -<<<<<<< HEAD -<<<<<<< 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/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -920,19 +851,7 @@ msgid "Blue Right" msgstr "Blauw Rechts" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Onder" @@ -965,15 +884,7 @@ 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" @@ -1216,21 +1127,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< 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 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Sluit" @@ -1339,15 +1237,7 @@ 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..." @@ -1537,21 +1427,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "DSP Emulator Motor" -<<<<<<< HEAD -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulatie (snel)" @@ -1792,19 +1669,7 @@ msgstr "" msgid "Divide" msgstr "Verdelen" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Wil je de emulatie stoppen?" @@ -1833,39 +1698,12 @@ msgstr "Dolphin Geëmuleerde Wiimote configuratie" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Configuratie" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Film (*.dtm)" @@ -1960,27 +1798,9 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Nederlands" @@ -2119,41 +1939,16 @@ msgstr "Activeer BAT" msgid "Enable Block Merging" msgstr "Activeer Block Merging" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. 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 -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Activeer Cheats" @@ -2309,27 +2104,9 @@ msgstr "" msgid "End" msgstr "Einde" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Engels" @@ -2358,45 +2135,10 @@ msgstr "Gelijk" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -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/ConfigMain.cpp:1173 msgid "Error" msgstr "Error (Fout)" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2869,27 +2611,9 @@ msgstr "Frames om op te nemen" msgid "Free Look" msgstr "Vrije kijk" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Frans" @@ -2957,19 +2681,7 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube &Pad Instellingen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube Memory Kaarten (*.raw,*.gcp)" @@ -2994,21 +2706,8 @@ msgstr "" "(ofwel een onjuiste code of het type code is nog niet ondersteund.)" #: 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 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Algemeen" @@ -3017,27 +2716,9 @@ msgstr "Algemeen" msgid "General Settings" msgstr "Algemene Instellingen" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Duits" @@ -3168,21 +2849,8 @@ msgid "Hotkey Configuration" 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 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Hotkeys" @@ -3409,19 +3077,7 @@ msgstr "" "InstallExceptionHandler opgeroepen, maar dit platform ondersteund dit nog " "niet." -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "WAD aan het installeren..." @@ -3504,27 +3160,9 @@ msgstr "Onjuist opname bestand" msgid "Invalid state" msgstr "Onjuiste staat" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italië" @@ -3682,36 +3320,12 @@ msgstr "Laad staat 8" msgid "Load State..." msgstr "Laad staat..." -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "Laad Wii System Menu(%d %c)" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Laad Wii System Menu(%d %c)" @@ -3793,15 +3407,7 @@ 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 "" @@ -3832,19 +3438,7 @@ msgid "Memory Byte" msgstr "Geheugen Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Geheugen Kaart" @@ -4043,19 +3637,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Omhoog" -<<<<<<< HEAD -<<<<<<< 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/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4142,15 +3724,7 @@ 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" @@ -4211,14 +3785,7 @@ 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" @@ -4350,23 +3917,8 @@ msgstr "Patches" msgid "Paths" msgstr "Pad" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: 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/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pauze" @@ -4386,23 +3938,8 @@ msgstr "Perspectief %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Speel" @@ -4428,19 +3965,7 @@ msgstr "Terugspeel Opties" msgid "Players" msgstr "Spelers" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Bevestig alsjeblieft..." @@ -4653,31 +4178,10 @@ msgstr "Lijst Verversen" msgid "Refresh game list" msgstr "Ververs de speellijst" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Verwijder" @@ -4697,14 +4201,7 @@ msgid "Render to Main Window" 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" @@ -4747,19 +4244,7 @@ msgstr "S&la Staat Op" msgid "Safe" msgstr "Opslaan" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Sample Rate:" @@ -4844,19 +4329,7 @@ msgstr "Save staat film %s is corrupt, het opnemen van de film is gestopt..." msgid "Scaled EFB Copy" msgstr "EFB Verkleinde Kopie" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Scannen van %s" @@ -4896,39 +4369,12 @@ msgstr "Sectie %s niet gevonden in SYSCONF" msgid "Select" msgstr "Selecteer" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Selecteer de opname Bestand" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Selecteer een Wii WAD bestand om te installeren" @@ -4954,13 +4400,7 @@ msgstr "Selecteer zwevende vensters" msgid "Select the file to load" msgstr "Selecteer het bestand om het te laden" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Selecteer het save - bestand" @@ -4968,29 +4408,7 @@ msgstr "Selecteer het save - bestand" msgid "Select the state to load" msgstr "Selecteer de Staat om te laden" -<<<<<<< HEAD -#: 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: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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Selecteer de Staat om op te slaan" @@ -5363,27 +4781,9 @@ msgstr "Het aanmaken van de geluids buffer is mislukt: %s" msgid "Space" msgstr "Ruimte" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Spaans" @@ -5427,15 +4827,7 @@ 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" @@ -5470,14 +4862,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: 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" @@ -5549,14 +4934,7 @@ msgstr "Rechter Tabel" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: 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" @@ -5786,31 +5164,12 @@ 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 -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Boven" @@ -5920,21 +5279,6 @@ msgstr "" "Onbekend bericht ontvagen met id : %d ontvangen van speler: %d Speler " "eruitgeschopt!" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Onbekende pointer %#08x\n" -"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" @@ -6162,19 +5506,7 @@ msgstr "Wii NAND basismap:" msgid "Wii Save Import" msgstr "Wii Save Importeren" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii save bestanden (*.bin)|*.bin" @@ -6205,15 +5537,7 @@ 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" @@ -6246,27 +5570,9 @@ msgstr "Venster Rechts" msgid "Word Wrap" msgstr "Regelafbreking" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Werken..." diff --git a/Languages/po/pl.po b/Languages/po/pl.po index b4a21374be..ef05f0c54c 100644 --- a/Languages/po/pl.po +++ b/Languages/po/pl.po @@ -7,19 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< 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. -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-08-12 17:04+0100\n" "Last-Translator: Krzysztof Baszczok \n" "Language-Team: Polish \n" @@ -566,27 +554,9 @@ msgstr "Dodaj łatkę" msgid "Add new pane" msgstr "Dodaj nowy panel" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Dodaj..." @@ -654,23 +624,8 @@ msgstr "Wszystkie obrazy GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Pliki GCM" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Stany zapisu (sav, s##)" @@ -758,19 +713,7 @@ 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 -<<<<<<< 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/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Proporcje ekranu:" @@ -792,19 +735,7 @@ msgstr "Audio Backend :" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Błąd otwarcia urządzenia AO.\n" -<<<<<<< HEAD -<<<<<<< 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/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -919,19 +850,7 @@ msgid "Blue Right" msgstr "Niebieski prawo" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Dół" @@ -964,15 +883,7 @@ 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" @@ -1171,19 +1082,7 @@ msgstr "Wybierz plik do otwarcia" msgid "Choose a memory card:" msgstr "Wybierz kartę pamięci:" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1225,21 +1124,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< 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 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Zamknij" @@ -1347,15 +1233,7 @@ 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ę..." @@ -1471,19 +1349,7 @@ msgstr "Utwórz nową perspektywę" msgid "Created by KDE-Look.org" msgstr "Utworzone przez KDE-Look.org" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" @@ -1558,21 +1424,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "DSP Emulator Engine" -<<<<<<< HEAD -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulacja (szybkie)" @@ -1811,19 +1664,7 @@ msgstr "" msgid "Divide" msgstr "Podziel" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Zatrzymać aktualną emulację?" @@ -1852,39 +1693,12 @@ msgstr "Konfiguracja emulowanego Wiilota" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Konfiguracja GCPad'a" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmy TAS (*.dtm)" @@ -1896,15 +1710,7 @@ 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..." @@ -1912,15 +1718,7 @@ 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..." @@ -1996,27 +1794,9 @@ msgstr "" "\n" "W razie wątpliwości, pozostaw wyłączone." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Holenderski" @@ -2156,40 +1936,15 @@ msgstr "Włącz BAT" msgid "Enable Block Merging" msgstr "Włącz łączenie bloków" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. 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 -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Włącz kody" @@ -2288,19 +2043,7 @@ msgstr "" "\n" "W razie wątpliwości, pozostaw wyłączone." -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2356,27 +2099,9 @@ msgstr "" msgid "End" msgstr "Koniec" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Angielski" @@ -2405,45 +2130,10 @@ msgstr "Równy" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -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/ConfigMain.cpp:1173 msgid "Error" msgstr "Błąd" ->>>>>>> Update the pot file to reflect recent changes in the code. #: 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." @@ -2451,10 +2141,6 @@ msgstr "Błąd wczytywania wybranego języka. Ustawienia domyślne." #: Source/Core/Common/Src/ChunkFile.h:194 #, 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 "" @@ -2462,8 +2148,6 @@ msgstr "" #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format msgid "" -======= ->>>>>>> Update translation files for recent changes in the code. "Error: Trying to access %s fonts but they are not loaded. Games may not show " "fonts correctly, or crash." msgstr "" @@ -2914,27 +2598,9 @@ msgstr "Ramki do nagrania" msgid "Free Look" msgstr "Free Look" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Francuski" @@ -3001,19 +2667,7 @@ msgid "Gamecube &Pad Settings" msgstr "Ustawienia &pada GC" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Karty pamięci GC (*.raw,*.gcp)" @@ -3038,21 +2692,8 @@ msgstr "" "(zły kod albo typ kodu nie jest jeszcze wspierany)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: 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/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Główne" @@ -3061,27 +2702,9 @@ msgstr "Główne" msgid "General Settings" msgstr "Ustawienia ogólne" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Niemiecki" @@ -3210,21 +2833,8 @@ msgid "Hotkey Configuration" 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 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Skróty klawiszowe" @@ -3304,20 +2914,8 @@ msgstr "" "Jeśli FPS jest niezrównoważony, ta opcja może pomóc. (ON = kompatybilny, OFF " "= szybko)" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 #, fuzzy ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " @@ -3459,19 +3057,7 @@ msgid "" msgstr "" "InstallExceptionHandler wywołany, ale ta platforma nie wspiera go jeszcze." -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Instalacja WAD..." @@ -3553,27 +3139,9 @@ msgstr "Newłaściwy plik nagrania" msgid "Invalid state" msgstr "Niewłaściwy stan" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Włoski" @@ -3731,35 +3299,11 @@ msgstr "Wczytaj stan Slot 8" msgid "Load State..." msgstr "Wczytaj stan..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Wczytaj Wii System Menu" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "Wczytaj Wii System Menu" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wczytaj Wii System Menu %d %c" @@ -3841,15 +3385,7 @@ 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" @@ -3880,19 +3416,7 @@ msgid "Memory Byte" msgstr "Bajt pamięci" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Karta pamięci" @@ -4090,19 +3614,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" -<<<<<<< HEAD -<<<<<<< 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/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4189,15 +3701,7 @@ 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" @@ -4258,14 +3762,7 @@ 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" @@ -4396,23 +3893,8 @@ msgstr "Patche" msgid "Paths" msgstr "Ścieżki" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: 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/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pause" @@ -4432,23 +3914,8 @@ msgstr "Perspekrtywa %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Play" @@ -4474,19 +3941,7 @@ msgstr "Opcje playback'u" msgid "Players" msgstr "Gracze" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Potwierdź..." @@ -4697,31 +4152,10 @@ msgstr "Odśwież listę" msgid "Refresh game list" msgstr "Odśwież listę gier" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Usuń" @@ -4740,14 +4174,7 @@ msgid "Render to Main Window" 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" @@ -4790,19 +4217,7 @@ msgstr "Zapisz &stan" msgid "Safe" msgstr "Bezpieczny" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Wskaźnik próbkowania:" @@ -4886,19 +4301,7 @@ msgstr "Stan zapisu filmu %s jest uszkodzony, nagrywanie zatrzymane..." msgid "Scaled EFB Copy" msgstr "Scaled EFB Copy" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Sknauję %s" @@ -4938,39 +4341,12 @@ msgstr "Nie odnaleziono sekcji %s w SYSCONF" msgid "Select" msgstr "Select" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Wybierz plik nagrania" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Wybierz plik Wii WAD do zainstalowania" @@ -4996,13 +4372,7 @@ msgstr "Select floating windows" msgid "Select the file to load" msgstr "Wybierz plik do wczytania" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Wybierz plik do zapisu" @@ -5010,29 +4380,7 @@ msgstr "Wybierz plik do zapisu" msgid "Select the state to load" msgstr "Wybierz stan do wczytania" -<<<<<<< HEAD -#: 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: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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Wybierz stan do zapisu" @@ -5105,19 +4453,7 @@ msgstr "Separator" msgid "Serbian" msgstr "Serbski" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 ->>>>>>> Update the pot file to reflect recent changes in the code. 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" @@ -5419,27 +4755,9 @@ msgstr "Utworzenie bufora dźwięku nie powiodło się: %s" msgid "Space" msgstr "Space" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Hiszpański" @@ -5483,15 +4801,7 @@ 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" @@ -5526,14 +4836,7 @@ msgstr "Gałka" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: 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" @@ -5610,14 +4913,7 @@ msgstr "Talerz prawo" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: 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" @@ -5846,31 +5142,12 @@ 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 -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Góra" @@ -5979,21 +5256,6 @@ 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 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Nieznany wskaźnik %#08x\n" -"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" @@ -6220,19 +5482,7 @@ msgstr "Źródło Wii NAND:" msgid "Wii Save Import" msgstr "Import zapisów Wii" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Pliki zapisu Wii (*.bin)|*.bin" @@ -6263,15 +5513,7 @@ 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" @@ -6303,27 +5545,9 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "Zawijanie wierszy" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Pracuję..." diff --git a/Languages/po/pt.po b/Languages/po/pt.po index 1cee620d50..60d895f98c 100644 --- a/Languages/po/pt.po +++ b/Languages/po/pt.po @@ -7,19 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< 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. -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-07-23 15:53-0000\n" "Last-Translator: Zilaan \n" "Language-Team: Zilaan \n" @@ -568,27 +556,9 @@ msgstr "Adicionar Patch" msgid "Add new pane" msgstr "Adicionar novo painel" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Adicionar..." @@ -657,23 +627,8 @@ 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 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Todos os Estados Guardados (sav, s##)" @@ -763,19 +718,7 @@ msgstr "" "Tem a certeza que quer eliminar este ficheiro? Será eliminado " "permanentemente!" -<<<<<<< HEAD -<<<<<<< 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/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Proporção de ecrã:" @@ -797,19 +740,7 @@ msgstr "Áudio Backend :" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Erro ao abrir dispositivo AO.\n" -<<<<<<< HEAD -<<<<<<< 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/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automático" @@ -925,19 +856,7 @@ msgid "Blue Right" msgstr "Azul Direita" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Inferior" @@ -970,15 +889,7 @@ 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" @@ -1224,21 +1135,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< 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 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Fechar" @@ -1346,15 +1244,7 @@ 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..." @@ -1544,21 +1434,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "Motor de Emulador DSP" -<<<<<<< HEAD -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulação de DSP HLE (rápido)" @@ -1797,19 +1674,7 @@ msgstr "" msgid "Divide" msgstr "Dividir" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Deseja parar a emulação actual?" @@ -1838,39 +1703,12 @@ msgstr "Configuração da emulação de Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Configuração de GCPad " #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS filmes (*.dtm)" @@ -1967,27 +1805,9 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Holandês" @@ -2127,40 +1947,15 @@ msgstr "Activar BAT" msgid "Enable Block Merging" msgstr "Activar Fusão de blocos" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. 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 -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Activar Cheats" @@ -2316,27 +2111,9 @@ msgstr "" msgid "End" msgstr "Fim" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Inglês" @@ -2365,45 +2142,10 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -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/ConfigMain.cpp:1173 msgid "Error" msgstr "Erro" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2874,27 +2616,9 @@ msgstr "Quadros para Gravar" msgid "Free Look" msgstr "Vista Livre" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Francês" @@ -2961,19 +2685,7 @@ msgid "Gamecube &Pad Settings" msgstr "Definições de Comando &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 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Cartões de memória Gamecube (*.raw,*.gcp)" @@ -2998,21 +2710,8 @@ msgstr "" "(Ou é um código com erros ou o tipo de código não é suportado.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: 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/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Geral" @@ -3021,27 +2720,9 @@ msgstr "Geral" msgid "General Settings" msgstr "Definições Gerais" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Alemão" @@ -3171,21 +2852,8 @@ msgid "Hotkey Configuration" 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 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Teclas de Atalho" @@ -3411,19 +3079,7 @@ msgid "" msgstr "" "InstallExceptionHandler chamado, mas esta plataforma ainda não a suporta." -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "A Instalar WAD..." @@ -3505,27 +3161,9 @@ msgstr "Ficheiro de Gravação inválido" msgid "Invalid state" msgstr "Estado Inválido" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italiano" @@ -3683,35 +3321,11 @@ msgstr "Carregar Estado Slot 8" msgid "Load State..." msgstr "Carregar Estado..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "Carregar Sistema de Menu Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar Sistema de Menu Wii %d%c" @@ -3793,15 +3407,7 @@ 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" @@ -3832,19 +3438,7 @@ msgid "Memory Byte" msgstr "Byte de Memória" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Cartão de memória" @@ -4043,19 +3637,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Cima" -<<<<<<< HEAD -<<<<<<< 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/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4142,15 +3724,7 @@ 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" @@ -4211,14 +3785,7 @@ 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" @@ -4349,23 +3916,8 @@ msgstr "Patches" msgid "Paths" msgstr "Caminhos" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: 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/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausa" @@ -4385,23 +3937,8 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Começar" @@ -4427,19 +3964,7 @@ msgstr "Opções de Reprodução" msgid "Players" msgstr "Jogadores" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Por favor confirme..." @@ -4652,31 +4177,10 @@ msgstr "Actualizar Lista" msgid "Refresh game list" msgstr "Actualizar lista de Jogos" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Remover" @@ -4695,14 +4199,7 @@ msgid "Render to Main Window" 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" @@ -4745,19 +4242,7 @@ msgstr "Gua&rdar Estado" msgid "Safe" msgstr "Seguro" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Taxa de Amostragem:" @@ -4841,19 +4326,7 @@ 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 -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "A procurar %s" @@ -4893,39 +4366,12 @@ msgstr "Selecção %s não encontrada em SYSCONF" msgid "Select" msgstr "Seleccionar" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Seleccione o Ficheiro de Gravação" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Seleccione um ficheiro Wii WAD para instalar" @@ -4951,26 +4397,7 @@ msgstr "Seleccionar janelas flutuantes" msgid "Select the file to load" msgstr "Seleccione o ficheiro para carregar" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -msgid "Select the save file" -msgstr "Seleccione o ficheiro de jogo guardado" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Seleccione o ficheiro de jogo guardado" @@ -4978,16 +4405,7 @@ msgstr "Seleccione o ficheiro de jogo guardado" msgid "Select the state to load" msgstr "Seleccione o estado para carregar" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Seleccione o estado para gravar" @@ -5368,27 +4786,9 @@ msgstr "Criação do buffer de som falhou: %s" msgid "Space" msgstr "Espaço" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Espanhol" @@ -5432,15 +4832,7 @@ 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" @@ -5475,14 +4867,7 @@ msgstr "Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: 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" @@ -5559,14 +4944,7 @@ msgstr "Table Direita" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: 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" @@ -5802,31 +5180,12 @@ 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 -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Topo" @@ -5935,21 +5294,6 @@ msgstr "" "Mensagem desconhecida com a id:%d recebida pelo jogador:%d Excluindo o " "jogador!" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Apontador desconhecido %#08x\n" -"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" @@ -6179,19 +5523,7 @@ msgstr "Raiz de NAND Wii:" msgid "Wii Save Import" msgstr "Importação de Jogo Guardado Wii" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Ficheiros de jogo guardado Wii (*.bin)|*.bin" @@ -6223,15 +5555,7 @@ 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" @@ -6264,27 +5588,9 @@ msgstr "Janelas Direita" msgid "Word Wrap" msgstr "Moldar o texto" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "A trabalhar..." @@ -6905,10 +6211,6 @@ msgstr "| OU" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Começar a janela renderizada em ecrã inteiro" -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" @@ -6931,11 +6233,6 @@ 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 d12775657f..45cab5d3a0 100644 --- a/Languages/po/pt_BR.po +++ b/Languages/po/pt_BR.po @@ -7,22 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "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" @@ -572,27 +558,9 @@ msgstr "Adicionar Patch" msgid "Add new pane" msgstr "Adicionar novo painél" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Adicionar..." @@ -660,23 +628,8 @@ 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 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Todos os Pontos de Jogo Salvos (sav, s##)" @@ -766,19 +719,7 @@ msgstr "" "Você tem certeza que quer deletar este arquivo? Ele ficará perdido para " "sempre!" -<<<<<<< HEAD -<<<<<<< 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/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Proporção:" @@ -800,19 +741,7 @@ msgstr "Backend de Audio" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Erro ao abrir o dispositivo AO.\n" -<<<<<<< HEAD -<<<<<<< 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/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Automático" @@ -928,19 +857,7 @@ msgid "Blue Right" msgstr "Azul Direito" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Embaixo" @@ -973,15 +890,7 @@ 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" @@ -1184,19 +1093,7 @@ msgstr "Escolher um arquivo para abrir" msgid "Choose a memory card:" msgstr "Escolher um cartão de memória:" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1238,21 +1135,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< 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 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Fechar" @@ -1360,15 +1244,7 @@ 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..." @@ -1485,19 +1361,7 @@ msgstr "Criar nova perspectiva" msgid "Created by KDE-Look.org" msgstr "Criado por KDE-Look.org" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" @@ -1570,21 +1434,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "Engine de Emulação do DSP" -<<<<<<< HEAD -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "Emulação HLE do DSP (rápido)" @@ -1823,19 +1674,7 @@ msgstr "" msgid "Divide" msgstr "Dividir" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Você quer parar a emulação atual?" @@ -1864,39 +1703,12 @@ msgstr "Configuração de Wiimote Emulado do Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Configuração do GCPad do Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmes TAS Dolphin (*.dtm)" @@ -1908,15 +1720,7 @@ 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..." @@ -1924,15 +1728,7 @@ 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..." @@ -2008,27 +1804,9 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Holandês" @@ -2168,40 +1946,15 @@ msgstr "Ativar BAT" msgid "Enable Block Merging" msgstr "Ativar Block Merging" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. 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 -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Ativar Cheats" @@ -2301,19 +2054,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2369,27 +2110,9 @@ msgstr "" msgid "End" msgstr "Fim" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "Inglês" @@ -2418,80 +2141,24 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -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/ConfigMain.cpp:1173 msgid "Error" msgstr "Erro" ->>>>>>> Update the pot file to reflect recent changes in the code. #: 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." -<<<<<<< HEAD -#: Source/Core/Common/Src/ChunkFile.h:180 -<<<<<<< HEAD -======= -======= #: Source/Core/Common/Src/ChunkFile.h:194 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" -<<<<<<< HEAD -#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279 ->>>>>>> Update from master branch. -======= #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "" -<<<<<<< HEAD -"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 "" -======= ->>>>>>> Update translation files for recent changes in the code. "Error: Trying to access %s fonts but they are not loaded. Games may not show " "fonts correctly, or crash." msgstr "" @@ -2944,27 +2611,9 @@ msgstr "QUadros para Capturar" msgid "Free Look" msgstr "Olhar Livre" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Francês" @@ -3031,19 +2680,7 @@ msgid "Gamecube &Pad Settings" msgstr "Configurações de &Controle de 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 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Memory Cards do Gamecube (*.raw,*.gcp)" @@ -3068,21 +2705,8 @@ msgstr "" "(É um código ruim ou um tipo de código não suportado.)" #: 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 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Geral" @@ -3091,27 +2715,9 @@ msgstr "Geral" msgid "General Settings" msgstr "Configurações Gerais" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Alemão" @@ -3242,21 +2848,8 @@ msgid "Hotkey Configuration" 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 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Hotkeys" @@ -3336,20 +2929,8 @@ msgstr "" "Se a taxa de FPS estiver instável, esta opção pode ajudar. (ON = Compatível, " "OFF = Rápido)" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 #, fuzzy ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " @@ -3494,19 +3075,7 @@ msgstr "" "InstallExceptionHandler foi chamado, mas esta plataforma ainda não tem " "suporte a ele." -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "Instalando WAD..." @@ -3588,27 +3157,9 @@ msgstr "Arquivo de gravação inválido" msgid "Invalid state" msgstr "Estado Salvo Inválido" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italiano" @@ -3766,35 +3317,11 @@ msgstr "Carregar Estado do Slot 8" msgid "Load State..." msgstr "Carregar State..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "Carregar Menu de Sistema do Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar Menu de Sistema do Wii %d %c" @@ -3877,15 +3404,7 @@ 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" @@ -3916,19 +3435,7 @@ msgid "Memory Byte" msgstr "Byte de Memória" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Cartão de memoria" @@ -4127,19 +3634,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Cima" -<<<<<<< HEAD -<<<<<<< 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/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4226,15 +3721,7 @@ 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" @@ -4295,14 +3782,7 @@ 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" @@ -4433,23 +3913,8 @@ msgstr "Patches" msgid "Paths" msgstr "Diretórios" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: 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/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pausar" @@ -4469,23 +3934,8 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Executar" @@ -4511,19 +3961,7 @@ msgstr "Opções de Reprodução" msgid "Players" msgstr "Jogadores" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Favor confirmar..." @@ -4734,31 +4172,10 @@ msgstr "Atualizar Lista" msgid "Refresh game list" msgstr "Atualizar a lista de jogos" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Remover" @@ -4777,14 +4194,7 @@ msgid "Render to Main Window" 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" @@ -4827,19 +4237,7 @@ msgstr "Sal&var estado atual" msgid "Safe" msgstr "Seguro" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Taxa de Amostragem:" @@ -4923,19 +4321,7 @@ msgstr "O Estado Salvo capturado %s está corrompido, parando captura..." msgid "Scaled EFB Copy" msgstr "Cópia Escalada do EFB" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Escaneando %s" @@ -4975,39 +4361,12 @@ msgstr "A seção %s não foi encontrada no SYSCONF" msgid "Select" msgstr "Selecionar" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Selecione o arquivo de Gravação" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Selecione um arquivo WAD de Wii para instalar" @@ -5032,26 +4391,7 @@ msgstr "Selecionar Janelas flutuantes" msgid "Select the file to load" msgstr "Selecione um arquivo para carregar" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -msgid "Select the save file" -msgstr "Selecione o arquivo de salva" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Selecione o arquivo de salva" @@ -5059,16 +4399,7 @@ msgstr "Selecione o arquivo de salva" msgid "Select the state to load" msgstr "Selecione um estado para carregar" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Selecione um estado para salvar" @@ -5142,19 +4473,7 @@ msgstr "Separador" msgid "Serbian" msgstr "Sérvio" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -5461,27 +4780,9 @@ msgstr "Falha na criação do buffer de som: %s" msgid "Space" msgstr "Barra de Espaço" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Espanhol" @@ -5525,15 +4826,7 @@ 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" @@ -5568,14 +4861,7 @@ msgstr "Analógico" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: 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" @@ -5652,14 +4938,7 @@ msgstr "Direita da Mesa" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: 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" @@ -5893,31 +5172,12 @@ 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 -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Topo" @@ -6025,23 +5285,9 @@ msgstr "Menssagem desconhecida recebida com identificação: %d" #: Source/Core/Core/Src/NetPlayServer.cpp:504 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" -<<<<<<< HEAD -======= msgstr "" "Menssagem desconhecida com ID:%d recebida do jogador:%d Expulsando jogador!" -<<<<<<< HEAD -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" ->>>>>>> Update translation files for recent changes in the code. -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" @@ -6271,19 +5517,7 @@ msgstr "Raiz do Wii NAND" msgid "Wii Save Import" msgstr "Importar Save de Wii" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Arquivos de Salva do Wii (*.bin)|*.bin" @@ -6314,15 +5548,7 @@ 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" @@ -6354,27 +5580,9 @@ msgstr "Janelas da Direita" msgid "Word Wrap" msgstr "Word Wrap" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Funcionando..." diff --git a/Languages/po/ru.po b/Languages/po/ru.po index c882cf9f5b..6fd46df066 100644 --- a/Languages/po/ru.po +++ b/Languages/po/ru.po @@ -7,19 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< 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. -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-01-20 14:40+0300\n" "Last-Translator: firnis \n" "Language-Team: Russian <>\n" @@ -551,27 +539,9 @@ msgstr "Добавление патча" msgid "Add new pane" msgstr "Добавить панель" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Добавить..." @@ -626,23 +596,8 @@ msgstr "Все образа от GC/Wii (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Все GCM-файлы Gamecube (gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Файлы быстрых сохранений (sav, s##)" @@ -723,19 +678,7 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "Вы уверены, что хотите удалить этот файл? Он исчезнет навсегда!" -<<<<<<< HEAD -<<<<<<< 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/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "Соотношение сторон:" @@ -758,19 +701,7 @@ msgstr "Система вывода" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Ошибка открытия устройства вывода звука.\n" -<<<<<<< HEAD -<<<<<<< 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/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Авто" @@ -885,19 +816,7 @@ msgid "Blue Right" msgstr "Синяя справа" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "снизу" @@ -930,15 +849,7 @@ 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" @@ -1170,21 +1081,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< 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 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Закрыть" @@ -1293,15 +1191,7 @@ 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 "Подключение..." @@ -1486,21 +1376,8 @@ msgstr "Аудио" msgid "DSP Emulator Engine" msgstr "Режим эмуляции CPU" -<<<<<<< HEAD -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "" @@ -1724,19 +1601,7 @@ msgstr "" msgid "Divide" msgstr "/" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Вы хотите остановить эмуляцию?" @@ -1766,39 +1631,12 @@ msgstr "Настройки эмулируемого Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Настройки Dolphin GCPad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1886,27 +1724,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Dutch" msgstr "Dutch" @@ -2030,41 +1850,16 @@ msgstr "Включить BAT" msgid "Enable Block Merging" msgstr "Включить совмещение блоков" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. 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 -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Включить чит-коды" @@ -2205,27 +2000,9 @@ msgstr "" msgid "End" msgstr "End" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "English" msgstr "English" @@ -2255,45 +2032,10 @@ msgstr "Равно" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -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/ConfigMain.cpp:1173 msgid "Error" msgstr "Ошибки" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Ошибка загрузки выбранного языка. Возвращаемся к стандартному." @@ -2738,27 +2480,9 @@ msgstr "" msgid "Free Look" msgstr "Свободный обзор" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "French" msgstr "French" @@ -2828,19 +2552,7 @@ msgid "Gamecube &Pad Settings" msgstr "Опции &контроллера 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 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Файлы карт памяти Gamecube (*.raw,*.gcp)" @@ -2863,21 +2575,8 @@ msgid "" 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 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Общие" @@ -2887,27 +2586,9 @@ msgstr "Общие" msgid "General Settings" msgstr "Настройки интерфейса" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "German" msgstr "German" @@ -3035,21 +2716,8 @@ msgid "Hotkey Configuration" 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 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Клавиши" @@ -3267,19 +2935,7 @@ msgid "" msgstr "" "Вызван InstallExceptionHandler, но ваша платформа его еще не поддерживает." -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Installing WAD..." msgstr "Устанавливается WAD в меню Wii..." @@ -3364,27 +3020,9 @@ msgstr "Неверный файл записи" msgid "Invalid state" msgstr "Неверное сохранение" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Italian" msgstr "Italian" @@ -3550,36 +3188,12 @@ msgstr "Быстрая &загрузка" msgid "Load State..." msgstr "Загрузить игру..." -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "Загрузить Wii System Menu (%d %c)" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Загрузить Wii System Menu (%d %c)" @@ -3663,15 +3277,7 @@ 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 "" @@ -3703,19 +3309,7 @@ msgid "Memory Byte" msgstr "Па&мять" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Карта памяти" @@ -3893,19 +3487,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Вверх" -<<<<<<< HEAD -<<<<<<< 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/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3994,15 +3576,7 @@ 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 "Не подключено" @@ -4063,14 +3637,7 @@ 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 "Открыть" @@ -4196,23 +3763,8 @@ msgstr "Патчи" msgid "Paths" msgstr "Папки" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: 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/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Пауза" @@ -4233,23 +3785,8 @@ msgstr "Точка %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Запуск" @@ -4277,19 +3814,7 @@ msgstr "Опции" msgid "Players" msgstr "" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "" @@ -4514,31 +4039,10 @@ msgstr "&Обновить список игр" msgid "Refresh game list" msgstr "Обновление списка игр" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Удалить" @@ -4557,14 +4061,7 @@ msgid "Render to Main Window" 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 "Сброс настроек" @@ -4607,19 +4104,7 @@ msgstr "Быстрое &сохранение" msgid "Safe" msgstr "безопасное" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Sample Rate:" msgstr "Частота" @@ -4712,19 +4197,7 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "Поиск..." @@ -4764,39 +4237,12 @@ msgstr "Секция %s не найдена в SYSCONF" msgid "Select" msgstr "Выбрать" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Выберите файл для записи игрового процесса" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Выберите файл сохранения для импорта" @@ -4823,13 +4269,7 @@ msgstr "" msgid "Select the file to load" msgstr "Выберите файл для запуска..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Выберите файл сохранений Wii" @@ -4837,29 +4277,7 @@ msgstr "Выберите файл сохранений Wii" msgid "Select the state to load" msgstr "Выберите файл сохранения для загрузки" -<<<<<<< HEAD -#: 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: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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Выберите или укажите файл для быстрого сохранения" @@ -5220,27 +4638,9 @@ msgstr "Ошибка создания аудио-буфера %s." msgid "Space" msgstr "Пробел" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Spanish" msgstr "Spanish" @@ -5278,15 +4678,7 @@ 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" @@ -5323,14 +4715,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: 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 "Стоп" @@ -5402,14 +4787,7 @@ msgstr "Правая панель" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: 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 "Сделать скриншот" @@ -5639,31 +5017,12 @@ 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 -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "сверху" @@ -5767,21 +5126,6 @@ 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 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Неизвестный указатель %#08x\n" -"Продолжить?" - ->>>>>>> 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" @@ -5996,19 +5340,7 @@ msgstr "DVD-диск:" msgid "Wii Save Import" msgstr "Импорт сохранений Wii" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Файлы сохранений Wii (*.bin)|*.bin" @@ -6035,15 +5367,7 @@ 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 подключен" @@ -6079,27 +5403,9 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "Перенос строк" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Подождите..." diff --git a/Languages/po/sr.po b/Languages/po/sr.po index 62ec55ce59..6f8def3659 100644 --- a/Languages/po/sr.po +++ b/Languages/po/sr.po @@ -7,19 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< 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. -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-03-02 21:58+0100\n" "Last-Translator: nikolassj\n" "Language-Team: \n" @@ -520,27 +508,9 @@ msgstr "Dodaj Patch " msgid "Add new pane" msgstr "Dodaj nova okna" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Dodaj..." @@ -594,23 +564,8 @@ msgstr "" msgid "All Gamecube GCM files (gcm)" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "" @@ -690,19 +645,7 @@ 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 -<<<<<<< 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/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "" @@ -724,19 +667,7 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" -<<<<<<< HEAD -<<<<<<< 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/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Auto" @@ -847,19 +778,7 @@ msgid "Blue Right" msgstr "Blue right " #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Donji deo/dno" @@ -892,15 +811,7 @@ 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" @@ -1125,21 +1036,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< 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 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Zatvori" @@ -1247,15 +1145,7 @@ 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..." @@ -1429,21 +1319,8 @@ msgstr "DSP" msgid "DSP Emulator Engine" msgstr "" -<<<<<<< HEAD -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "" @@ -1663,19 +1540,7 @@ msgstr "" msgid "Divide" msgstr "" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "" @@ -1705,39 +1570,12 @@ msgstr "" msgid "Dolphin FIFO" msgstr "Dolphin" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1820,27 +1658,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "" @@ -1959,40 +1779,15 @@ msgstr "" msgid "Enable Block Merging" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. 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 -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "" @@ -2118,27 +1913,9 @@ msgstr "" msgid "End" msgstr "Kraj" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "" @@ -2167,45 +1944,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -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/ConfigMain.cpp:1173 msgid "Error" msgstr "Error" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2632,27 +2374,9 @@ msgstr "" msgid "Free Look" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "" @@ -2720,19 +2444,7 @@ msgid "Gamecube &Pad Settings" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2755,21 +2467,8 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: 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/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "" @@ -2779,27 +2478,9 @@ msgstr "" msgid "General Settings" msgstr "Opcije Uredjaja " -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Nemacki " @@ -2916,21 +2597,8 @@ msgid "Hotkey Configuration" 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 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "" @@ -3127,19 +2795,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "" @@ -3217,27 +2873,9 @@ msgstr "" msgid "Invalid state" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italianski " @@ -3389,36 +3027,12 @@ msgstr "Ucitaj State Slot 8" msgid "Load State..." msgstr "Ucitaj State" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "Ucitaj Wii Sistem Meni (%d %c)" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Ucitaj Wii Sistem Meni (%d %c)" @@ -3495,15 +3109,7 @@ 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 "" @@ -3535,19 +3141,7 @@ msgid "Memory Byte" msgstr "&Memorija" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "" @@ -3724,19 +3318,7 @@ msgstr "" msgid "NP Up" msgstr "" -<<<<<<< HEAD -<<<<<<< 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/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3823,15 +3405,7 @@ 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 "" @@ -3892,14 +3466,7 @@ 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 " @@ -4025,23 +3592,8 @@ msgstr "" msgid "Paths" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: 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/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Pauza " @@ -4062,23 +3614,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Pokreni " @@ -4105,19 +3642,7 @@ msgstr "Opcije " msgid "Players" msgstr "" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "" @@ -4325,31 +3850,10 @@ msgstr "" msgid "Refresh game list" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "" @@ -4365,14 +3869,7 @@ msgid "Render to Main Window" 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 " @@ -4415,19 +3912,7 @@ msgstr "" msgid "Safe" msgstr "Siguran " -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "" @@ -4511,19 +3996,7 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "Skeniranje..." @@ -4563,39 +4036,12 @@ msgstr "" msgid "Select" msgstr "Izaberi " -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Izaberi Snimani fajl" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Izaberi \"Snimani fajl/Save file\" za importovanje " @@ -4622,13 +4068,7 @@ msgstr "" msgid "Select the file to load" msgstr "Izaberi fajl za ucitavanje " -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Izaberi \"snimani fajl/the save state\"" @@ -4636,29 +4076,7 @@ msgstr "Izaberi \"snimani fajl/the save state\"" msgid "Select the state to load" msgstr "Izaberi state za ucitavanje " -<<<<<<< HEAD -#: 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: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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Izaberi state za snimanje/save" @@ -4994,27 +4412,9 @@ msgstr "" msgid "Space" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "" @@ -5050,15 +4450,7 @@ 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" @@ -5093,14 +4485,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: 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" @@ -5172,14 +4557,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: 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 "" @@ -5384,31 +4762,12 @@ 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 -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "" @@ -5510,19 +4869,6 @@ msgstr "" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -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" @@ -5733,19 +5079,7 @@ msgstr "" msgid "Wii Save Import" msgstr "" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5772,15 +5106,7 @@ 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 "" @@ -5813,27 +5139,9 @@ msgstr "" msgid "Word Wrap" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Radi..." diff --git a/Languages/po/tr.po b/Languages/po/tr.po index 890dd90043..4860e77e7c 100644 --- a/Languages/po/tr.po +++ b/Languages/po/tr.po @@ -7,24 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"POT-Creation-Date: 2011-12-18 13:39-0600\n" -======= -"POT-Creation-Date: 2011-10-11 23:25-0500\n" -<<<<<<< HEAD ->>>>>>> Update translation files for recent changes in the code. -"PO-Revision-Date: 2011-08-19 08:38-0500\n" -======= -======= -"POT-Creation-Date: 2011-12-18 13:39-0600\n" ->>>>>>> Clean up Turkish translation file. -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-12-20 19:22+0200\n" ->>>>>>> Update Hungarian and Turkish translations. "Last-Translator: nlgzrgn \n" "Language-Team: nlgzrgn \n" "Language: Turkish\n" @@ -569,27 +553,9 @@ msgstr "Yama Ekle" msgid "Add new pane" msgstr "Bölme ekle" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: 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 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "Ekle..." @@ -659,23 +625,8 @@ msgstr "Tüm GC/Wii kalıpları (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "Tüm GameCube GCM Dosyaları (gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: 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 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "Tüm Kayıtlı Oyunlar (sav,s##)" @@ -764,19 +715,7 @@ msgstr "" "Bu dosyayı gerçekten silmek istiyor musunuz? Silindikten sonra bu dosyaları " "geri döndüremezsiniz!" -<<<<<<< HEAD -<<<<<<< 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 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "En-boy Oranı:" @@ -798,19 +737,7 @@ msgstr "Ses Çözücüsü:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: AO sürücüyü açarken hata.\n" -<<<<<<< HEAD -<<<<<<< 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 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "Otomatik" @@ -925,19 +852,7 @@ msgid "Blue Right" msgstr "Mavi Sağ" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< 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 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "Alt" @@ -970,15 +885,7 @@ msgstr "Çıkış klasörü için gözat" msgid "Buffer:" msgstr "Tampon:" -<<<<<<< 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 ->>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89 msgid "Buttons" @@ -1222,21 +1129,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< 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 ->>>>>>> Clean up Turkish translation file. -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "Kapat" @@ -1344,15 +1238,7 @@ msgstr "Wiimote 3'ü Bağla" msgid "Connect Wiimote 4" msgstr "Wiimote 4'ü Bağla" -<<<<<<< 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 ->>>>>>> Clean up Turkish translation file. msgid "Connecting..." msgstr "Bağlanıyor..." @@ -1544,21 +1430,8 @@ msgstr "Ses" msgid "DSP Emulator Engine" msgstr "Ses Emülatörü Motoru" -<<<<<<< HEAD -#: 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 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE Emülasyonu (Hızlı)" @@ -1796,19 +1669,7 @@ msgstr "" msgid "Divide" msgstr "Böl" -<<<<<<< HEAD -<<<<<<< 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 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "Emülasyonu durdurmak istiyor musunuz?" @@ -1837,39 +1698,12 @@ msgstr "Dolphin Taklit Wiimote Yapılandırması" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GC Kolu Yapılandırması" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -msgstr "Dolphin GC Kolu Yapılandırması" - -#: 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 Kolu Yapılandırması" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:751 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC Kolu Yapılandırması" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Filmleri (*.dtm)" @@ -1966,27 +1800,9 @@ msgstr "" "\n" "Emin değilseniz, işaretsiz bırakın." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: 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 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Flemenkçe" @@ -2125,41 +1941,15 @@ msgstr "BAT'a İzin Ver" msgid "Enable Block Merging" msgstr "Blok Birleşimine İzin Ver" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -msgid "Enable Bounding Box Calculation" -msgstr "" - -======= ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Bounding Box Calculation" msgstr "Sınırlayıcı Kutu Hesaplama'yı Etkinleştir" ->>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 msgid "Enable Cache" msgstr "Ön Belleğe İzin Ver" -<<<<<<< HEAD -<<<<<<< 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 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "Hilelere İzin Ver" @@ -2316,27 +2106,9 @@ msgstr "" msgid "End" msgstr "Son" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: 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 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "İngilizce" @@ -2365,47 +2137,10 @@ msgstr "Eşit" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Hata" - -#: 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/ConfigMain.cpp:1169 -msgid "Error" -msgstr "Hata" - ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175 -msgid "Error" -msgstr "Hata" - -#: 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'da hata. %u != %u, byte %d.\n" -"Üzgünüz, Wii kaydında geçici hasar var." - ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1173 msgid "Error" msgstr "Hata" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "Seçili dili yüklerken hata. Sistem varsayılanlarına geri dönülüyor." @@ -2416,11 +2151,8 @@ msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" -<<<<<<< HEAD -======= "Hata: \"%s\" 'dan sonra, %d (0x%X) bulundu ( %d (0x%X) yerine). Durum kaydı " "yüklemesinden vazgeçiliyor..." ->>>>>>> Clean up Turkish translation file. #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:281 #, c-format @@ -2875,27 +2607,9 @@ msgstr "Çekilecek Çerçeveler" msgid "Free Look" msgstr "Serbest Bakış" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: 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 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "Fransızca" @@ -2921,14 +2635,8 @@ msgid "GCI File(*.gci)" msgstr "GCI Dosyası (*.gci)" #: Source/Core/DolphinWX/Src/GCMicDlg.h:44 -<<<<<<< HEAD -#, fuzzy -msgid "GCMic Configuration" -msgstr "Geçmiş Yapılandırması" -======= msgid "GCMic Configuration" msgstr "GCMic Yapılandırması" ->>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "GCPad" @@ -2967,19 +2675,7 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube Kolu Ayarları (&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< 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 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "GameCube Hafıza Kartları (*.raw,*.gcp)" @@ -3004,21 +2700,8 @@ msgstr "" "(kötü bir kod veya türü henüz desteklenmiyor.)" #: 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 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "Genel" @@ -3027,27 +2710,9 @@ msgstr "Genel" msgid "General Settings" msgstr "Genel Ayarlar" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: 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 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "Almanca" @@ -3176,21 +2841,8 @@ msgid "Hotkey Configuration" msgstr "Kısayol Tuşu Yapılandırması" #: 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 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "Tuşlar" @@ -3261,11 +2913,8 @@ msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -<<<<<<< HEAD -======= "Eğer işaretlenmişse, sınırlayıcı kutu kayıtları güncellenecektir. Paper " "Mario oyunları tarafından kullanılır." ->>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" @@ -3420,19 +3069,7 @@ msgstr "" "Kurulum Özel Durum İşleyici çağrıldı, ama bu platform henüz bunu " "desteklemiyor." -<<<<<<< HEAD -<<<<<<< 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 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "WAD kuruluyor..." @@ -3514,27 +3151,9 @@ msgstr "Hatalı çekim dosyası" msgid "Invalid state" msgstr "Hatalı durum" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: 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 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "İtalyanca" @@ -3692,35 +3311,11 @@ msgstr "Durumu Yükle : 8" msgid "Load State..." msgstr "Durumu Yükle..." -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418 -msgid "Load Wii System Menu" -msgstr "Wii Sistem Menüsünü Yükle" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 -msgid "Load Wii System Menu" -msgstr "Wii Sistem Menüsünü Yükle" - -#: 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 Sistem Menüsünü Yükle" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 msgid "Load Wii System Menu" msgstr "Wii Sistem Menüsünü Yükle" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii Sistem Menüsünü Yükle %d%c" @@ -3802,15 +3397,7 @@ msgstr "MMU Hız Hilesi" msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark dosyaları(*.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 ->>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47 msgid "Main Stick" msgstr "Ana Çubuk" @@ -3841,19 +3428,7 @@ msgid "Memory Byte" msgstr "Hafıza Baytı" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< 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 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "Hafıza Kartı" @@ -4051,19 +3626,7 @@ msgstr "NP Sekme" msgid "NP Up" msgstr "NP Yukarı" -<<<<<<< HEAD -<<<<<<< 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 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -4150,15 +3713,7 @@ msgstr "Eşit Değil" msgid "Not Set" msgstr "Ayarlanmamış" -<<<<<<< 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 ->>>>>>> Clean up Turkish translation file. msgid "Not connected" msgstr "Bağlı değil" @@ -4219,14 +3774,7 @@ msgstr "Sadece %d blok kullanılabilir" #: 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 ->>>>>>> Clean up Turkish translation file. msgid "Open" msgstr "Aç" @@ -4357,23 +3905,8 @@ msgstr "Yamalar" msgid "Paths" msgstr "Yollar" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: 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 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "Duraklat" @@ -4393,23 +3926,8 @@ msgstr "Perspektif %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< 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 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "Oynat" @@ -4435,19 +3953,7 @@ msgstr "Oynatma Seçenekleri" msgid "Players" msgstr "Oyuncular" -<<<<<<< HEAD -<<<<<<< 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 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "Lütfen onaylayın..." @@ -4499,29 +4005,17 @@ msgstr "Geç İşleme Etkisi:" #: Source/Core/Core/Src/Movie.cpp:759 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" -<<<<<<< HEAD -msgstr "" -======= msgstr "PlayController'da erken kayıt bitişi. %u + 8 > %u" ->>>>>>> Clean up Turkish translation file. #: Source/Core/Core/Src/Movie.cpp:853 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" -<<<<<<< HEAD -msgstr "" -======= msgstr "PlayWiimote'da erken kayıt bitişi. %u + %d > %u" ->>>>>>> Clean up Turkish translation file. #: Source/Core/Core/Src/Movie.cpp:830 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" -<<<<<<< HEAD -msgstr "" -======= msgstr "PlayWiimote'da erken kayıt bitişi. %u > %u" ->>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " @@ -4670,31 +4164,10 @@ msgstr "Listeyi Yenile" msgid "Refresh game list" msgstr "Oyun Listesini Yenile" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: 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 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "Kaldır" @@ -4713,14 +4186,7 @@ msgid "Render to Main Window" msgstr "Ana pencerede yorumla" #: 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 ->>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 msgid "Reset" msgstr "Sıfırla" @@ -4763,19 +4229,7 @@ msgstr "Durumu Kaydet (&V)" msgid "Safe" msgstr "Güvenli" -<<<<<<< HEAD -<<<<<<< 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 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "Örnek Oran:" @@ -4859,19 +4313,7 @@ msgstr "Kayıtlı durum filmi %s bozuk, film çekimi duruyor..." msgid "Scaled EFB Copy" msgstr "Boyutlandırılmış EFB Kopyası" -<<<<<<< HEAD -<<<<<<< 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 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Scanning %s" msgstr "Taranıyor %s" @@ -4911,39 +4353,12 @@ msgstr "SYSCONF içinde %s bölümü bulunamadı" msgid "Select" msgstr "Seç" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:749 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158 -msgid "Select The Recording File" -msgstr "Çekim Dosyasını Seç" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -msgstr "Çekim Dosyasını Seç" - -#: 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 "Çekim Dosyasını Seç" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "Çekim Dosyasını Seç" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "Kurmak için bir Wii WAD dosyası seçin" @@ -4969,26 +4384,7 @@ msgstr "Sabit olmayan pencereyi seçin" msgid "Select the file to load" msgstr "Yüklemek için dosyayı seçin" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -msgid "Select the save file" -msgstr "Kayıt dosyasını seçin" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473 -msgid "Select the state to load" -msgstr "Yüklemek için durum seçin" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "Kayıt dosyasını seçin" @@ -4996,16 +4392,7 @@ msgstr "Kayıt dosyasını seçin" msgid "Select the state to load" msgstr "Yüklemek için durum seçin" -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471 ->>>>>>> Update translation files for recent changes in the code. -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "Kaydetmek için durum seçin" @@ -5381,27 +4768,9 @@ msgstr "Ses tamponu oluşturulamadı: %s" msgid "Space" msgstr "Boşluk" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: 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 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "İspanyolca" @@ -5445,15 +4814,7 @@ msgstr "Kare Çubuk" msgid "Standard Controller" msgstr "Varsayılan Denetim Aygı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 ->>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 #: Source/Core/DolphinWX/Src/NetWindow.cpp:309 msgid "Start" @@ -5488,14 +4849,7 @@ msgstr "Çubuk" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: 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 ->>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/NetWindow.cpp:312 msgid "Stop" msgstr "Durdur" @@ -5572,24 +4926,13 @@ msgstr "Tablo Sağ" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: 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 ->>>>>>> Clean up Turkish translation file. msgid "Take Screenshot" msgstr "Ekran Görüntüsü Al" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" -<<<<<<< HEAD -msgstr "" -======= msgstr "TaruKonga (Bongos)" ->>>>>>> Clean up Turkish translation file. #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" @@ -5813,31 +5156,12 @@ msgstr "Tüm Geçmiş Türlerini 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 ->>>>>>> Clean up Turkish translation file. msgid "Toggle Fullscreen" msgstr "Tam Ekran Moduna Geç" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< 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 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "Üst" @@ -5946,21 +5270,6 @@ msgstr "Şu ID ile bilinmeyen mesaj alındı : %d" msgid "Unknown message with id:%d received from player:%d Kicking player!" msgstr "ID %d ile %d oyuncusundan bilinmeyen mesaj alındı. Oyuncu atılıyor!" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: Source/Core/Core/Src/HW/Memmap.cpp:633 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"Bilinmeyen işaretleyici %#08x\n" -"Devam?" - ->>>>>>> Update translation files for recent changes in the code. -======= ->>>>>>> Clean up Turkish translation file. #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "Up" @@ -6126,13 +5435,10 @@ msgid "" "%u > %u) (frame %u > %u). You should load another save before continuing, or " "load this state with read-only mode off." msgstr "" -<<<<<<< HEAD -======= "Dikkat: Şu anki kaydın bitişinden sonra yer alan bir kayıt yüklediniz. (Bayt " "%u > %u) (Çerçeve %u > %u). Devam etmeden önce başka bir kayıt yüklemeniz, " "veya bu kaydı Salt Okunur mod kapalıyken yüklemeniz daha iyi olacaktır. Aksi " "taktirde, büyük bir ihtimalle, senkronizasyon sorunu yaşayacaksınız." ->>>>>>> Clean up Turkish translation file. #: Source/Core/Core/Src/Movie.cpp:684 #, c-format @@ -6141,13 +5447,10 @@ 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 -======= "Dikkat: Bayt %d (0x%X) ile eşleşmeyen bir kayıt yüklediniz. Devam etmeden " "önce başka bir kayıt yüklemeniz, veya bu kaydı Salt Okunur mod kapalıyken " "yüklemeniz daha iyi olacaktır. Aksi taktirde, büyük bir ihtimalle, " "senkronizasyon sorunu yaşayacaksınız." ->>>>>>> Clean up Turkish translation file. #: Source/Core/Core/Src/Movie.cpp:693 #, c-format @@ -6167,8 +5470,6 @@ 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 -======= "Dikkat: Çerçeve %d ile eşleşmeyen bir kayıt yüklediniz. Devam etmeden önce " "başka bir kayıt yüklemeniz, veya bu kaydı Salt Okunur mod kapalıyken " "yüklemeniz daha iyi olacaktır. Aksi taktirde, büyük bir ihtimalle, " @@ -6184,7 +5485,6 @@ msgstr "" "Çerçeve %d 'de, durum kaydı bunları basıyor:\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" ->>>>>>> Clean up Turkish translation file. #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 @@ -6219,19 +5519,7 @@ msgstr "Wii NAND Kök Dizini:" msgid "Wii Save Import" msgstr "Wii Kaydı Al" -<<<<<<< HEAD -<<<<<<< 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 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii kayıt dosyaları (*.bin)|*.bin" @@ -6262,15 +5550,7 @@ msgstr "" "bir zaman aşımı olabilir veya başka bir şey olabilir. \n" "Tekrar bağlamak istiyor musunuz?" -<<<<<<< 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 ->>>>>>> Clean up Turkish translation file. msgid "Wiimote Connected" msgstr "Wiimote Bağlandı" @@ -6302,27 +5582,9 @@ msgstr "Pencereleri Sağa Döşe" msgid "Word Wrap" msgstr "Heceleme" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: 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 ->>>>>>> Clean up Turkish translation file. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "Çalışıyor..." @@ -6632,19 +5894,10 @@ msgstr "| VEYA" #~ msgid "Can't open %s, it has a missing function" #~ msgstr "%s açılamıyor, kayıp bir işleve sahip." -<<<<<<< HEAD -<<<<<<< HEAD #~ msgid "Cannot record movies in read-only mode." #~ msgstr "Salt-okunur modda film çekilemez." -======= -======= -#~ msgid "Cannot record movies in read-only mode." -#~ msgstr "Salt-okunur modda film çekilemez." - ->>>>>>> Clean up Turkish translation file. #, fuzzy ->>>>>>> Update Hungarian and Turkish translations. #~ msgid "Config..." #~ msgstr "Yapılandır..." diff --git a/Languages/po/zh_CN.po b/Languages/po/zh_CN.po index f7bb9c4575..ee2e7c5bcd 100644 --- a/Languages/po/zh_CN.po +++ b/Languages/po/zh_CN.po @@ -7,19 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< 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. -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-01-09 13:55-0800\n" "Last-Translator: thegfw \n" "Language-Team: \n" @@ -548,27 +536,9 @@ msgstr "添加补丁" msgid "Add new pane" msgstr "添加新面板" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "添加..." @@ -622,23 +592,8 @@ msgstr "所有 GC/Wii 镜像 (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "所有 Gamecube GCM 文件 (gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "所有存档状态 (sav, s##)" @@ -719,19 +674,7 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "请确认真的要删除这些文件?这将是永久性的删除!" -<<<<<<< HEAD -<<<<<<< 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/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "高宽比:" @@ -753,19 +696,7 @@ msgstr "音频后端:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: 打开 AO 设备错误.\n" -<<<<<<< HEAD -<<<<<<< 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/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "自动" @@ -877,19 +808,7 @@ msgid "Blue Right" msgstr "蓝 右" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "底部" @@ -922,15 +841,7 @@ 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" @@ -1163,21 +1074,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< 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 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "关闭" @@ -1286,15 +1184,7 @@ 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 "连接中..." @@ -1479,21 +1369,8 @@ msgstr "DSP音频" msgid "DSP Emulator Engine" msgstr "音频模拟引擎" -<<<<<<< HEAD -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "音频 HLE 模拟(很快)" @@ -1721,19 +1598,7 @@ msgstr "按模拟器显示输入读取" msgid "Divide" msgstr "Divide" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "您确定是否停止当前模拟?" @@ -1763,39 +1628,12 @@ msgstr "Dolphin 模拟 Wiimote 设置" msgid "Dolphin FIFO" msgstr "Dolphin" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC 手柄设置" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS 电影 (*.dtm)" @@ -1879,27 +1717,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "荷兰语" @@ -2023,41 +1843,16 @@ msgstr "启用 BAT" msgid "Enable Block Merging" msgstr "启用区块合并" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. 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 -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "启用作弊" @@ -2192,27 +1987,9 @@ msgstr "" msgid "End" msgstr "End" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "英语" @@ -2241,45 +2018,10 @@ msgstr "等于" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -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/ConfigMain.cpp:1173 msgid "Error" msgstr "错误" ->>>>>>> Update the pot file to reflect recent changes in the code. #: 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." @@ -2744,27 +2486,9 @@ msgstr "" msgid "Free Look" msgstr "自由视点" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "法语" @@ -2832,19 +2556,7 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube 手柄设置(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube 内存卡 (*.raw,*.gcp)" @@ -2869,21 +2581,8 @@ msgstr "" "(either a bad code or the code type is not yet supported.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: 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/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "常规" @@ -2893,27 +2592,9 @@ msgstr "常规" msgid "General Settings" msgstr "界面设置" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "德语" @@ -3035,21 +2716,8 @@ msgid "Hotkey Configuration" 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 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "热键" @@ -3261,19 +2929,7 @@ msgid "" msgstr "" "InstallExceptionHandler called, but this platform does not yet support it." -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Installing WAD..." msgstr "安装 WAD 到 Wii 菜单中..." @@ -3358,27 +3014,9 @@ msgstr "无效录制文件" msgid "Invalid state" msgstr "Invalid state" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "意大利语" @@ -3537,36 +3175,12 @@ msgstr "载入存档插槽 8" msgid "Load State..." msgstr "载入状态..." -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "载入 Wii 系统菜单(%d %c)" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "载入 Wii 系统菜单(%d %c)" @@ -3647,15 +3261,7 @@ 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 "主摇杆" @@ -3687,19 +3293,7 @@ msgid "Memory Byte" msgstr "内存(&M)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "内存卡" @@ -3883,19 +3477,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" -<<<<<<< HEAD -<<<<<<< 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/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3983,15 +3565,7 @@ 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 "未连接" @@ -4052,14 +3626,7 @@ 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 "打开" @@ -4190,23 +3757,8 @@ msgstr "补丁" msgid "Paths" msgstr "路径" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: 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/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "暂停" @@ -4227,23 +3779,8 @@ msgstr "Perspective %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "开始" @@ -4270,19 +3807,7 @@ msgstr "选项" msgid "Players" msgstr "玩家" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "请确认..." @@ -4497,31 +4022,10 @@ msgstr "刷新列表" msgid "Refresh game list" msgstr "刷新游戏列表" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "移除" @@ -4540,14 +4044,7 @@ msgid "Render to Main Window" 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 "重置" @@ -4590,19 +4087,7 @@ msgstr "保存状态(&V)" msgid "Safe" msgstr "安全" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "采样率:" @@ -4687,19 +4172,7 @@ msgstr "Savestate movie %s is corrupted, movie recording stopping..." msgid "Scaled EFB Copy" msgstr "EFB 比例复制" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "扫描中..." @@ -4739,39 +4212,12 @@ msgstr "Section %s not found in SYSCONF" msgid "Select" msgstr "选择" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "选择录制文件" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Select a Wii WAD file to install" msgstr "选择要导入的存档" @@ -4798,13 +4244,7 @@ msgstr "选择浮动窗口" msgid "Select the file to load" msgstr "选择要载入的文件" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "选择一个存档文件" @@ -4812,29 +4252,7 @@ msgstr "选择一个存档文件" msgid "Select the state to load" msgstr "选择要载入的状态" -<<<<<<< HEAD -#: 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: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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "选择要保存的状态" @@ -5183,27 +4601,9 @@ msgstr "声音缓冲区创建失败: %s" msgid "Space" msgstr "空格" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "西班牙语" @@ -5239,15 +4639,7 @@ 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" @@ -5282,14 +4674,7 @@ msgstr "摇杆" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: 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 "停止" @@ -5362,14 +4747,7 @@ msgstr "Table Right" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: 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)" @@ -5591,31 +4969,12 @@ 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 -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "顶部" @@ -5719,21 +5078,6 @@ 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 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"未知指针 %#08x\n" -"继续?" - ->>>>>>> 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" @@ -5948,19 +5292,7 @@ msgstr "DVD 根目录:" msgid "Wii Save Import" msgstr "导入 Wii 存档" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 存档文件 (*.bin)|*.bin" @@ -5991,15 +5323,7 @@ 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 已连接" @@ -6032,27 +5356,9 @@ msgstr "窗口右侧" msgid "Word Wrap" msgstr "自动换行" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "工作中..." diff --git a/Languages/po/zh_TW.po b/Languages/po/zh_TW.po index e0384728e6..8d0fcc4799 100644 --- a/Languages/po/zh_TW.po +++ b/Languages/po/zh_TW.po @@ -7,19 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -<<<<<<< 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. -======= "POT-Creation-Date: 2012-03-09 16:54-0600\n" ->>>>>>> Update the pot file to reflect recent changes in the code. "PO-Revision-Date: 2011-03-15 02:51+0800\n" "Last-Translator: khiav \n" "Language-Team: khiav&yrbn \n" @@ -548,27 +536,9 @@ msgstr "新增修正" msgid "Add new pane" msgstr "新增面版" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Add..." msgstr "新增..." @@ -635,23 +605,8 @@ msgstr "所有 GC/Wii 映像檔 (gcm, iso, ciso, gcz)" msgid "All Gamecube GCM files (gcm)" msgstr "所有 Gamecube GCM 檔案 (gcm)" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489 -======= -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1472 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1486 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "All Save States (sav, s##)" msgstr "所有即時存檔 (sav, s##)" @@ -732,19 +687,7 @@ msgstr "" msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "是否真的要刪除這些檔案？刪了之後就回不來了哦！" -<<<<<<< HEAD -<<<<<<< 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/ConfigMain.cpp:727 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284 msgid "Aspect Ratio:" msgstr "畫面比例：" @@ -766,19 +709,7 @@ msgstr "聲音裝置：" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon：開啟 AO 裝置出錯。\n" -<<<<<<< HEAD -<<<<<<< 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/ConfigMain.cpp:240 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282 msgid "Auto" msgstr "自動" @@ -890,19 +821,7 @@ msgid "Blue Right" msgstr "藍 右" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Bottom" msgstr "下方" @@ -935,15 +854,7 @@ 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" @@ -1172,21 +1083,8 @@ msgstr "在遊戲執行時客戶端斷開連接！！網路對戰已經被關閉 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:244 -<<<<<<< HEAD -<<<<<<< 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 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:571 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:588 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Close" msgstr "關閉" @@ -1295,15 +1193,7 @@ 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 "正在連接..." @@ -1487,21 +1377,8 @@ msgstr "聲音" msgid "DSP Emulator Engine" msgstr "DSP 模擬引擎" -<<<<<<< HEAD -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "DSP HLE emulation (fast)" msgstr "DSP HLE 模擬器 (快)" @@ -1729,19 +1606,7 @@ msgstr "顯示控制器輸入狀態 (僅作用於錄製或播放影片時)。" msgid "Divide" msgstr "Divide" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1065 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Do you want to stop the current emulation?" msgstr "您要停止目前的模擬嗎？" @@ -1771,39 +1636,12 @@ msgstr "Dolphin 模擬 Wiimote 設定" msgid "Dolphin FIFO" msgstr "Dolphin" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204 -msgid "Dolphin GCPad Configuration" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1217 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC 控制器設定" #: Source/Core/DolphinWX/Src/FrameTools.cpp:748 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1157 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS 影片 (*.dtm)" @@ -1887,27 +1725,9 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Dutch" msgstr "Dutch" @@ -2029,41 +1849,16 @@ msgstr "開啟 BAT" msgid "Enable Block Merging" msgstr "開啟塊合併" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update from master branch. -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 ->>>>>>> Update the pot file to reflect recent changes in the code. 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 -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Enable Cheats" msgstr "開啟作弊" @@ -2195,27 +1990,9 @@ msgstr "" msgid "End" msgstr "End" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "English" msgstr "English" @@ -2244,45 +2021,10 @@ msgstr "等於" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:153 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 "" - -======= -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169 -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/ConfigMain.cpp:1173 msgid "Error" msgstr "錯誤" ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/Main.cpp:346 msgid "Error loading selected language. Falling back to system default." msgstr "讀取選擇的語系出錯。返回使用系統預設值。" @@ -2745,27 +2487,9 @@ msgstr "" msgid "Free Look" msgstr "自由視點" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "French" msgstr "French" @@ -2833,19 +2557,7 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube 控制器設定(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube 記憶卡 (*.raw,*.gcp)" @@ -2870,21 +2582,8 @@ msgstr "" "(一個損毀的代碼或不支援的代碼類型。)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -<<<<<<< HEAD -<<<<<<< HEAD #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -<<<<<<< HEAD -#: 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/ConfigMain.cpp:530 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204 msgid "General" msgstr "一般" @@ -2894,27 +2593,9 @@ msgstr "一般" msgid "General Settings" msgstr "界面設定" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "German" msgstr "German" @@ -3036,21 +2717,8 @@ msgid "Hotkey Configuration" 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 -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574 ->>>>>>> Update from master branch. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Hotkeys" msgstr "快捷鍵" @@ -3254,19 +2922,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "調用 InstallExceptionHandler，但是這個平台尚未支援此功能。" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1376 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Installing WAD..." msgstr "正在安裝 WAD 至 Wii 選單..." @@ -3350,27 +3006,9 @@ msgstr "無效的錄像檔" msgid "Invalid state" msgstr "無效的狀態" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Italian" msgstr "Italian" @@ -3529,36 +3167,12 @@ msgstr "讀取儲存格 8" msgid "Load State..." msgstr "讀取進度檔..." -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1415 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy msgid "Load Wii System Menu" msgstr "讀取 Wii 系統選單 (%d%c)" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 ->>>>>>> Update the pot file to reflect recent changes in the code. #, c-format msgid "Load Wii System Menu %d%c" msgstr "讀取 Wii 系統選單 (%d%c)" @@ -3639,15 +3253,7 @@ 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 "主搖桿" @@ -3679,19 +3285,7 @@ msgid "Memory Byte" msgstr "記憶卡(&M)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:222 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Memory Card" msgstr "記憶卡" @@ -3875,19 +3469,7 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" -<<<<<<< HEAD -<<<<<<< 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/ISOProperties.cpp:463 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" @@ -3975,15 +3557,7 @@ 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 "未連接" @@ -4044,14 +3618,7 @@ 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 "開啟" @@ -4180,23 +3747,8 @@ msgstr "修正" msgid "Paths" msgstr "路徑" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622 -======= -#: 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/FrameTools.cpp:1618 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1619 ->>>>>>> Update the pot file to reflect recent changes in the code. #: Source/Core/DolphinWX/Src/WXInputBase.cpp:48 msgid "Pause" msgstr "暫停" @@ -4217,23 +3769,8 @@ msgstr "版式 %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1627 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1628 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Play" msgstr "執行" @@ -4260,19 +3797,7 @@ msgstr "選項" msgid "Players" msgstr "玩家" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1066 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Please confirm..." msgstr "請確認..." @@ -4486,31 +4011,10 @@ msgstr "更新列表" msgid "Refresh game list" msgstr "更新遊戲列表" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Remove" msgstr "移除" @@ -4529,14 +4033,7 @@ msgid "Render to Main Window" 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 "重置" @@ -4579,19 +4076,7 @@ msgstr "儲存進度(&V)" msgid "Safe" msgstr "安全" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Sample Rate:" msgstr "取樣率：" @@ -4676,19 +4161,7 @@ msgstr "儲存的影片 %s 是損毀的，影片錄製停止..." msgid "Scaled EFB Copy" msgstr "EFB 縮放複製" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:630 ->>>>>>> Update the pot file to reflect recent changes in the code. #, fuzzy, c-format msgid "Scanning %s" msgstr "正在掃瞄..." @@ -4728,39 +4201,12 @@ msgstr "項目 %s 在 SYSCONF 中找不到" msgid "Select" msgstr "選擇" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: 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 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:740 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142 -msgid "Select The Recording File" -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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:746 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1155 msgid "Select The Recording File" msgstr "選擇已錄製的檔案" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select a Wii WAD file to install" msgstr "選擇要安裝的 Wii WAD" @@ -4786,13 +4232,7 @@ msgstr "選擇浮動視窗" msgid "Select the file to load" msgstr "選擇要讀取的檔案" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324 -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1321 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the save file" msgstr "選擇存檔" @@ -4800,29 +4240,7 @@ msgstr "選擇存檔" msgid "Select the state to load" msgstr "選擇要讀取的進度" -<<<<<<< HEAD -#: 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: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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1484 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Select the state to save" msgstr "選擇要儲存的進度" @@ -5170,27 +4588,9 @@ msgstr "聲音緩衝建立失敗：%s" msgid "Space" msgstr "Space" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 -======= -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 -#: 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. -======= #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Spanish" msgstr "Spanish" @@ -5226,15 +4626,7 @@ 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" @@ -5269,14 +4661,7 @@ msgstr "搖桿" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315 #: 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 "停止" @@ -5349,14 +4734,7 @@ msgstr "Table 右" #: Source/Core/DolphinWX/Src/FrameTools.cpp:368 #: 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 "截取畫面" @@ -5568,31 +4946,12 @@ 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 -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Top" msgstr "上方" @@ -5696,21 +5055,6 @@ 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 -#, c-format -msgid "" -"Unknown pointer %#08x\n" -"Continue?" -msgstr "" -"未知的指示器 %#08x\n" -"是否繼續？" - ->>>>>>> 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" @@ -5925,19 +5269,7 @@ msgstr "DVD 根：" msgid "Wii Save Import" msgstr "匯入 Wii 存檔" -<<<<<<< HEAD -<<<<<<< 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 存檔 (*.bin)|*.bin" @@ -5968,15 +5300,7 @@ 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 已連接" @@ -6009,27 +5333,9 @@ msgstr "視窗 右" msgid "Word Wrap" msgstr "自動換行" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 -======= -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364 -#: 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. -======= #: Source/Core/DolphinWX/Src/FrameTools.cpp:1377 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1145 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1278 ->>>>>>> Update the pot file to reflect recent changes in the code. msgid "Working..." msgstr "執行中..."