From a7d142bed976166a157d1913a73cf882f03d8e17 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Fri, 9 Mar 2012 17:46:58 -0600 Subject: [PATCH] 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 "執行中..."