Update translation files for recent changes in the code.
This commit is contained in:
Glenn Rice
parent
b69a1d225a
commit
61d5624c2d
|
|
@ -7,9 +7,15 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: Dolphin Emu\n"
|
"Project-Id-Version: Dolphin Emu\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
"PO-Revision-Date: 2011-10-16 11:25-0500\n"
|
"PO-Revision-Date: 2011-10-16 11:25-0500\n"
|
||||||
"Last-Translator: mansoor\n"
|
"Last-Translator: mansoor\n"
|
||||||
|
=======
|
||||||
|
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
||||||
|
"PO-Revision-Date: 2011-07-20 13:33+0300\n"
|
||||||
|
"Last-Translator: \n"
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
"Language-Team: \n"
|
"Language-Team: \n"
|
||||||
"Language: \n"
|
"Language: \n"
|
||||||
"MIME-Version: 1.0\n"
|
"MIME-Version: 1.0\n"
|
||||||
|
|
@ -418,6 +424,10 @@ msgid "Accurate VBeam emulation"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
#, fuzzy
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Accurately emulate EFB copies.\n"
|
"Accurately emulate EFB copies.\n"
|
||||||
"Some games depend on this for certain graphical effects or gameplay "
|
"Some games depend on this for certain graphical effects or gameplay "
|
||||||
|
|
@ -529,9 +539,15 @@ msgstr "أضف باتش"
|
||||||
msgid "Add new pane"
|
msgid "Add new pane"
|
||||||
msgstr "إضافة جزء جديد"
|
msgstr "إضافة جزء جديد"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Add..."
|
msgid "Add..."
|
||||||
msgstr "أضف"
|
msgstr "أضف"
|
||||||
|
|
||||||
|
|
@ -585,8 +601,13 @@ msgstr ""
|
||||||
msgid "All Gamecube GCM files (gcm)"
|
msgid "All Gamecube GCM files (gcm)"
|
||||||
msgstr "جميع ملفات الجيم كيوب (gcm)"
|
msgstr "جميع ملفات الجيم كيوب (gcm)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "All Save States (sav, s##)"
|
msgid "All Save States (sav, s##)"
|
||||||
msgstr "حفظ جميع الحالات (sav, s##)"
|
msgstr "حفظ جميع الحالات (sav, s##)"
|
||||||
|
|
||||||
|
|
@ -615,8 +636,14 @@ msgstr ""
|
||||||
"إذا لم تكن متأكدا اترك هذا غير محددة."
|
"إذا لم تكن متأكدا اترك هذا غير محددة."
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
|
||||||
|
<<<<<<< HEAD
|
||||||
msgid "Alternate Wiimote Timing"
|
msgid "Alternate Wiimote Timing"
|
||||||
msgstr "بديل ويموت"
|
msgstr "بديل ويموت"
|
||||||
|
=======
|
||||||
|
#, fuzzy
|
||||||
|
msgid "Alternate Wiimote Timing"
|
||||||
|
msgstr "محاكاة ويموت"
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372
|
||||||
msgid "Anisotropic Filtering:"
|
msgid "Anisotropic Filtering:"
|
||||||
|
|
@ -671,7 +698,11 @@ msgstr "هل أنت متأكد أنك تريد حذف هذه الملف؟ "
|
||||||
msgid "Are you sure you want to delete this file? It will be gone forever!"
|
msgid "Are you sure you want to delete this file? It will be gone forever!"
|
||||||
msgstr "هل أنت متأكد أنك تريد حذف هذه الملفات؟"
|
msgstr "هل أنت متأكد أنك تريد حذف هذه الملفات؟"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
||||||
msgid "Aspect Ratio:"
|
msgid "Aspect Ratio:"
|
||||||
msgstr "نسبة العرض :"
|
msgstr "نسبة العرض :"
|
||||||
|
|
@ -692,7 +723,11 @@ msgstr "صوت الخلفية :"
|
||||||
msgid "AudioCommon: Error opening AO device.\n"
|
msgid "AudioCommon: Error opening AO device.\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
||||||
msgid "Auto"
|
msgid "Auto"
|
||||||
msgstr "تلقائي"
|
msgstr "تلقائي"
|
||||||
|
|
@ -807,7 +842,11 @@ msgid "Blue Right"
|
||||||
msgstr "اليمين أزرق"
|
msgstr "اليمين أزرق"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Bottom"
|
msgid "Bottom"
|
||||||
msgstr "أسفل"
|
msgstr "أسفل"
|
||||||
|
|
||||||
|
|
@ -840,7 +879,11 @@ msgstr "لاستعراض الدليل الإخراج"
|
||||||
msgid "Buffer:"
|
msgid "Buffer:"
|
||||||
msgstr "العازلة :"
|
msgstr "العازلة :"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
||||||
msgid "Buttons"
|
msgid "Buttons"
|
||||||
|
|
@ -1082,7 +1125,11 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
||||||
msgid "Close"
|
msgid "Close"
|
||||||
msgstr "إغلاق"
|
msgstr "إغلاق"
|
||||||
|
|
@ -1191,7 +1238,11 @@ msgstr "توصيل ويموت 3"
|
||||||
msgid "Connect Wiimote 4"
|
msgid "Connect Wiimote 4"
|
||||||
msgstr "توصيل ويموت 4"
|
msgstr "توصيل ويموت 4"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Connecting..."
|
msgid "Connecting..."
|
||||||
msgstr "توصيل"
|
msgstr "توصيل"
|
||||||
|
|
||||||
|
|
@ -1384,7 +1435,11 @@ msgid "DSP Emulator Engine"
|
||||||
msgstr "محرك محاكي الصوت"
|
msgstr "محرك محاكي الصوت"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "DSP HLE emulation (fast)"
|
msgid "DSP HLE emulation (fast)"
|
||||||
msgstr "DSP HLE emulation (سريع)"
|
msgstr "DSP HLE emulation (سريع)"
|
||||||
|
|
||||||
|
|
@ -1613,7 +1668,11 @@ msgstr ""
|
||||||
msgid "Divide"
|
msgid "Divide"
|
||||||
msgstr "انقسام"
|
msgstr "انقسام"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Do you want to stop the current emulation?"
|
msgid "Do you want to stop the current emulation?"
|
||||||
msgstr "هل تريد اغلق اللعبة الحالية؟"
|
msgstr "هل تريد اغلق اللعبة الحالية؟"
|
||||||
|
|
||||||
|
|
@ -1642,12 +1701,21 @@ msgstr "إعدادات تحكم الوي"
|
||||||
msgid "Dolphin FIFO"
|
msgid "Dolphin FIFO"
|
||||||
msgstr "دولفين"
|
msgstr "دولفين"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
msgid "Dolphin GCPad Configuration"
|
msgid "Dolphin GCPad Configuration"
|
||||||
msgstr "إعدادات تحكم الجيم كيوب"
|
msgstr "إعدادات تحكم الجيم كيوب"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204
|
||||||
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
msgstr "إعدادات تحكم الجيم كيوب"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Dolphin TAS Movies (*.dtm)"
|
msgid "Dolphin TAS Movies (*.dtm)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1741,9 +1809,15 @@ msgstr ""
|
||||||
"\n"
|
"\n"
|
||||||
"إذا لم تكن متأكدا اترك هذا غير محددة."
|
"إذا لم تكن متأكدا اترك هذا غير محددة."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Dutch"
|
msgid "Dutch"
|
||||||
msgstr "Dutch"
|
msgstr "Dutch"
|
||||||
|
|
||||||
|
|
@ -1879,15 +1953,22 @@ msgstr "BAT تمكين"
|
||||||
msgid "Enable Block Merging"
|
msgid "Enable Block Merging"
|
||||||
msgstr "تمكين منع الدمج"
|
msgstr "تمكين منع الدمج"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
||||||
msgid "Enable Bounding Box Calculation"
|
msgid "Enable Bounding Box Calculation"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
||||||
msgid "Enable Cache"
|
msgid "Enable Cache"
|
||||||
msgstr "تمكين التخزين المؤقت"
|
msgstr "تمكين التخزين المؤقت"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Enable Cheats"
|
msgid "Enable Cheats"
|
||||||
msgstr "تمكين الاسرار "
|
msgstr "تمكين الاسرار "
|
||||||
|
|
||||||
|
|
@ -2035,9 +2116,15 @@ msgstr ""
|
||||||
msgid "End"
|
msgid "End"
|
||||||
msgstr "نهاية"
|
msgstr "نهاية"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "English"
|
msgid "English"
|
||||||
msgstr "English"
|
msgstr "English"
|
||||||
|
|
||||||
|
|
@ -2066,6 +2153,7 @@ msgstr "المساواة"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
msgid "Error"
|
msgid "Error"
|
||||||
msgstr "خطأ"
|
msgstr "خطأ"
|
||||||
|
|
@ -2077,6 +2165,12 @@ msgid ""
|
||||||
"Sorry, Wii recording is temporarily broken."
|
"Sorry, Wii recording is temporarily broken."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169
|
||||||
|
msgid "Error"
|
||||||
|
msgstr "خطأ"
|
||||||
|
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
||||||
msgid "Error loading selected language. Falling back to system default."
|
msgid "Error loading selected language. Falling back to system default."
|
||||||
msgstr "خطأ في تحميل اللغة المختارة. يتراجع إلى النظام الافتراضية."
|
msgstr "خطأ في تحميل اللغة المختارة. يتراجع إلى النظام الافتراضية."
|
||||||
|
|
@ -2511,9 +2605,15 @@ msgstr "إطارات لتسجيل"
|
||||||
msgid "Free Look"
|
msgid "Free Look"
|
||||||
msgstr "تحكم بكاميرا اللعبة"
|
msgstr "تحكم بكاميرا اللعبة"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "French"
|
msgid "French"
|
||||||
msgstr "French"
|
msgstr "French"
|
||||||
|
|
||||||
|
|
@ -2580,7 +2680,11 @@ msgid "Gamecube &Pad Settings"
|
||||||
msgstr "إعدادات تحكم جيم كيوب"
|
msgstr "إعدادات تحكم جيم كيوب"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
||||||
msgstr "بطاقه ذاكره الجيم كيوب (*.raw,*.gcp) "
|
msgstr "بطاقه ذاكره الجيم كيوب (*.raw,*.gcp) "
|
||||||
|
|
||||||
|
|
@ -2603,8 +2707,12 @@ msgstr ""
|
||||||
"(إما غير رمز سيئة أو نوع رمز غير مدعومة حتى الآن.)"
|
"(إما غير رمز سيئة أو نوع رمز غير مدعومة حتى الآن.)"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
||||||
msgid "General"
|
msgid "General"
|
||||||
msgstr "عام"
|
msgstr "عام"
|
||||||
|
|
@ -2613,9 +2721,15 @@ msgstr "عام"
|
||||||
msgid "General Settings"
|
msgid "General Settings"
|
||||||
msgstr "الإعدادات العامة"
|
msgstr "الإعدادات العامة"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "German"
|
msgid "German"
|
||||||
msgstr "German"
|
msgstr "German"
|
||||||
|
|
||||||
|
|
@ -2637,6 +2751,10 @@ msgid "Greater Than"
|
||||||
msgstr "أكبر من"
|
msgstr "أكبر من"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
#, fuzzy
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Greatly increases quality of textures generated using render to texture "
|
"Greatly increases quality of textures generated using render to texture "
|
||||||
"effects.\n"
|
"effects.\n"
|
||||||
|
|
@ -2745,8 +2863,12 @@ msgid "Hotkey Configuration"
|
||||||
msgstr "إعدادات الاختصارات"
|
msgstr "إعدادات الاختصارات"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Hotkeys"
|
msgid "Hotkeys"
|
||||||
msgstr "الاختصارات"
|
msgstr "الاختصارات"
|
||||||
|
|
||||||
|
|
@ -2955,7 +3077,11 @@ msgid ""
|
||||||
"InstallExceptionHandler called, but this platform does not yet support it."
|
"InstallExceptionHandler called, but this platform does not yet support it."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Installing WAD..."
|
msgid "Installing WAD..."
|
||||||
msgstr "wad تثبيت"
|
msgstr "wad تثبيت"
|
||||||
|
|
||||||
|
|
@ -3034,9 +3160,15 @@ msgstr "تسجيل الملف غير صالح"
|
||||||
msgid "Invalid state"
|
msgid "Invalid state"
|
||||||
msgstr "غير صالح حالة"
|
msgstr "غير صالح حالة"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Italian"
|
msgid "Italian"
|
||||||
msgstr "Italian"
|
msgstr "Italian"
|
||||||
|
|
||||||
|
|
@ -3189,11 +3321,19 @@ msgstr "8 تحميل حالة"
|
||||||
msgid "Load State..."
|
msgid "Load State..."
|
||||||
msgstr "تحميل حالة"
|
msgstr "تحميل حالة"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
msgid "Load Wii System Menu"
|
msgid "Load Wii System Menu"
|
||||||
msgstr "تحميل قائمة نظام الوي"
|
msgstr "تحميل قائمة نظام الوي"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
|
||||||
|
msgid "Load Wii System Menu"
|
||||||
|
msgstr "تحميل قائمة نظام الوي"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Load Wii System Menu %d%c"
|
msgid "Load Wii System Menu %d%c"
|
||||||
msgstr "تحميل قائمة نظام الوي %d%c"
|
msgstr "تحميل قائمة نظام الوي %d%c"
|
||||||
|
|
@ -3273,7 +3413,11 @@ msgstr "MMU سرعة هاك"
|
||||||
msgid "MadCatz Gameshark files(*.gcs)"
|
msgid "MadCatz Gameshark files(*.gcs)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
||||||
msgid "Main Stick"
|
msgid "Main Stick"
|
||||||
msgstr "العصا الأيسر"
|
msgstr "العصا الأيسر"
|
||||||
|
|
@ -3304,7 +3448,11 @@ msgid "Memory Byte"
|
||||||
msgstr "ذاكرة بايت"
|
msgstr "ذاكرة بايت"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Memory Card"
|
msgid "Memory Card"
|
||||||
msgstr "بطاقة الذاكرة"
|
msgstr "بطاقة الذاكرة"
|
||||||
|
|
||||||
|
|
@ -3500,7 +3648,11 @@ msgstr "التبويب"
|
||||||
msgid "NP Up"
|
msgid "NP Up"
|
||||||
msgstr "فوق"
|
msgstr "فوق"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
||||||
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
||||||
msgid "Name:"
|
msgid "Name:"
|
||||||
|
|
@ -3587,7 +3739,11 @@ msgstr "لا يساوي"
|
||||||
msgid "Not Set"
|
msgid "Not Set"
|
||||||
msgstr "غير مجموعة"
|
msgstr "غير مجموعة"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Not connected"
|
msgid "Not connected"
|
||||||
msgstr "غير متصل"
|
msgstr "غير متصل"
|
||||||
|
|
||||||
|
|
@ -3648,7 +3804,10 @@ msgstr "فقط %d كتل متاحة"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Open"
|
msgid "Open"
|
||||||
msgstr "فتح"
|
msgstr "فتح"
|
||||||
|
|
||||||
|
|
@ -3779,8 +3938,13 @@ msgstr "باتش"
|
||||||
msgid "Paths"
|
msgid "Paths"
|
||||||
msgstr "مسارات"
|
msgstr "مسارات"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
||||||
msgid "Pause"
|
msgid "Pause"
|
||||||
msgstr "وقفة"
|
msgstr "وقفة"
|
||||||
|
|
@ -3800,8 +3964,13 @@ msgstr "مشهد %d"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Play"
|
msgid "Play"
|
||||||
msgstr "بدأ اللعبه"
|
msgstr "بدأ اللعبه"
|
||||||
|
|
||||||
|
|
@ -3827,7 +3996,11 @@ msgstr "خيارات التشغيل"
|
||||||
msgid "Players"
|
msgid "Players"
|
||||||
msgstr "لاعبين"
|
msgstr "لاعبين"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Please confirm..."
|
msgid "Please confirm..."
|
||||||
msgstr "يرجى تأكيد"
|
msgstr "يرجى تأكيد"
|
||||||
|
|
||||||
|
|
@ -4038,10 +4211,17 @@ msgstr "تحديث قائمة"
|
||||||
msgid "Refresh game list"
|
msgid "Refresh game list"
|
||||||
msgstr "تحديث القائمة"
|
msgstr "تحديث القائمة"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434
|
||||||
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Remove"
|
msgid "Remove"
|
||||||
msgstr "إزالة"
|
msgstr "إزالة"
|
||||||
|
|
||||||
|
|
@ -4060,7 +4240,10 @@ msgid "Render to Main Window"
|
||||||
msgstr "تقدم إلى الشاشة الرئيسية"
|
msgstr "تقدم إلى الشاشة الرئيسية"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
||||||
msgid "Reset"
|
msgid "Reset"
|
||||||
msgstr "إعادة ضبط"
|
msgstr "إعادة ضبط"
|
||||||
|
|
@ -4103,7 +4286,11 @@ msgstr "حفظ الحالة"
|
||||||
msgid "Safe"
|
msgid "Safe"
|
||||||
msgstr "آمنة"
|
msgstr "آمنة"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Sample Rate:"
|
msgid "Sample Rate:"
|
||||||
msgstr "معدل العينة :"
|
msgstr "معدل العينة :"
|
||||||
|
|
||||||
|
|
@ -4185,9 +4372,15 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401
|
||||||
msgid "Scaled EFB Copy"
|
msgid "Scaled EFB Copy"
|
||||||
|
<<<<<<< HEAD
|
||||||
msgstr "EFB Copia a escala"
|
msgstr "EFB Copia a escala"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
|
=======
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Scanning %s"
|
msgid "Scanning %s"
|
||||||
msgstr "فحص %s"
|
msgstr "فحص %s"
|
||||||
|
|
@ -4227,12 +4420,21 @@ msgstr ""
|
||||||
msgid "Select"
|
msgid "Select"
|
||||||
msgstr "حدد"
|
msgstr "حدد"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
||||||
msgid "Select The Recording File"
|
msgid "Select The Recording File"
|
||||||
msgstr "اختر ملف تسجيل"
|
msgstr "اختر ملف تسجيل"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:740
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142
|
||||||
|
msgid "Select The Recording File"
|
||||||
|
msgstr "اختر ملف تسجيل"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Select a Wii WAD file to install"
|
msgid "Select a Wii WAD file to install"
|
||||||
msgstr "لتثبيت wad حدد ملف"
|
msgstr "لتثبيت wad حدد ملف"
|
||||||
|
|
||||||
|
|
@ -4258,6 +4460,7 @@ msgstr "اختر النوافذ العائمة"
|
||||||
msgid "Select the file to load"
|
msgid "Select the file to load"
|
||||||
msgstr "حدد الملف لتحميل"
|
msgstr "حدد الملف لتحميل"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
msgstr "حدد حفظ الملف"
|
msgstr "حدد حفظ الملف"
|
||||||
|
|
@ -4267,6 +4470,17 @@ msgid "Select the state to load"
|
||||||
msgstr "حدد حالة التحميل"
|
msgstr "حدد حالة التحميل"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
||||||
|
msgid "Select the save file"
|
||||||
|
msgstr "حدد حفظ الملف"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457
|
||||||
|
msgid "Select the state to load"
|
||||||
|
msgstr "حدد حالة التحميل"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Select the state to save"
|
msgid "Select the state to save"
|
||||||
msgstr "حدد حالة الحفظ"
|
msgstr "حدد حالة الحفظ"
|
||||||
|
|
||||||
|
|
@ -4640,9 +4854,15 @@ msgstr "فشل إنشاء المخزن المؤقت الصوت : %s"
|
||||||
msgid "Space"
|
msgid "Space"
|
||||||
msgstr "مجال"
|
msgstr "مجال"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Spanish"
|
msgid "Spanish"
|
||||||
msgstr "Spanish"
|
msgstr "Spanish"
|
||||||
|
|
||||||
|
|
@ -4686,7 +4906,11 @@ msgstr ""
|
||||||
msgid "Standard Controller"
|
msgid "Standard Controller"
|
||||||
msgstr "وحدة تحكم القياسية"
|
msgstr "وحدة تحكم القياسية"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
||||||
msgid "Start"
|
msgid "Start"
|
||||||
|
|
@ -4721,7 +4945,10 @@ msgstr "عصا"
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
||||||
msgid "Stop"
|
msgid "Stop"
|
||||||
msgstr "اغلق اللعبه"
|
msgstr "اغلق اللعبه"
|
||||||
|
|
@ -4798,7 +5025,10 @@ msgstr "الجدول الأيمن"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Take Screenshot"
|
msgid "Take Screenshot"
|
||||||
msgstr "اخذ لقطه من الشاشه"
|
msgstr "اخذ لقطه من الشاشه"
|
||||||
|
|
||||||
|
|
@ -4811,12 +5041,23 @@ msgid "Test"
|
||||||
msgstr "اختبار"
|
msgstr "اختبار"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438
|
||||||
|
<<<<<<< HEAD
|
||||||
msgid "Texture"
|
msgid "Texture"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455
|
||||||
msgid "Texture Cache"
|
msgid "Texture Cache"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
=======
|
||||||
|
#, fuzzy
|
||||||
|
msgid "Texture"
|
||||||
|
msgstr "Texturesتعطيل "
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455
|
||||||
|
#, fuzzy
|
||||||
|
msgid "Texture Cache"
|
||||||
|
msgstr "إزالة التخزين المؤقت"
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
|
||||||
msgid "Texture Format Overlay"
|
msgid "Texture Format Overlay"
|
||||||
|
|
@ -5031,12 +5272,19 @@ msgstr "تبديل جميع أنواع السجل"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Toggle Fullscreen"
|
msgid "Toggle Fullscreen"
|
||||||
msgstr "اللعب بالشاشة كاملة"
|
msgstr "اللعب بالشاشة كاملة"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Top"
|
msgid "Top"
|
||||||
msgstr "أعلى"
|
msgstr "أعلى"
|
||||||
|
|
||||||
|
|
@ -5143,6 +5391,18 @@ msgstr "تلقى رسالة مجهولة مع معرف : %d"
|
||||||
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
||||||
|
#, c-format
|
||||||
|
msgid ""
|
||||||
|
"Unknown pointer %#08x\n"
|
||||||
|
"Continue?"
|
||||||
|
msgstr ""
|
||||||
|
"مؤشر غير معروف %#08x\n"
|
||||||
|
"مواصلة?"
|
||||||
|
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
||||||
msgid "Up"
|
msgid "Up"
|
||||||
|
|
@ -5365,7 +5625,11 @@ msgstr ""
|
||||||
msgid "Wii Save Import"
|
msgid "Wii Save Import"
|
||||||
msgstr "استيراد حفظ الوي"
|
msgstr "استيراد حفظ الوي"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wii save files (*.bin)|*.bin"
|
msgid "Wii save files (*.bin)|*.bin"
|
||||||
msgstr "ملفات حفظ الوي (*.bin)|*.bin"
|
msgstr "ملفات حفظ الوي (*.bin)|*.bin"
|
||||||
|
|
||||||
|
|
@ -5396,7 +5660,11 @@ msgstr ""
|
||||||
"أو ربما هو بسبب الخمول وقت مستقطع أو لسبب آخر.\n"
|
"أو ربما هو بسبب الخمول وقت مستقطع أو لسبب آخر.\n"
|
||||||
"هل تريد إعادة الاتصال على الفور?"
|
"هل تريد إعادة الاتصال على الفور?"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wiimote Connected"
|
msgid "Wiimote Connected"
|
||||||
msgstr "ويموت متصل"
|
msgstr "ويموت متصل"
|
||||||
|
|
||||||
|
|
@ -5428,9 +5696,15 @@ msgstr "نوافذ اليمين"
|
||||||
msgid "Word Wrap"
|
msgid "Word Wrap"
|
||||||
msgstr "كلمة ختامية"
|
msgstr "كلمة ختامية"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Working..."
|
msgid "Working..."
|
||||||
msgstr "العمل"
|
msgstr "العمل"
|
||||||
|
|
||||||
|
|
@ -5661,10 +5935,13 @@ msgstr "أو"
|
||||||
#~ msgid "< as Default Profile >"
|
#~ msgid "< as Default Profile >"
|
||||||
#~ msgstr "< الوضع الافتراضي >"
|
#~ msgstr "< الوضع الافتراضي >"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
#~ msgid "AOSound"
|
#~ msgid "AOSound"
|
||||||
#~ msgstr "&الصوت"
|
#~ msgstr "&الصوت"
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#~ msgid "Accurate Texture Cache"
|
#~ msgid "Accurate Texture Cache"
|
||||||
#~ msgstr "دقة المظهر السطحي المؤقت"
|
#~ msgstr "دقة المظهر السطحي المؤقت"
|
||||||
|
|
||||||
|
|
@ -5702,6 +5979,7 @@ msgstr "أو"
|
||||||
#~ "the EFB scale.\n"
|
#~ "the EFB scale.\n"
|
||||||
#~ "ومن الأفضل ل تعيين نسبة العرض إلى الارتفاع لتمتد عند استخدامه."
|
#~ "ومن الأفضل ل تعيين نسبة العرض إلى الارتفاع لتمتد عند استخدامه."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#~ msgid "Bad gameini filename"
|
#~ msgid "Bad gameini filename"
|
||||||
#~ msgstr "Nombre de archivo gameini incorrecto"
|
#~ msgstr "Nombre de archivo gameini incorrecto"
|
||||||
|
|
||||||
|
|
@ -5736,6 +6014,8 @@ msgstr "أو"
|
||||||
#~ msgid "Config..."
|
#~ msgid "Config..."
|
||||||
#~ msgstr "إعدادات"
|
#~ msgstr "إعدادات"
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#~ msgid "Configuration profile"
|
#~ msgid "Configuration profile"
|
||||||
#~ msgstr "التكوين الشخصي"
|
#~ msgstr "التكوين الشخصي"
|
||||||
|
|
||||||
|
|
@ -5836,6 +6116,7 @@ msgstr "أو"
|
||||||
#~ msgid "Enable CPU Access"
|
#~ msgid "Enable CPU Access"
|
||||||
#~ msgstr "CPU Access تمكين"
|
#~ msgstr "CPU Access تمكين"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#~ msgid "Enable Copy to EFB"
|
#~ msgid "Enable Copy to EFB"
|
||||||
#~ msgstr "Habilitar Copiado al EFB"
|
#~ msgstr "Habilitar Copiado al EFB"
|
||||||
|
|
||||||
|
|
@ -5851,12 +6132,15 @@ msgstr "أو"
|
||||||
#~ msgid "Enable JIT Dynarec"
|
#~ msgid "Enable JIT Dynarec"
|
||||||
#~ msgstr "تمكين صفحات"
|
#~ msgstr "تمكين صفحات"
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#~ msgid "Enable OpenCL"
|
#~ msgid "Enable OpenCL"
|
||||||
#~ msgstr "OpenCL تمكين "
|
#~ msgstr "OpenCL تمكين "
|
||||||
|
|
||||||
#~ msgid "Enable Screen Saver (burn-in reduction)"
|
#~ msgid "Enable Screen Saver (burn-in reduction)"
|
||||||
#~ msgstr "تمكين شاشة التوقف"
|
#~ msgstr "تمكين شاشة التوقف"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
#~ msgid ""
|
#~ msgid ""
|
||||||
#~ "Enables dynamic recompilation of DSP code.\n"
|
#~ "Enables dynamic recompilation of DSP code.\n"
|
||||||
|
|
@ -5930,6 +6214,8 @@ msgstr "أو"
|
||||||
#~ msgid "Force Bi/Trilinear Filtering"
|
#~ msgid "Force Bi/Trilinear Filtering"
|
||||||
#~ msgstr "Forzar Filtro Bi/Tri-linear"
|
#~ msgstr "Forzar Filtro Bi/Tri-linear"
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#~ msgid "Fractional"
|
#~ msgid "Fractional"
|
||||||
#~ msgstr "جزئي"
|
#~ msgstr "جزئي"
|
||||||
|
|
||||||
|
|
@ -6072,6 +6358,7 @@ msgstr "أو"
|
||||||
#~ msgid "Required for using the Japanese ROM font."
|
#~ msgid "Required for using the Japanese ROM font."
|
||||||
#~ msgstr "اللازمة لاستعمال الخط القرص اليابانية."
|
#~ msgstr "اللازمة لاستعمال الخط القرص اليابانية."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
#~ msgid "Run"
|
#~ msgid "Run"
|
||||||
#~ msgstr "Enter"
|
#~ msgstr "Enter"
|
||||||
|
|
@ -6079,6 +6366,8 @@ msgstr "أو"
|
||||||
#~ msgid "Running script...\n"
|
#~ msgid "Running script...\n"
|
||||||
#~ msgstr "Ejecutando script...\n"
|
#~ msgstr "Ejecutando script...\n"
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#~ msgid "Scale:"
|
#~ msgid "Scale:"
|
||||||
#~ msgstr "النطاق :"
|
#~ msgstr "النطاق :"
|
||||||
|
|
||||||
|
|
@ -6136,6 +6425,7 @@ msgstr "أو"
|
||||||
#~ "عرض إحصاءات مختلفة.\n"
|
#~ "عرض إحصاءات مختلفة.\n"
|
||||||
#~ "وهذا مفيد فقط لأغراض التصحيح."
|
#~ "وهذا مفيد فقط لأغراض التصحيح."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#~ msgid "Skies of Arcadia"
|
#~ msgid "Skies of Arcadia"
|
||||||
#~ msgstr "Skies of Arcadia"
|
#~ msgstr "Skies of Arcadia"
|
||||||
|
|
||||||
|
|
@ -6175,12 +6465,15 @@ msgstr "أو"
|
||||||
#~ msgid "Specify an audio plugin"
|
#~ msgid "Specify an audio plugin"
|
||||||
#~ msgstr "حدد الخلفية ملف فيديو"
|
#~ msgstr "حدد الخلفية ملف فيديو"
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#~ msgid "Start Renderer in Fullscreen"
|
#~ msgid "Start Renderer in Fullscreen"
|
||||||
#~ msgstr "بدء في كمال ملء الشاشة"
|
#~ msgstr "بدء في كمال ملء الشاشة"
|
||||||
|
|
||||||
#~ msgid "Start the rendering window in fullscreen mode."
|
#~ msgid "Start the rendering window in fullscreen mode."
|
||||||
#~ msgstr "بدء التقديم في إطار وضع ملء الشاشة."
|
#~ msgstr "بدء التقديم في إطار وضع ملء الشاشة."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#~ msgid "The file "
|
#~ msgid "The file "
|
||||||
#~ msgstr "El archivo "
|
#~ msgstr "El archivo "
|
||||||
|
|
||||||
|
|
@ -6201,6 +6494,8 @@ msgstr "أو"
|
||||||
#~ "مؤشر غير معروف %#08x\n"
|
#~ "مؤشر غير معروف %#08x\n"
|
||||||
#~ "مواصلة?"
|
#~ "مواصلة?"
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#~ msgid "Use FPS For Limiting"
|
#~ msgid "Use FPS For Limiting"
|
||||||
#~ msgstr "لحد عدد الاطارات"
|
#~ msgstr "لحد عدد الاطارات"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,11 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: Dolphin Emu\n"
|
"Project-Id-Version: Dolphin Emu\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
|
=======
|
||||||
|
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
"PO-Revision-Date: 2011-08-19 08:36-0500\n"
|
"PO-Revision-Date: 2011-08-19 08:36-0500\n"
|
||||||
"Last-Translator: Jordi Coma <jordicoma22@gmail.com>\n"
|
"Last-Translator: Jordi Coma <jordicoma22@gmail.com>\n"
|
||||||
"Language-Team: Catalan <jordicoma22@gmail.com>\n"
|
"Language-Team: Catalan <jordicoma22@gmail.com>\n"
|
||||||
|
|
@ -564,9 +568,15 @@ msgstr "Afegeix Pegat"
|
||||||
msgid "Add new pane"
|
msgid "Add new pane"
|
||||||
msgstr "Afegeix un nou panell"
|
msgstr "Afegeix un nou panell"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Add..."
|
msgid "Add..."
|
||||||
msgstr "Afegir ..."
|
msgstr "Afegir ..."
|
||||||
|
|
||||||
|
|
@ -634,8 +644,13 @@ msgstr "Totes les imatges GC / Wii (gcm, iso, ciso, gcz)"
|
||||||
msgid "All Gamecube GCM files (gcm)"
|
msgid "All Gamecube GCM files (gcm)"
|
||||||
msgstr "Tots els fitxers GameCube GCM (gcm)"
|
msgstr "Tots els fitxers GameCube GCM (gcm)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "All Save States (sav, s##)"
|
msgid "All Save States (sav, s##)"
|
||||||
msgstr "Tots els Estats (savi, s##\")"
|
msgstr "Tots els Estats (savi, s##\")"
|
||||||
|
|
||||||
|
|
@ -724,7 +739,11 @@ msgid "Are you sure you want to delete this file? It will be gone forever!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Estàs segur d'eliminar aquest fitxer? Aquesta acció serà irrecuperable!"
|
"Estàs segur d'eliminar aquest fitxer? Aquesta acció serà irrecuperable!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
||||||
msgid "Aspect Ratio:"
|
msgid "Aspect Ratio:"
|
||||||
msgstr "Relació d'aspecte:"
|
msgstr "Relació d'aspecte:"
|
||||||
|
|
@ -745,7 +764,11 @@ msgstr "Suport d'àudio:"
|
||||||
msgid "AudioCommon: Error opening AO device.\n"
|
msgid "AudioCommon: Error opening AO device.\n"
|
||||||
msgstr "AudioCommon: Error en obrir el dispositiu AO \n"
|
msgstr "AudioCommon: Error en obrir el dispositiu AO \n"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
||||||
msgid "Auto"
|
msgid "Auto"
|
||||||
msgstr "Auto"
|
msgstr "Auto"
|
||||||
|
|
@ -861,7 +884,11 @@ msgid "Blue Right"
|
||||||
msgstr "Blau dret"
|
msgstr "Blau dret"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Bottom"
|
msgid "Bottom"
|
||||||
msgstr "Abaix"
|
msgstr "Abaix"
|
||||||
|
|
||||||
|
|
@ -894,7 +921,11 @@ msgstr "Examineu el directori de sortida"
|
||||||
msgid "Buffer:"
|
msgid "Buffer:"
|
||||||
msgstr "Buffer:"
|
msgstr "Buffer:"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
||||||
msgid "Buttons"
|
msgid "Buttons"
|
||||||
|
|
@ -1151,7 +1182,11 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
||||||
msgid "Close"
|
msgid "Close"
|
||||||
msgstr "Tancar"
|
msgstr "Tancar"
|
||||||
|
|
@ -1260,7 +1295,11 @@ msgstr "Connectar Wiimote 3"
|
||||||
msgid "Connect Wiimote 4"
|
msgid "Connect Wiimote 4"
|
||||||
msgstr "Connectar Wiimote 4"
|
msgstr "Connectar Wiimote 4"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Connecting..."
|
msgid "Connecting..."
|
||||||
msgstr "Connectant ..."
|
msgstr "Connectant ..."
|
||||||
|
|
||||||
|
|
@ -1451,7 +1490,11 @@ msgid "DSP Emulator Engine"
|
||||||
msgstr "Motor d'emulació DSP"
|
msgstr "Motor d'emulació DSP"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "DSP HLE emulation (fast)"
|
msgid "DSP HLE emulation (fast)"
|
||||||
msgstr "Emulació DSP HLE (ràpid)"
|
msgstr "Emulació DSP HLE (ràpid)"
|
||||||
|
|
||||||
|
|
@ -1682,7 +1725,11 @@ msgstr ""
|
||||||
msgid "Divide"
|
msgid "Divide"
|
||||||
msgstr "Divideix"
|
msgstr "Divideix"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Do you want to stop the current emulation?"
|
msgid "Do you want to stop the current emulation?"
|
||||||
msgstr "Voleu aturar l'emulació actual?"
|
msgstr "Voleu aturar l'emulació actual?"
|
||||||
|
|
||||||
|
|
@ -1711,12 +1758,21 @@ msgstr "Configuració de Wiimote emulat"
|
||||||
msgid "Dolphin FIFO"
|
msgid "Dolphin FIFO"
|
||||||
msgstr "FIFO Dolphin"
|
msgstr "FIFO Dolphin"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
msgid "Dolphin GCPad Configuration"
|
msgid "Dolphin GCPad Configuration"
|
||||||
msgstr "Configuració del control GC Dolphin"
|
msgstr "Configuració del control GC Dolphin"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204
|
||||||
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
msgstr "Configuració del control GC Dolphin"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Dolphin TAS Movies (*.dtm)"
|
msgid "Dolphin TAS Movies (*.dtm)"
|
||||||
msgstr "Dolphin Pel·lícules TAS (*.dtm)"
|
msgstr "Dolphin Pel·lícules TAS (*.dtm)"
|
||||||
|
|
||||||
|
|
@ -1813,9 +1869,15 @@ msgstr ""
|
||||||
"\n"
|
"\n"
|
||||||
"Si no n'esteu segur, deixeu-ho desmarcat."
|
"Si no n'esteu segur, deixeu-ho desmarcat."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Dutch"
|
msgid "Dutch"
|
||||||
msgstr "Holandès"
|
msgstr "Holandès"
|
||||||
|
|
||||||
|
|
@ -1960,15 +2022,22 @@ msgstr "Habilitar les millors tècniques disponibles"
|
||||||
msgid "Enable Block Merging"
|
msgid "Enable Block Merging"
|
||||||
msgstr "Habilitar fusió de Bloc"
|
msgstr "Habilitar fusió de Bloc"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
||||||
msgid "Enable Bounding Box Calculation"
|
msgid "Enable Bounding Box Calculation"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
||||||
msgid "Enable Cache"
|
msgid "Enable Cache"
|
||||||
msgstr "Habilitar memòria cau"
|
msgstr "Habilitar memòria cau"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Enable Cheats"
|
msgid "Enable Cheats"
|
||||||
msgstr "Activar Trucs"
|
msgstr "Activar Trucs"
|
||||||
|
|
||||||
|
|
@ -2121,9 +2190,15 @@ msgstr ""
|
||||||
msgid "End"
|
msgid "End"
|
||||||
msgstr "Fi"
|
msgstr "Fi"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "English"
|
msgid "English"
|
||||||
msgstr "Anglès"
|
msgstr "Anglès"
|
||||||
|
|
||||||
|
|
@ -2152,6 +2227,7 @@ msgstr "Igual"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
msgid "Error"
|
msgid "Error"
|
||||||
msgstr "Error"
|
msgstr "Error"
|
||||||
|
|
@ -2163,6 +2239,12 @@ msgid ""
|
||||||
"Sorry, Wii recording is temporarily broken."
|
"Sorry, Wii recording is temporarily broken."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169
|
||||||
|
msgid "Error"
|
||||||
|
msgstr "Error"
|
||||||
|
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
||||||
msgid "Error loading selected language. Falling back to system default."
|
msgid "Error loading selected language. Falling back to system default."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2621,9 +2703,15 @@ msgstr "Imatges a Enregistrar"
|
||||||
msgid "Free Look"
|
msgid "Free Look"
|
||||||
msgstr "Visió lliure"
|
msgstr "Visió lliure"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "French"
|
msgid "French"
|
||||||
msgstr "Francès"
|
msgstr "Francès"
|
||||||
|
|
||||||
|
|
@ -2690,7 +2778,11 @@ msgid "Gamecube &Pad Settings"
|
||||||
msgstr "Configuració control «&Gamecube»"
|
msgstr "Configuració control «&Gamecube»"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
||||||
msgstr "Targetes de memòria per GameCube (*.raw, *.gcp)"
|
msgstr "Targetes de memòria per GameCube (*.raw, *.gcp)"
|
||||||
|
|
||||||
|
|
@ -2713,8 +2805,12 @@ msgstr ""
|
||||||
"(Pot ser un codi incorrecte o el tipus de codi encara no està suportat.)"
|
"(Pot ser un codi incorrecte o el tipus de codi encara no està suportat.)"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
||||||
msgid "General"
|
msgid "General"
|
||||||
msgstr "General"
|
msgstr "General"
|
||||||
|
|
@ -2723,9 +2819,15 @@ msgstr "General"
|
||||||
msgid "General Settings"
|
msgid "General Settings"
|
||||||
msgstr "Configuració General"
|
msgstr "Configuració General"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "German"
|
msgid "German"
|
||||||
msgstr "Alemany"
|
msgstr "Alemany"
|
||||||
|
|
||||||
|
|
@ -2859,8 +2961,12 @@ msgid "Hotkey Configuration"
|
||||||
msgstr "Tecla d'accés de configuració"
|
msgstr "Tecla d'accés de configuració"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Hotkeys"
|
msgid "Hotkeys"
|
||||||
msgstr "Tecles d'accés"
|
msgstr "Tecles d'accés"
|
||||||
|
|
||||||
|
|
@ -3085,7 +3191,11 @@ msgstr ""
|
||||||
"InstallExceptionHandler cridat, però aquesta plataforma no està suportada "
|
"InstallExceptionHandler cridat, però aquesta plataforma no està suportada "
|
||||||
"encara."
|
"encara."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Installing WAD..."
|
msgid "Installing WAD..."
|
||||||
msgstr "Instal·lant WAD ..."
|
msgstr "Instal·lant WAD ..."
|
||||||
|
|
||||||
|
|
@ -3167,9 +3277,15 @@ msgstr "Enregistrament de fitxer invàlid"
|
||||||
msgid "Invalid state"
|
msgid "Invalid state"
|
||||||
msgstr "Estat invàlid"
|
msgstr "Estat invàlid"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Italian"
|
msgid "Italian"
|
||||||
msgstr "Italià"
|
msgstr "Italià"
|
||||||
|
|
||||||
|
|
@ -3327,11 +3443,19 @@ msgstr "Carregar ranura d'estat 8"
|
||||||
msgid "Load State..."
|
msgid "Load State..."
|
||||||
msgstr "Carregar Estat..."
|
msgstr "Carregar Estat..."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
msgid "Load Wii System Menu"
|
msgid "Load Wii System Menu"
|
||||||
msgstr "Carregar el menú del sistema Wii"
|
msgstr "Carregar el menú del sistema Wii"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
|
||||||
|
msgid "Load Wii System Menu"
|
||||||
|
msgstr "Carregar el menú del sistema Wii"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Load Wii System Menu %d%c"
|
msgid "Load Wii System Menu %d%c"
|
||||||
msgstr "Carregar menú del sistema Wii %d%c"
|
msgstr "Carregar menú del sistema Wii %d%c"
|
||||||
|
|
@ -3413,7 +3537,11 @@ msgstr "Modificació de velocitat MMU"
|
||||||
msgid "MadCatz Gameshark files(*.gcs)"
|
msgid "MadCatz Gameshark files(*.gcs)"
|
||||||
msgstr "Arxius MadCatz Gameshark (*.gcs)"
|
msgstr "Arxius MadCatz Gameshark (*.gcs)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
||||||
msgid "Main Stick"
|
msgid "Main Stick"
|
||||||
msgstr "Palanca principal"
|
msgstr "Palanca principal"
|
||||||
|
|
@ -3444,7 +3572,11 @@ msgid "Memory Byte"
|
||||||
msgstr "Byte de memòria"
|
msgstr "Byte de memòria"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Memory Card"
|
msgid "Memory Card"
|
||||||
msgstr "Targeta de memòria"
|
msgstr "Targeta de memòria"
|
||||||
|
|
||||||
|
|
@ -3644,7 +3776,11 @@ msgstr "NP Tabulador"
|
||||||
msgid "NP Up"
|
msgid "NP Up"
|
||||||
msgstr "NP Amunt"
|
msgstr "NP Amunt"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
||||||
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
||||||
msgid "Name:"
|
msgid "Name:"
|
||||||
|
|
@ -3731,7 +3867,11 @@ msgstr "No igual"
|
||||||
msgid "Not Set"
|
msgid "Not Set"
|
||||||
msgstr "Sense establir"
|
msgstr "Sense establir"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Not connected"
|
msgid "Not connected"
|
||||||
msgstr "No està connectat"
|
msgstr "No està connectat"
|
||||||
|
|
||||||
|
|
@ -3792,7 +3932,10 @@ msgstr "Només queden %d blocs disponibles"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Open"
|
msgid "Open"
|
||||||
msgstr "Obrir"
|
msgstr "Obrir"
|
||||||
|
|
||||||
|
|
@ -3923,8 +4066,13 @@ msgstr "Pegats"
|
||||||
msgid "Paths"
|
msgid "Paths"
|
||||||
msgstr "Camins"
|
msgstr "Camins"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
||||||
msgid "Pause"
|
msgid "Pause"
|
||||||
msgstr "Pausa"
|
msgstr "Pausa"
|
||||||
|
|
@ -3944,8 +4092,13 @@ msgstr "Perspectiva %d"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Play"
|
msgid "Play"
|
||||||
msgstr "Executar"
|
msgstr "Executar"
|
||||||
|
|
||||||
|
|
@ -3971,7 +4124,11 @@ msgstr "Opcions de reproducció"
|
||||||
msgid "Players"
|
msgid "Players"
|
||||||
msgstr "Jugadors"
|
msgstr "Jugadors"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Please confirm..."
|
msgid "Please confirm..."
|
||||||
msgstr "Confirmeu ..."
|
msgstr "Confirmeu ..."
|
||||||
|
|
||||||
|
|
@ -4183,10 +4340,17 @@ msgstr "Actualitzar llista"
|
||||||
msgid "Refresh game list"
|
msgid "Refresh game list"
|
||||||
msgstr "Actualitza la llista de jocs"
|
msgstr "Actualitza la llista de jocs"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434
|
||||||
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Remove"
|
msgid "Remove"
|
||||||
msgstr "Treure"
|
msgstr "Treure"
|
||||||
|
|
||||||
|
|
@ -4205,7 +4369,10 @@ msgid "Render to Main Window"
|
||||||
msgstr "Renderitzar a la finestra principal"
|
msgstr "Renderitzar a la finestra principal"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
||||||
msgid "Reset"
|
msgid "Reset"
|
||||||
msgstr "Reiniciar"
|
msgstr "Reiniciar"
|
||||||
|
|
@ -4248,7 +4415,11 @@ msgstr "&Desa l'estat"
|
||||||
msgid "Safe"
|
msgid "Safe"
|
||||||
msgstr "Segur"
|
msgstr "Segur"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Sample Rate:"
|
msgid "Sample Rate:"
|
||||||
msgstr "Freqüència de mostreig:"
|
msgstr "Freqüència de mostreig:"
|
||||||
|
|
||||||
|
|
@ -4332,7 +4503,11 @@ msgstr "La pal·lícula guardada %s és corrupta, s'atura la gravació..."
|
||||||
msgid "Scaled EFB Copy"
|
msgid "Scaled EFB Copy"
|
||||||
msgstr "Copia EFB escalada"
|
msgstr "Copia EFB escalada"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Scanning %s"
|
msgid "Scanning %s"
|
||||||
msgstr "Escanejant %s"
|
msgstr "Escanejant %s"
|
||||||
|
|
@ -4372,12 +4547,21 @@ msgstr "La secció %s no trobada a SYSCONF"
|
||||||
msgid "Select"
|
msgid "Select"
|
||||||
msgstr "Seleccionar"
|
msgstr "Seleccionar"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
||||||
msgid "Select The Recording File"
|
msgid "Select The Recording File"
|
||||||
msgstr "Seleccionar el fitxer de gravació"
|
msgstr "Seleccionar el fitxer de gravació"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:740
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142
|
||||||
|
msgid "Select The Recording File"
|
||||||
|
msgstr "Seleccionar el fitxer de gravació"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Select a Wii WAD file to install"
|
msgid "Select a Wii WAD file to install"
|
||||||
msgstr "Seleccionar un fitxer WAD de Wii per instal·lar"
|
msgstr "Seleccionar un fitxer WAD de Wii per instal·lar"
|
||||||
|
|
||||||
|
|
@ -4402,6 +4586,7 @@ msgstr "Seleccioneu finestres flotants"
|
||||||
msgid "Select the file to load"
|
msgid "Select the file to load"
|
||||||
msgstr "Seleccioneu el fitxer a carregar"
|
msgstr "Seleccioneu el fitxer a carregar"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
msgstr "Seleccioneu el fitxer de partida desada"
|
msgstr "Seleccioneu el fitxer de partida desada"
|
||||||
|
|
@ -4411,6 +4596,17 @@ msgid "Select the state to load"
|
||||||
msgstr "Seleccioneu l'estat a carregar"
|
msgstr "Seleccioneu l'estat a carregar"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
||||||
|
msgid "Select the save file"
|
||||||
|
msgstr "Seleccioneu el fitxer de partida desada"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457
|
||||||
|
msgid "Select the state to load"
|
||||||
|
msgstr "Seleccioneu l'estat a carregar"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Select the state to save"
|
msgid "Select the state to save"
|
||||||
msgstr "Seleccioneu l'estat a desar"
|
msgstr "Seleccioneu l'estat a desar"
|
||||||
|
|
||||||
|
|
@ -4793,9 +4989,15 @@ msgstr "Ha fallat la creació del buffer de so: %s"
|
||||||
msgid "Space"
|
msgid "Space"
|
||||||
msgstr "Espai"
|
msgstr "Espai"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Spanish"
|
msgid "Spanish"
|
||||||
msgstr "Espanyol"
|
msgstr "Espanyol"
|
||||||
|
|
||||||
|
|
@ -4840,7 +5042,11 @@ msgstr "Palanca quadrada"
|
||||||
msgid "Standard Controller"
|
msgid "Standard Controller"
|
||||||
msgstr "Control estàndard"
|
msgstr "Control estàndard"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
||||||
msgid "Start"
|
msgid "Start"
|
||||||
|
|
@ -4875,7 +5081,10 @@ msgstr "Palanca"
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
||||||
msgid "Stop"
|
msgid "Stop"
|
||||||
msgstr "Aturar"
|
msgstr "Aturar"
|
||||||
|
|
@ -4952,7 +5161,10 @@ msgstr "Taula dreta"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Take Screenshot"
|
msgid "Take Screenshot"
|
||||||
msgstr "Capturar pantalla"
|
msgstr "Capturar pantalla"
|
||||||
|
|
||||||
|
|
@ -5198,12 +5410,19 @@ msgstr "Activar tots els tipus de registre de Log"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Toggle Fullscreen"
|
msgid "Toggle Fullscreen"
|
||||||
msgstr "Activar pantalla completa"
|
msgstr "Activar pantalla completa"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Top"
|
msgid "Top"
|
||||||
msgstr "Dalt"
|
msgstr "Dalt"
|
||||||
|
|
||||||
|
|
@ -5313,6 +5532,18 @@ msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Missatge desconegut amb id: %d rebut des del jugador: Expulsant jugador %d!"
|
"Missatge desconegut amb id: %d rebut des del jugador: Expulsant jugador %d!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
||||||
|
#, c-format
|
||||||
|
msgid ""
|
||||||
|
"Unknown pointer %#08x\n"
|
||||||
|
"Continue?"
|
||||||
|
msgstr ""
|
||||||
|
"Punter desconegud %#08x\n"
|
||||||
|
"Voleu continuar?"
|
||||||
|
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
||||||
msgid "Up"
|
msgid "Up"
|
||||||
|
|
@ -5538,7 +5769,11 @@ msgstr "Arrel de la NAND:"
|
||||||
msgid "Wii Save Import"
|
msgid "Wii Save Import"
|
||||||
msgstr "Importar partida guardada Wii"
|
msgstr "Importar partida guardada Wii"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wii save files (*.bin)|*.bin"
|
msgid "Wii save files (*.bin)|*.bin"
|
||||||
msgstr "Arxius de partida guardada Wii (*.bin)|*.bin"
|
msgstr "Arxius de partida guardada Wii (*.bin)|*.bin"
|
||||||
|
|
||||||
|
|
@ -5569,7 +5804,11 @@ msgstr ""
|
||||||
"o potser és perquè l'esteu fent servir fora de temps o una altra raó. \n"
|
"o potser és perquè l'esteu fent servir fora de temps o una altra raó. \n"
|
||||||
"Vols tornar a connectar-lo immediatament?"
|
"Vols tornar a connectar-lo immediatament?"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wiimote Connected"
|
msgid "Wiimote Connected"
|
||||||
msgstr "Wiimote connectat"
|
msgstr "Wiimote connectat"
|
||||||
|
|
||||||
|
|
@ -5601,9 +5840,15 @@ msgstr "Finestra dreta"
|
||||||
msgid "Word Wrap"
|
msgid "Word Wrap"
|
||||||
msgstr "Envoltant de paraula"
|
msgstr "Envoltant de paraula"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Working..."
|
msgid "Working..."
|
||||||
msgstr "Treballant ..."
|
msgstr "Treballant ..."
|
||||||
|
|
||||||
|
|
@ -6175,6 +6420,7 @@ msgstr "| O"
|
||||||
#~ msgid "Start the rendering window in fullscreen mode."
|
#~ msgid "Start the rendering window in fullscreen mode."
|
||||||
#~ msgstr "Iniciar la finestra de renderitzat a pantalla completa."
|
#~ msgstr "Iniciar la finestra de renderitzat a pantalla completa."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#~ msgid ""
|
#~ msgid ""
|
||||||
#~ "Unknown pointer %#08x\n"
|
#~ "Unknown pointer %#08x\n"
|
||||||
#~ "Continue?"
|
#~ "Continue?"
|
||||||
|
|
@ -6182,6 +6428,8 @@ msgstr "| O"
|
||||||
#~ "Punter desconegud %#08x\n"
|
#~ "Punter desconegud %#08x\n"
|
||||||
#~ "Voleu continuar?"
|
#~ "Voleu continuar?"
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#~ msgid "Use FPS For Limiting"
|
#~ msgid "Use FPS For Limiting"
|
||||||
#~ msgstr "Limitar imatges/s (FPS)"
|
#~ msgstr "Limitar imatges/s (FPS)"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,8 +7,13 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: Dolphin Emu\n"
|
"Project-Id-Version: Dolphin Emu\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
"PO-Revision-Date: 2011-10-15 14:50+0100\n"
|
"PO-Revision-Date: 2011-10-15 14:50+0100\n"
|
||||||
|
=======
|
||||||
|
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
||||||
|
"PO-Revision-Date: 2011-08-10 20:37+0100\n"
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
"Last-Translator: Zbyněk Schwarz <zbynek.schwarz@gmail.com>\n"
|
"Last-Translator: Zbyněk Schwarz <zbynek.schwarz@gmail.com>\n"
|
||||||
"Language-Team: \n"
|
"Language-Team: \n"
|
||||||
"Language: Czech\n"
|
"Language: Czech\n"
|
||||||
|
|
@ -427,6 +432,10 @@ msgid "Accurate VBeam emulation"
|
||||||
msgstr "Precizní emulace VBeam"
|
msgstr "Precizní emulace VBeam"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
#, fuzzy
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Accurately emulate EFB copies.\n"
|
"Accurately emulate EFB copies.\n"
|
||||||
"Some games depend on this for certain graphical effects or gameplay "
|
"Some games depend on this for certain graphical effects or gameplay "
|
||||||
|
|
@ -552,9 +561,15 @@ msgstr "Přidat Záplatu"
|
||||||
msgid "Add new pane"
|
msgid "Add new pane"
|
||||||
msgstr "Přidat nový panel"
|
msgstr "Přidat nový panel"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Add..."
|
msgid "Add..."
|
||||||
msgstr "Přidat..."
|
msgstr "Přidat..."
|
||||||
|
|
||||||
|
|
@ -622,8 +637,13 @@ msgstr "Všechny obrazy GC/Wii (gcm, iso, ciso, gcz)"
|
||||||
msgid "All Gamecube GCM files (gcm)"
|
msgid "All Gamecube GCM files (gcm)"
|
||||||
msgstr "Všechny soubory Gamecube GCM )gcm)"
|
msgstr "Všechny soubory Gamecube GCM )gcm)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "All Save States (sav, s##)"
|
msgid "All Save States (sav, s##)"
|
||||||
msgstr "Všechny Uložené Stavy (sav, s##)"
|
msgstr "Všechny Uložené Stavy (sav, s##)"
|
||||||
|
|
||||||
|
|
@ -652,8 +672,14 @@ msgstr ""
|
||||||
"Pokud si nejste jisti, nechejte toto odškrtnuté."
|
"Pokud si nejste jisti, nechejte toto odškrtnuté."
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
|
||||||
|
<<<<<<< HEAD
|
||||||
msgid "Alternate Wiimote Timing"
|
msgid "Alternate Wiimote Timing"
|
||||||
msgstr "Střídat časování Wiimote"
|
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:372
|
||||||
msgid "Anisotropic Filtering:"
|
msgid "Anisotropic Filtering:"
|
||||||
|
|
@ -710,7 +736,11 @@ msgstr ""
|
||||||
msgid "Are you sure you want to delete this file? It will be gone forever!"
|
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!"
|
msgstr "Opravdu chcete smazat tento soubor? Bude navždy ztracen!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
||||||
msgid "Aspect Ratio:"
|
msgid "Aspect Ratio:"
|
||||||
msgstr "Poměr Stran:"
|
msgstr "Poměr Stran:"
|
||||||
|
|
@ -731,7 +761,11 @@ msgstr "Backend Zvuku:"
|
||||||
msgid "AudioCommon: Error opening AO device.\n"
|
msgid "AudioCommon: Error opening AO device.\n"
|
||||||
msgstr "AudioCommon: Chyba při otevírání zařízení zvukového výstupu.\n"
|
msgstr "AudioCommon: Chyba při otevírání zařízení zvukového výstupu.\n"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
||||||
msgid "Auto"
|
msgid "Auto"
|
||||||
msgstr "Auto"
|
msgstr "Auto"
|
||||||
|
|
@ -846,7 +880,11 @@ msgid "Blue Right"
|
||||||
msgstr "Modrá vpravo"
|
msgstr "Modrá vpravo"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Bottom"
|
msgid "Bottom"
|
||||||
msgstr "Dole"
|
msgstr "Dole"
|
||||||
|
|
||||||
|
|
@ -879,7 +917,11 @@ msgstr "Procházet pro výstupní adresář"
|
||||||
msgid "Buffer:"
|
msgid "Buffer:"
|
||||||
msgstr "Vyrovnávací paměť:"
|
msgstr "Vyrovnávací paměť:"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
||||||
msgid "Buttons"
|
msgid "Buttons"
|
||||||
|
|
@ -1122,7 +1164,11 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
||||||
msgid "Close"
|
msgid "Close"
|
||||||
msgstr "Zavřít"
|
msgstr "Zavřít"
|
||||||
|
|
@ -1231,7 +1277,11 @@ msgstr "Připojit Wiimote 3"
|
||||||
msgid "Connect Wiimote 4"
|
msgid "Connect Wiimote 4"
|
||||||
msgstr "Připojit Wiimote 4"
|
msgstr "Připojit Wiimote 4"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Connecting..."
|
msgid "Connecting..."
|
||||||
msgstr "Připojuji..."
|
msgstr "Připojuji..."
|
||||||
|
|
||||||
|
|
@ -1421,7 +1471,11 @@ msgid "DSP Emulator Engine"
|
||||||
msgstr "Jádro Emulátoru DSP"
|
msgstr "Jádro Emulátoru DSP"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "DSP HLE emulation (fast)"
|
msgid "DSP HLE emulation (fast)"
|
||||||
msgstr "DSP HLE emulace (rychlé)"
|
msgstr "DSP HLE emulace (rychlé)"
|
||||||
|
|
||||||
|
|
@ -1652,7 +1706,11 @@ msgstr ""
|
||||||
msgid "Divide"
|
msgid "Divide"
|
||||||
msgstr "Rozdělit"
|
msgstr "Rozdělit"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Do you want to stop the current emulation?"
|
msgid "Do you want to stop the current emulation?"
|
||||||
msgstr "Chcete současnou emulaci zastavit?"
|
msgstr "Chcete současnou emulaci zastavit?"
|
||||||
|
|
||||||
|
|
@ -1681,12 +1739,21 @@ msgstr "Nastavení Emulovaného Dolphin Wiimote"
|
||||||
msgid "Dolphin FIFO"
|
msgid "Dolphin FIFO"
|
||||||
msgstr "Dolphin FIFO"
|
msgstr "Dolphin FIFO"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
msgid "Dolphin GCPad Configuration"
|
msgid "Dolphin GCPad Configuration"
|
||||||
msgstr "Dolphin GCPad Nastavení"
|
msgstr "Dolphin GCPad Nastavení"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204
|
||||||
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
msgstr "Dolphin GCPad Nastavení"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Dolphin TAS Movies (*.dtm)"
|
msgid "Dolphin TAS Movies (*.dtm)"
|
||||||
msgstr "Doplhin Filmy TAS (*.dtm)"
|
msgstr "Doplhin Filmy TAS (*.dtm)"
|
||||||
|
|
||||||
|
|
@ -1782,9 +1849,15 @@ msgstr ""
|
||||||
"\n"
|
"\n"
|
||||||
"Pokud si nejste jisti, nechejte toto odškrtnuté."
|
"Pokud si nejste jisti, nechejte toto odškrtnuté."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Dutch"
|
msgid "Dutch"
|
||||||
msgstr "Nizozemština"
|
msgstr "Nizozemština"
|
||||||
|
|
||||||
|
|
@ -1927,15 +2000,22 @@ msgstr "Zapnout BAT"
|
||||||
msgid "Enable Block Merging"
|
msgid "Enable Block Merging"
|
||||||
msgstr "Zapnout Slučování Bloků"
|
msgstr "Zapnout Slučování Bloků"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
||||||
msgid "Enable Bounding Box Calculation"
|
msgid "Enable Bounding Box Calculation"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
||||||
msgid "Enable Cache"
|
msgid "Enable Cache"
|
||||||
msgstr "Povolit vyrovnávací paměť"
|
msgstr "Povolit vyrovnávací paměť"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Enable Cheats"
|
msgid "Enable Cheats"
|
||||||
msgstr "Povolit Cheaty"
|
msgstr "Povolit Cheaty"
|
||||||
|
|
||||||
|
|
@ -2091,9 +2171,15 @@ msgstr ""
|
||||||
msgid "End"
|
msgid "End"
|
||||||
msgstr "End"
|
msgstr "End"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "English"
|
msgid "English"
|
||||||
msgstr "Angličtina"
|
msgstr "Angličtina"
|
||||||
|
|
||||||
|
|
@ -2122,6 +2208,7 @@ msgstr "Rovná se"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
msgid "Error"
|
msgid "Error"
|
||||||
msgstr "Chyba"
|
msgstr "Chyba"
|
||||||
|
|
@ -2133,6 +2220,12 @@ msgid ""
|
||||||
"Sorry, Wii recording is temporarily broken."
|
"Sorry, Wii recording is temporarily broken."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169
|
||||||
|
msgid "Error"
|
||||||
|
msgstr "Chyba"
|
||||||
|
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
||||||
msgid "Error loading selected language. Falling back to system default."
|
msgid "Error loading selected language. Falling back to system default."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2589,9 +2682,15 @@ msgstr "Snímky k Nahrání"
|
||||||
msgid "Free Look"
|
msgid "Free Look"
|
||||||
msgstr "Rozhlížení pomocí myši"
|
msgstr "Rozhlížení pomocí myši"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "French"
|
msgid "French"
|
||||||
msgstr "Francouzština"
|
msgstr "Francouzština"
|
||||||
|
|
||||||
|
|
@ -2658,7 +2757,11 @@ msgid "Gamecube &Pad Settings"
|
||||||
msgstr "Nastavení Gamecube &Pad"
|
msgstr "Nastavení Gamecube &Pad"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
||||||
msgstr "Paměťové karty Gamecube (*.raw,*.gcp)"
|
msgstr "Paměťové karty Gamecube (*.raw,*.gcp)"
|
||||||
|
|
||||||
|
|
@ -2681,8 +2784,12 @@ msgstr ""
|
||||||
"(buď špatný kód, nebo typ kódu není ještě podporován.)"
|
"(buď špatný kód, nebo typ kódu není ještě podporován.)"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
||||||
msgid "General"
|
msgid "General"
|
||||||
msgstr "Obecné"
|
msgstr "Obecné"
|
||||||
|
|
@ -2691,9 +2798,15 @@ msgstr "Obecné"
|
||||||
msgid "General Settings"
|
msgid "General Settings"
|
||||||
msgstr "Obecná Nastavení"
|
msgstr "Obecná Nastavení"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "German"
|
msgid "German"
|
||||||
msgstr "Němčina"
|
msgstr "Němčina"
|
||||||
|
|
||||||
|
|
@ -2715,6 +2828,10 @@ msgid "Greater Than"
|
||||||
msgstr "Větší než"
|
msgstr "Větší než"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
#, fuzzy
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Greatly increases quality of textures generated using render to texture "
|
"Greatly increases quality of textures generated using render to texture "
|
||||||
"effects.\n"
|
"effects.\n"
|
||||||
|
|
@ -2823,8 +2940,12 @@ msgid "Hotkey Configuration"
|
||||||
msgstr "Nastavení klávesových zkratek"
|
msgstr "Nastavení klávesových zkratek"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Hotkeys"
|
msgid "Hotkeys"
|
||||||
msgstr "Klávesové zkratky"
|
msgstr "Klávesové zkratky"
|
||||||
|
|
||||||
|
|
@ -3045,7 +3166,11 @@ msgstr ""
|
||||||
"Byl zavolán InstallExceptionHandler, ale tato platforma toto ještě "
|
"Byl zavolán InstallExceptionHandler, ale tato platforma toto ještě "
|
||||||
"nepodporuje."
|
"nepodporuje."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Installing WAD..."
|
msgid "Installing WAD..."
|
||||||
msgstr "Instaluji WAD..."
|
msgstr "Instaluji WAD..."
|
||||||
|
|
||||||
|
|
@ -3127,9 +3252,15 @@ msgstr "Neplatný soubor s nahrávkou"
|
||||||
msgid "Invalid state"
|
msgid "Invalid state"
|
||||||
msgstr "Neplatný stav"
|
msgstr "Neplatný stav"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Italian"
|
msgid "Italian"
|
||||||
msgstr "Italština"
|
msgstr "Italština"
|
||||||
|
|
||||||
|
|
@ -3287,11 +3418,19 @@ msgstr "Nahrát Slot Stavu 8"
|
||||||
msgid "Load State..."
|
msgid "Load State..."
|
||||||
msgstr "Nahrát Stav..."
|
msgstr "Nahrát Stav..."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
msgid "Load Wii System Menu"
|
msgid "Load Wii System Menu"
|
||||||
msgstr "Nahrát Systémové Menu Wii"
|
msgstr "Nahrát Systémové Menu Wii"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
|
||||||
|
msgid "Load Wii System Menu"
|
||||||
|
msgstr "Nahrát Systémové Menu Wii"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Load Wii System Menu %d%c"
|
msgid "Load Wii System Menu %d%c"
|
||||||
msgstr "Nahrát Systémové Menu Wii %d%c"
|
msgstr "Nahrát Systémové Menu Wii %d%c"
|
||||||
|
|
@ -3373,7 +3512,11 @@ msgstr "MMU Hack Rychlosti"
|
||||||
msgid "MadCatz Gameshark files(*.gcs)"
|
msgid "MadCatz Gameshark files(*.gcs)"
|
||||||
msgstr "Soubory MadCatz Gameshark (*.gcs)"
|
msgstr "Soubory MadCatz Gameshark (*.gcs)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
||||||
msgid "Main Stick"
|
msgid "Main Stick"
|
||||||
msgstr "Hlavní Stick"
|
msgstr "Hlavní Stick"
|
||||||
|
|
@ -3404,7 +3547,11 @@ msgid "Memory Byte"
|
||||||
msgstr "Bajt Paměti"
|
msgstr "Bajt Paměti"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Memory Card"
|
msgid "Memory Card"
|
||||||
msgstr "Paměťová karta"
|
msgstr "Paměťová karta"
|
||||||
|
|
||||||
|
|
@ -3602,7 +3749,11 @@ msgstr "NK Tab"
|
||||||
msgid "NP Up"
|
msgid "NP Up"
|
||||||
msgstr "NK Nahoru"
|
msgstr "NK Nahoru"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
||||||
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
||||||
msgid "Name:"
|
msgid "Name:"
|
||||||
|
|
@ -3689,7 +3840,11 @@ msgstr "Nerovná se"
|
||||||
msgid "Not Set"
|
msgid "Not Set"
|
||||||
msgstr "Nenastaven"
|
msgstr "Nenastaven"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Not connected"
|
msgid "Not connected"
|
||||||
msgstr "Nepřipojen"
|
msgstr "Nepřipojen"
|
||||||
|
|
||||||
|
|
@ -3750,7 +3905,10 @@ msgstr "Pouze bloky %d jsou dostupné"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Open"
|
msgid "Open"
|
||||||
msgstr "Otevřít"
|
msgstr "Otevřít"
|
||||||
|
|
||||||
|
|
@ -3880,8 +4038,13 @@ msgstr "Záplaty"
|
||||||
msgid "Paths"
|
msgid "Paths"
|
||||||
msgstr "Cesty"
|
msgstr "Cesty"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
||||||
msgid "Pause"
|
msgid "Pause"
|
||||||
msgstr "Pozastavit"
|
msgstr "Pozastavit"
|
||||||
|
|
@ -3901,8 +4064,13 @@ msgstr "Perspektiva %d"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Play"
|
msgid "Play"
|
||||||
msgstr "Spustit"
|
msgstr "Spustit"
|
||||||
|
|
||||||
|
|
@ -3928,7 +4096,11 @@ msgstr "Možnosti Přehrávání"
|
||||||
msgid "Players"
|
msgid "Players"
|
||||||
msgstr "Hráči"
|
msgstr "Hráči"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Please confirm..."
|
msgid "Please confirm..."
|
||||||
msgstr "Prosím potvrďte..."
|
msgstr "Prosím potvrďte..."
|
||||||
|
|
||||||
|
|
@ -4139,10 +4311,17 @@ msgstr "Obnovit Seznam"
|
||||||
msgid "Refresh game list"
|
msgid "Refresh game list"
|
||||||
msgstr "Obnovit seznam her"
|
msgstr "Obnovit seznam her"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434
|
||||||
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Remove"
|
msgid "Remove"
|
||||||
msgstr "Odstranit"
|
msgstr "Odstranit"
|
||||||
|
|
||||||
|
|
@ -4161,7 +4340,10 @@ msgid "Render to Main Window"
|
||||||
msgstr "Vykreslit do Hlavního okna"
|
msgstr "Vykreslit do Hlavního okna"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
||||||
msgid "Reset"
|
msgid "Reset"
|
||||||
msgstr "Resetovat"
|
msgstr "Resetovat"
|
||||||
|
|
@ -4204,7 +4386,11 @@ msgstr "Uložit Sta&v"
|
||||||
msgid "Safe"
|
msgid "Safe"
|
||||||
msgstr "Bezpečná"
|
msgstr "Bezpečná"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Sample Rate:"
|
msgid "Sample Rate:"
|
||||||
msgstr "Vzorkovací frekvence:"
|
msgstr "Vzorkovací frekvence:"
|
||||||
|
|
||||||
|
|
@ -4288,7 +4474,11 @@ msgstr "Uložený stav filmu %s je poškozen, nahrávání filmu je zastaveno...
|
||||||
msgid "Scaled EFB Copy"
|
msgid "Scaled EFB Copy"
|
||||||
msgstr "EFB Kopie Změněné Velikosti"
|
msgstr "EFB Kopie Změněné Velikosti"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Scanning %s"
|
msgid "Scanning %s"
|
||||||
msgstr "Skenuji %s"
|
msgstr "Skenuji %s"
|
||||||
|
|
@ -4328,12 +4518,21 @@ msgstr "Sekce %s nebyla v SYSCONF nalezena"
|
||||||
msgid "Select"
|
msgid "Select"
|
||||||
msgstr "Vybrat"
|
msgstr "Vybrat"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
||||||
msgid "Select The Recording File"
|
msgid "Select The Recording File"
|
||||||
msgstr "Vyberte Soubor s Nahrávkou"
|
msgstr "Vyberte Soubor s Nahrávkou"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:740
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142
|
||||||
|
msgid "Select The Recording File"
|
||||||
|
msgstr "Vyberte Soubor s Nahrávkou"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Select a Wii WAD file to install"
|
msgid "Select a Wii WAD file to install"
|
||||||
msgstr "Vyberte soubor Wii WAD k instalování"
|
msgstr "Vyberte soubor Wii WAD k instalování"
|
||||||
|
|
||||||
|
|
@ -4359,6 +4558,7 @@ msgstr "Vybrat plovoucí okna"
|
||||||
msgid "Select the file to load"
|
msgid "Select the file to load"
|
||||||
msgstr "Vyberte soubor k nahrání"
|
msgstr "Vyberte soubor k nahrání"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
msgstr "Vyberte soubor s uloženou hrou"
|
msgstr "Vyberte soubor s uloženou hrou"
|
||||||
|
|
@ -4368,6 +4568,17 @@ msgid "Select the state to load"
|
||||||
msgstr "Vyberte stav k nahrání"
|
msgstr "Vyberte stav k nahrání"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
||||||
|
msgid "Select the save file"
|
||||||
|
msgstr "Vyberte soubor s uloženou hrou"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457
|
||||||
|
msgid "Select the state to load"
|
||||||
|
msgstr "Vyberte stav k nahrání"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Select the state to save"
|
msgid "Select the state to save"
|
||||||
msgstr "Vyberte stav k uložení"
|
msgstr "Vyberte stav k uložení"
|
||||||
|
|
||||||
|
|
@ -4746,9 +4957,15 @@ msgstr "Vytvoření vyrovnávací paměti zvuku selhalo: %s"
|
||||||
msgid "Space"
|
msgid "Space"
|
||||||
msgstr "Mezerník"
|
msgstr "Mezerník"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Spanish"
|
msgid "Spanish"
|
||||||
msgstr "Španělština"
|
msgstr "Španělština"
|
||||||
|
|
||||||
|
|
@ -4792,7 +5009,11 @@ msgstr "Čtvercový Stick"
|
||||||
msgid "Standard Controller"
|
msgid "Standard Controller"
|
||||||
msgstr "Standardní Ovladač"
|
msgstr "Standardní Ovladač"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
||||||
msgid "Start"
|
msgid "Start"
|
||||||
|
|
@ -4827,7 +5048,10 @@ msgstr "Stick"
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
||||||
msgid "Stop"
|
msgid "Stop"
|
||||||
msgstr "Zastavit"
|
msgstr "Zastavit"
|
||||||
|
|
@ -4904,7 +5128,10 @@ msgstr "Deska vpravo"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Take Screenshot"
|
msgid "Take Screenshot"
|
||||||
msgstr "Vytvořit Snímek Obrazovky"
|
msgstr "Vytvořit Snímek Obrazovky"
|
||||||
|
|
||||||
|
|
@ -5148,12 +5375,19 @@ msgstr "Zapnout Všechny Typy Záznamů"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Toggle Fullscreen"
|
msgid "Toggle Fullscreen"
|
||||||
msgstr "Přepnout na Celou Obrazovku"
|
msgstr "Přepnout na Celou Obrazovku"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Top"
|
msgid "Top"
|
||||||
msgstr "Nahoře"
|
msgstr "Nahoře"
|
||||||
|
|
||||||
|
|
@ -5262,6 +5496,18 @@ msgstr "Přijata neznámá zpráva s id : %d"
|
||||||
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
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!"
|
msgstr "Neznámá zpráva s id:%d přijata od hráče:%d Vyhazuji hráče!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
||||||
|
#, c-format
|
||||||
|
msgid ""
|
||||||
|
"Unknown pointer %#08x\n"
|
||||||
|
"Continue?"
|
||||||
|
msgstr ""
|
||||||
|
"Neznámý ukazatel %#08x\n"
|
||||||
|
"Pokračovat?"
|
||||||
|
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
||||||
msgid "Up"
|
msgid "Up"
|
||||||
|
|
@ -5484,7 +5730,11 @@ msgstr "Wii Kořen NAND:"
|
||||||
msgid "Wii Save Import"
|
msgid "Wii Save Import"
|
||||||
msgstr "Import uložených pozic Wii"
|
msgstr "Import uložených pozic Wii"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wii save files (*.bin)|*.bin"
|
msgid "Wii save files (*.bin)|*.bin"
|
||||||
msgstr "Wii soubory s uložením (*.bin)|*.bin"
|
msgstr "Wii soubory s uložením (*.bin)|*.bin"
|
||||||
|
|
||||||
|
|
@ -5515,7 +5765,11 @@ msgstr ""
|
||||||
"nebo je to vypršení limitu neaktivity, nebo z jiného důvodu.\n"
|
"nebo je to vypršení limitu neaktivity, nebo z jiného důvodu.\n"
|
||||||
"Chcete ho hned znovu připojit?"
|
"Chcete ho hned znovu připojit?"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wiimote Connected"
|
msgid "Wiimote Connected"
|
||||||
msgstr "Wiimote Připojen"
|
msgstr "Wiimote Připojen"
|
||||||
|
|
||||||
|
|
@ -5547,9 +5801,15 @@ msgstr "Klávesa Windows Vpravo"
|
||||||
msgid "Word Wrap"
|
msgid "Word Wrap"
|
||||||
msgstr "Zalamování textu"
|
msgstr "Zalamování textu"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Working..."
|
msgid "Working..."
|
||||||
msgstr "Pracuji..."
|
msgstr "Pracuji..."
|
||||||
|
|
||||||
|
|
@ -6163,6 +6423,7 @@ msgstr "| NEBO"
|
||||||
#~ msgid "Start the rendering window in fullscreen mode."
|
#~ msgid "Start the rendering window in fullscreen mode."
|
||||||
#~ msgstr "Spustí vykreslovací okno v režimu celé obrazovky."
|
#~ msgstr "Spustí vykreslovací okno v režimu celé obrazovky."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#~ msgid ""
|
#~ msgid ""
|
||||||
#~ "Unknown pointer %#08x\n"
|
#~ "Unknown pointer %#08x\n"
|
||||||
#~ "Continue?"
|
#~ "Continue?"
|
||||||
|
|
@ -6170,6 +6431,8 @@ msgstr "| NEBO"
|
||||||
#~ "Neznámý ukazatel %#08x\n"
|
#~ "Neznámý ukazatel %#08x\n"
|
||||||
#~ "Pokračovat?"
|
#~ "Pokračovat?"
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#~ msgid "Use FPS For Limiting"
|
#~ msgid "Use FPS For Limiting"
|
||||||
#~ msgstr "Použít SzS pro Omezení"
|
#~ msgstr "Použít SzS pro Omezení"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,11 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: Dolphin Emu\n"
|
"Project-Id-Version: Dolphin Emu\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
|
=======
|
||||||
|
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
"PO-Revision-Date: 2011-02-17 01:23+0100\n"
|
"PO-Revision-Date: 2011-02-17 01:23+0100\n"
|
||||||
"Last-Translator: LucasX <lucasx790@gmail.com>\n"
|
"Last-Translator: LucasX <lucasx790@gmail.com>\n"
|
||||||
"Language-Team: \n"
|
"Language-Team: \n"
|
||||||
|
|
@ -551,9 +555,15 @@ msgstr "Patch hinzufügen"
|
||||||
msgid "Add new pane"
|
msgid "Add new pane"
|
||||||
msgstr "Neue Palette hinzufügen"
|
msgstr "Neue Palette hinzufügen"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Add..."
|
msgid "Add..."
|
||||||
msgstr "Hinzufügen..."
|
msgstr "Hinzufügen..."
|
||||||
|
|
||||||
|
|
@ -622,8 +632,13 @@ msgstr "Alle GC/Wii Images (gcm, iso, ciso, gcz)"
|
||||||
msgid "All Gamecube GCM files (gcm)"
|
msgid "All Gamecube GCM files (gcm)"
|
||||||
msgstr "Alle Gamecube GCM Dateien (gcm)"
|
msgstr "Alle Gamecube GCM Dateien (gcm)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "All Save States (sav, s##)"
|
msgid "All Save States (sav, s##)"
|
||||||
msgstr "Alle Speicherstände (sav, s##)"
|
msgstr "Alle Speicherstände (sav, s##)"
|
||||||
|
|
||||||
|
|
@ -706,7 +721,11 @@ msgid "Are you sure you want to delete this file? It will be gone forever!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Soll die Datei gelöscht werden? Löschen kann nicht Rückgängig gemacht werden."
|
"Soll die Datei gelöscht werden? Löschen kann nicht Rückgängig gemacht werden."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
||||||
msgid "Aspect Ratio:"
|
msgid "Aspect Ratio:"
|
||||||
msgstr "Seitenverhältnis:"
|
msgstr "Seitenverhältnis:"
|
||||||
|
|
@ -727,7 +746,11 @@ msgstr "Audio Backend:"
|
||||||
msgid "AudioCommon: Error opening AO device.\n"
|
msgid "AudioCommon: Error opening AO device.\n"
|
||||||
msgstr "AudioCommon: Fehler beim öffnen des AO-Gerätes.\n"
|
msgstr "AudioCommon: Fehler beim öffnen des AO-Gerätes.\n"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
||||||
msgid "Auto"
|
msgid "Auto"
|
||||||
msgstr "Automatisch"
|
msgstr "Automatisch"
|
||||||
|
|
@ -841,7 +864,11 @@ msgid "Blue Right"
|
||||||
msgstr "Blau rechts"
|
msgstr "Blau rechts"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Bottom"
|
msgid "Bottom"
|
||||||
msgstr "Unten"
|
msgstr "Unten"
|
||||||
|
|
||||||
|
|
@ -874,7 +901,11 @@ msgstr "Ausgabeverzeichnis auswählen"
|
||||||
msgid "Buffer:"
|
msgid "Buffer:"
|
||||||
msgstr "Buffer:"
|
msgstr "Buffer:"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
||||||
msgid "Buttons"
|
msgid "Buttons"
|
||||||
|
|
@ -1113,7 +1144,11 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
||||||
msgid "Close"
|
msgid "Close"
|
||||||
msgstr "Schließen"
|
msgstr "Schließen"
|
||||||
|
|
@ -1223,7 +1258,11 @@ msgstr "Wiimote 3 verbinden"
|
||||||
msgid "Connect Wiimote 4"
|
msgid "Connect Wiimote 4"
|
||||||
msgstr "Wiimote 4 verbinden"
|
msgstr "Wiimote 4 verbinden"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Connecting..."
|
msgid "Connecting..."
|
||||||
msgstr "Verbinden..."
|
msgstr "Verbinden..."
|
||||||
|
|
||||||
|
|
@ -1415,7 +1454,11 @@ msgid "DSP Emulator Engine"
|
||||||
msgstr "DSP Emulator Engine"
|
msgstr "DSP Emulator Engine"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "DSP HLE emulation (fast)"
|
msgid "DSP HLE emulation (fast)"
|
||||||
msgstr "DSP HLE Emulation (schnell)"
|
msgstr "DSP HLE Emulation (schnell)"
|
||||||
|
|
||||||
|
|
@ -1632,7 +1675,11 @@ msgstr ""
|
||||||
msgid "Divide"
|
msgid "Divide"
|
||||||
msgstr "Dividieren"
|
msgstr "Dividieren"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Do you want to stop the current emulation?"
|
msgid "Do you want to stop the current emulation?"
|
||||||
msgstr "Laufende Emulation stoppen?"
|
msgstr "Laufende Emulation stoppen?"
|
||||||
|
|
||||||
|
|
@ -1662,12 +1709,21 @@ msgstr "Dolphin Emulierte-Wiimote Einstellungen"
|
||||||
msgid "Dolphin FIFO"
|
msgid "Dolphin FIFO"
|
||||||
msgstr "Dolphin"
|
msgstr "Dolphin"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
msgid "Dolphin GCPad Configuration"
|
msgid "Dolphin GCPad Configuration"
|
||||||
msgstr "Dolphin GCPad Konfiguration"
|
msgstr "Dolphin GCPad Konfiguration"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204
|
||||||
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
msgstr "Dolphin GCPad Konfiguration"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Dolphin TAS Movies (*.dtm)"
|
msgid "Dolphin TAS Movies (*.dtm)"
|
||||||
msgstr "Dolphin TAS Filme (*.dtm)"
|
msgstr "Dolphin TAS Filme (*.dtm)"
|
||||||
|
|
||||||
|
|
@ -1755,9 +1811,15 @@ msgid ""
|
||||||
"If unsure, leave this unchecked."
|
"If unsure, leave this unchecked."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Dutch"
|
msgid "Dutch"
|
||||||
msgstr "Holländisch"
|
msgstr "Holländisch"
|
||||||
|
|
||||||
|
|
@ -1885,16 +1947,23 @@ msgstr "BAT aktivieren"
|
||||||
msgid "Enable Block Merging"
|
msgid "Enable Block Merging"
|
||||||
msgstr "Blockvereinigung aktivieren"
|
msgstr "Blockvereinigung aktivieren"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
||||||
msgid "Enable Bounding Box Calculation"
|
msgid "Enable Bounding Box Calculation"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Enable Cache"
|
msgid "Enable Cache"
|
||||||
msgstr "Cache verwenden"
|
msgstr "Cache verwenden"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Enable Cheats"
|
msgid "Enable Cheats"
|
||||||
msgstr "Cheats aktivieren"
|
msgstr "Cheats aktivieren"
|
||||||
|
|
||||||
|
|
@ -2033,9 +2102,15 @@ msgstr ""
|
||||||
msgid "End"
|
msgid "End"
|
||||||
msgstr "Ende"
|
msgstr "Ende"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "English"
|
msgid "English"
|
||||||
msgstr "Englisch"
|
msgstr "Englisch"
|
||||||
|
|
||||||
|
|
@ -2064,6 +2139,7 @@ msgstr "Gleich"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
msgid "Error"
|
msgid "Error"
|
||||||
msgstr "Fehler"
|
msgstr "Fehler"
|
||||||
|
|
@ -2075,6 +2151,12 @@ msgid ""
|
||||||
"Sorry, Wii recording is temporarily broken."
|
"Sorry, Wii recording is temporarily broken."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169
|
||||||
|
msgid "Error"
|
||||||
|
msgstr "Fehler"
|
||||||
|
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
||||||
msgid "Error loading selected language. Falling back to system default."
|
msgid "Error loading selected language. Falling back to system default."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2535,9 +2617,15 @@ msgstr ""
|
||||||
msgid "Free Look"
|
msgid "Free Look"
|
||||||
msgstr "Frei Umsehen"
|
msgstr "Frei Umsehen"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "French"
|
msgid "French"
|
||||||
msgstr "Französisch"
|
msgstr "Französisch"
|
||||||
|
|
||||||
|
|
@ -2606,7 +2694,11 @@ msgid "Gamecube &Pad Settings"
|
||||||
msgstr "Gamecube-&Pad Einstellungen"
|
msgstr "Gamecube-&Pad Einstellungen"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
||||||
msgstr "Gamecube Memory Cards (*.raw,*.gcp)"
|
msgstr "Gamecube Memory Cards (*.raw,*.gcp)"
|
||||||
|
|
||||||
|
|
@ -2630,8 +2722,12 @@ msgstr ""
|
||||||
"unterstützt.)"
|
"unterstützt.)"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
||||||
msgid "General"
|
msgid "General"
|
||||||
msgstr "Allgemein"
|
msgstr "Allgemein"
|
||||||
|
|
@ -2641,9 +2737,15 @@ msgstr "Allgemein"
|
||||||
msgid "General Settings"
|
msgid "General Settings"
|
||||||
msgstr "Interface Einstellungen"
|
msgstr "Interface Einstellungen"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "German"
|
msgid "German"
|
||||||
msgstr "Deutsch"
|
msgstr "Deutsch"
|
||||||
|
|
||||||
|
|
@ -2768,8 +2870,12 @@ msgid "Hotkey Configuration"
|
||||||
msgstr "Tastenkürzel Einstellungen"
|
msgstr "Tastenkürzel Einstellungen"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Hotkeys"
|
msgid "Hotkeys"
|
||||||
msgstr "Tastenkürzel"
|
msgstr "Tastenkürzel"
|
||||||
|
|
||||||
|
|
@ -2984,7 +3090,11 @@ msgstr ""
|
||||||
"InstallExceptionHandler aufgerufen, aber diese Platform unterstüzt diesn "
|
"InstallExceptionHandler aufgerufen, aber diese Platform unterstüzt diesn "
|
||||||
"noch nicht."
|
"noch nicht."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Installing WAD..."
|
msgid "Installing WAD..."
|
||||||
msgstr "WAD ins Wii-Menü installieren..."
|
msgstr "WAD ins Wii-Menü installieren..."
|
||||||
|
|
@ -3070,9 +3180,15 @@ msgstr "Ungültige Aufnahmedatei"
|
||||||
msgid "Invalid state"
|
msgid "Invalid state"
|
||||||
msgstr "Ungültiger Status"
|
msgstr "Ungültiger Status"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Italian"
|
msgid "Italian"
|
||||||
msgstr "Italienisch"
|
msgstr "Italienisch"
|
||||||
|
|
||||||
|
|
@ -3231,12 +3347,20 @@ msgstr "Status aus Slot 8 laden"
|
||||||
msgid "Load State..."
|
msgid "Load State..."
|
||||||
msgstr "Status laden..."
|
msgstr "Status laden..."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Load Wii System Menu"
|
msgid "Load Wii System Menu"
|
||||||
msgstr "Wii-Menü laden (%d %c)"
|
msgstr "Wii-Menü laden (%d %c)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, fuzzy, c-format
|
#, fuzzy, c-format
|
||||||
msgid "Load Wii System Menu %d%c"
|
msgid "Load Wii System Menu %d%c"
|
||||||
msgstr "Wii-Menü laden (%d %c)"
|
msgstr "Wii-Menü laden (%d %c)"
|
||||||
|
|
@ -3321,7 +3445,11 @@ msgstr "MMU Speed Hack"
|
||||||
msgid "MadCatz Gameshark files(*.gcs)"
|
msgid "MadCatz Gameshark files(*.gcs)"
|
||||||
msgstr "MadCatz Gameshark Dateien(*.gcs)"
|
msgstr "MadCatz Gameshark Dateien(*.gcs)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
||||||
msgid "Main Stick"
|
msgid "Main Stick"
|
||||||
msgstr "Main Stick"
|
msgstr "Main Stick"
|
||||||
|
|
@ -3353,7 +3481,11 @@ msgid "Memory Byte"
|
||||||
msgstr "Speicher"
|
msgstr "Speicher"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Memory Card"
|
msgid "Memory Card"
|
||||||
msgstr "Memory Card"
|
msgstr "Memory Card"
|
||||||
|
|
||||||
|
|
@ -3540,7 +3672,11 @@ msgstr "NP Tab"
|
||||||
msgid "NP Up"
|
msgid "NP Up"
|
||||||
msgstr "NP Hoch"
|
msgstr "NP Hoch"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
||||||
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
||||||
msgid "Name:"
|
msgid "Name:"
|
||||||
|
|
@ -3628,7 +3764,11 @@ msgstr "Ungleich"
|
||||||
msgid "Not Set"
|
msgid "Not Set"
|
||||||
msgstr "Nicht Festgelegt"
|
msgstr "Nicht Festgelegt"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Not connected"
|
msgid "Not connected"
|
||||||
msgstr "Nicht Verbunden"
|
msgstr "Nicht Verbunden"
|
||||||
|
|
||||||
|
|
@ -3689,7 +3829,10 @@ msgstr "Nur %d Blöcke verfügbar"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Open"
|
msgid "Open"
|
||||||
msgstr "Öffnen"
|
msgstr "Öffnen"
|
||||||
|
|
||||||
|
|
@ -3821,8 +3964,13 @@ msgstr "Patches"
|
||||||
msgid "Paths"
|
msgid "Paths"
|
||||||
msgstr "Pfade"
|
msgstr "Pfade"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
||||||
msgid "Pause"
|
msgid "Pause"
|
||||||
msgstr "Pause"
|
msgstr "Pause"
|
||||||
|
|
@ -3843,8 +3991,13 @@ msgstr "Perspektive %d"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Play"
|
msgid "Play"
|
||||||
msgstr "Start"
|
msgstr "Start"
|
||||||
|
|
||||||
|
|
@ -3871,7 +4024,11 @@ msgstr "Optionen"
|
||||||
msgid "Players"
|
msgid "Players"
|
||||||
msgstr "Spieler"
|
msgstr "Spieler"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Please confirm..."
|
msgid "Please confirm..."
|
||||||
msgstr "Bitte Bestätigen..."
|
msgstr "Bitte Bestätigen..."
|
||||||
|
|
||||||
|
|
@ -4087,10 +4244,17 @@ msgstr "Liste aktualisieren"
|
||||||
msgid "Refresh game list"
|
msgid "Refresh game list"
|
||||||
msgstr "Spieleliste aktualisieren"
|
msgstr "Spieleliste aktualisieren"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434
|
||||||
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Remove"
|
msgid "Remove"
|
||||||
msgstr "Entfernen"
|
msgstr "Entfernen"
|
||||||
|
|
||||||
|
|
@ -4109,7 +4273,10 @@ msgid "Render to Main Window"
|
||||||
msgstr "Im Hauptfenster Rendern"
|
msgstr "Im Hauptfenster Rendern"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
||||||
msgid "Reset"
|
msgid "Reset"
|
||||||
msgstr "Zurücksetzen"
|
msgstr "Zurücksetzen"
|
||||||
|
|
@ -4152,7 +4319,11 @@ msgstr "S&tatus speichern"
|
||||||
msgid "Safe"
|
msgid "Safe"
|
||||||
msgstr "Sicher"
|
msgstr "Sicher"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Sample Rate:"
|
msgid "Sample Rate:"
|
||||||
msgstr "Abtastrate:"
|
msgstr "Abtastrate:"
|
||||||
|
|
||||||
|
|
@ -4237,7 +4408,11 @@ msgstr "Film-Status %s ist fehlerhaft, breche die Filmaufnahme ab..."
|
||||||
msgid "Scaled EFB Copy"
|
msgid "Scaled EFB Copy"
|
||||||
msgstr "EFB Scaled Copy"
|
msgstr "EFB Scaled Copy"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, fuzzy, c-format
|
#, fuzzy, c-format
|
||||||
msgid "Scanning %s"
|
msgid "Scanning %s"
|
||||||
msgstr "Suche..."
|
msgstr "Suche..."
|
||||||
|
|
@ -4277,12 +4452,21 @@ msgstr "Ausgewähltes %s nicht gefunden in SYSCONF"
|
||||||
msgid "Select"
|
msgid "Select"
|
||||||
msgstr "Auswählen"
|
msgstr "Auswählen"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
||||||
msgid "Select The Recording File"
|
msgid "Select The Recording File"
|
||||||
msgstr "Aufnahmedatei auswählen"
|
msgstr "Aufnahmedatei auswählen"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:740
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142
|
||||||
|
msgid "Select The Recording File"
|
||||||
|
msgstr "Aufnahmedatei auswählen"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Select a Wii WAD file to install"
|
msgid "Select a Wii WAD file to install"
|
||||||
msgstr "Speicherdatei zum Importieren auswählen"
|
msgstr "Speicherdatei zum Importieren auswählen"
|
||||||
|
|
@ -4309,6 +4493,7 @@ msgstr "Wähle unverankerte Fenster"
|
||||||
msgid "Select the file to load"
|
msgid "Select the file to load"
|
||||||
msgstr "Datei zum Laden auswählen"
|
msgstr "Datei zum Laden auswählen"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
msgstr "Wii-Spielstand auswählen"
|
msgstr "Wii-Spielstand auswählen"
|
||||||
|
|
@ -4318,6 +4503,17 @@ msgid "Select the state to load"
|
||||||
msgstr "Status zum Laden auswählen"
|
msgstr "Status zum Laden auswählen"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
||||||
|
msgid "Select the save file"
|
||||||
|
msgstr "Wii-Spielstand auswählen"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457
|
||||||
|
msgid "Select the state to load"
|
||||||
|
msgstr "Status zum Laden auswählen"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Select the state to save"
|
msgid "Select the state to save"
|
||||||
msgstr "Status zum Speichern auswählen"
|
msgstr "Status zum Speichern auswählen"
|
||||||
|
|
||||||
|
|
@ -4673,9 +4869,15 @@ msgstr "Erstellen des Sound-Buffer fehlgeschlagen: %s"
|
||||||
msgid "Space"
|
msgid "Space"
|
||||||
msgstr "Leertaste"
|
msgstr "Leertaste"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Spanish"
|
msgid "Spanish"
|
||||||
msgstr "Spanisch"
|
msgstr "Spanisch"
|
||||||
|
|
||||||
|
|
@ -4711,7 +4913,11 @@ msgstr ""
|
||||||
msgid "Standard Controller"
|
msgid "Standard Controller"
|
||||||
msgstr "Standard-Controller"
|
msgstr "Standard-Controller"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
||||||
msgid "Start"
|
msgid "Start"
|
||||||
|
|
@ -4746,7 +4952,10 @@ msgstr "Stick"
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
||||||
msgid "Stop"
|
msgid "Stop"
|
||||||
msgstr "Stopp"
|
msgstr "Stopp"
|
||||||
|
|
@ -4819,7 +5028,10 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Take Screenshot"
|
msgid "Take Screenshot"
|
||||||
msgstr "Screenshot erstellen"
|
msgstr "Screenshot erstellen"
|
||||||
|
|
||||||
|
|
@ -5065,12 +5277,19 @@ msgstr "Alle umschalten"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Toggle Fullscreen"
|
msgid "Toggle Fullscreen"
|
||||||
msgstr "Vollbildmodus wechseln"
|
msgstr "Vollbildmodus wechseln"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Top"
|
msgid "Top"
|
||||||
msgstr "Oben"
|
msgstr "Oben"
|
||||||
|
|
||||||
|
|
@ -5175,6 +5394,18 @@ msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Unbekannte Meldung mit ID %d erhalten von Spieler %d, Spieler herausgeworfen!"
|
"Unbekannte Meldung mit ID %d erhalten von Spieler %d, Spieler herausgeworfen!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
||||||
|
#, c-format
|
||||||
|
msgid ""
|
||||||
|
"Unknown pointer %#08x\n"
|
||||||
|
"Continue?"
|
||||||
|
msgstr ""
|
||||||
|
"Unbekanter Pointer %#08x\n"
|
||||||
|
"Fortfahren?"
|
||||||
|
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
||||||
msgid "Up"
|
msgid "Up"
|
||||||
|
|
@ -5385,7 +5616,11 @@ msgstr "DVD Laufwerk:"
|
||||||
msgid "Wii Save Import"
|
msgid "Wii Save Import"
|
||||||
msgstr "Wii Spielstand importieren"
|
msgstr "Wii Spielstand importieren"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wii save files (*.bin)|*.bin"
|
msgid "Wii save files (*.bin)|*.bin"
|
||||||
msgstr "Wii Speicherdateien (*.bin)|*.bin"
|
msgstr "Wii Speicherdateien (*.bin)|*.bin"
|
||||||
|
|
||||||
|
|
@ -5416,7 +5651,11 @@ msgstr ""
|
||||||
"oder die Wiimote war zulange inaktiv oder andere Ursachen.\n"
|
"oder die Wiimote war zulange inaktiv oder andere Ursachen.\n"
|
||||||
"Soll die Wiimote jetzt wieder verbunden werden?"
|
"Soll die Wiimote jetzt wieder verbunden werden?"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wiimote Connected"
|
msgid "Wiimote Connected"
|
||||||
msgstr "Wiimote Verbunden"
|
msgstr "Wiimote Verbunden"
|
||||||
|
|
||||||
|
|
@ -5449,9 +5688,15 @@ msgstr "Windows Rechts"
|
||||||
msgid "Word Wrap"
|
msgid "Word Wrap"
|
||||||
msgstr "Zeilenumbruch"
|
msgstr "Zeilenumbruch"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Working..."
|
msgid "Working..."
|
||||||
msgstr "Arbeite..."
|
msgstr "Arbeite..."
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,11 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: Dolphin Emu\n"
|
"Project-Id-Version: Dolphin Emu\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
|
=======
|
||||||
|
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||||
|
|
@ -506,9 +510,15 @@ msgstr ""
|
||||||
msgid "Add new pane"
|
msgid "Add new pane"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Add..."
|
msgid "Add..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -562,8 +572,13 @@ msgstr ""
|
||||||
msgid "All Gamecube GCM files (gcm)"
|
msgid "All Gamecube GCM files (gcm)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "All Save States (sav, s##)"
|
msgid "All Save States (sav, s##)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -641,7 +656,11 @@ msgstr ""
|
||||||
msgid "Are you sure you want to delete this file? It will be gone forever!"
|
msgid "Are you sure you want to delete this file? It will be gone forever!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
||||||
msgid "Aspect Ratio:"
|
msgid "Aspect Ratio:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -662,7 +681,11 @@ msgstr ""
|
||||||
msgid "AudioCommon: Error opening AO device.\n"
|
msgid "AudioCommon: Error opening AO device.\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
||||||
msgid "Auto"
|
msgid "Auto"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -770,7 +793,11 @@ msgid "Blue Right"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Bottom"
|
msgid "Bottom"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -803,7 +830,11 @@ msgstr ""
|
||||||
msgid "Buffer:"
|
msgid "Buffer:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
||||||
msgid "Buttons"
|
msgid "Buttons"
|
||||||
|
|
@ -1025,7 +1056,11 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
||||||
msgid "Close"
|
msgid "Close"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -1134,7 +1169,11 @@ msgstr ""
|
||||||
msgid "Connect Wiimote 4"
|
msgid "Connect Wiimote 4"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Connecting..."
|
msgid "Connecting..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1309,7 +1348,11 @@ msgid "DSP Emulator Engine"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "DSP HLE emulation (fast)"
|
msgid "DSP HLE emulation (fast)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1519,7 +1562,11 @@ msgstr ""
|
||||||
msgid "Divide"
|
msgid "Divide"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Do you want to stop the current emulation?"
|
msgid "Do you want to stop the current emulation?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1548,12 +1595,21 @@ msgstr ""
|
||||||
msgid "Dolphin FIFO"
|
msgid "Dolphin FIFO"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
msgid "Dolphin GCPad Configuration"
|
msgid "Dolphin GCPad Configuration"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204
|
||||||
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Dolphin TAS Movies (*.dtm)"
|
msgid "Dolphin TAS Movies (*.dtm)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1636,9 +1692,15 @@ msgid ""
|
||||||
"If unsure, leave this unchecked."
|
"If unsure, leave this unchecked."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Dutch"
|
msgid "Dutch"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1761,15 +1823,22 @@ msgstr ""
|
||||||
msgid "Enable Block Merging"
|
msgid "Enable Block Merging"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
||||||
msgid "Enable Bounding Box Calculation"
|
msgid "Enable Bounding Box Calculation"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
||||||
msgid "Enable Cache"
|
msgid "Enable Cache"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Enable Cheats"
|
msgid "Enable Cheats"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1895,9 +1964,15 @@ msgstr ""
|
||||||
msgid "End"
|
msgid "End"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "English"
|
msgid "English"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1926,6 +2001,7 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
msgid "Error"
|
msgid "Error"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -1937,6 +2013,12 @@ msgid ""
|
||||||
"Sorry, Wii recording is temporarily broken."
|
"Sorry, Wii recording is temporarily broken."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169
|
||||||
|
msgid "Error"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
||||||
msgid "Error loading selected language. Falling back to system default."
|
msgid "Error loading selected language. Falling back to system default."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2351,9 +2433,15 @@ msgstr ""
|
||||||
msgid "Free Look"
|
msgid "Free Look"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "French"
|
msgid "French"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2419,7 +2507,11 @@ msgid "Gamecube &Pad Settings"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2440,8 +2532,12 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
||||||
msgid "General"
|
msgid "General"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2450,9 +2546,15 @@ msgstr ""
|
||||||
msgid "General Settings"
|
msgid "General Settings"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "German"
|
msgid "German"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2567,8 +2669,12 @@ msgid "Hotkey Configuration"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Hotkeys"
|
msgid "Hotkeys"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2758,7 +2864,11 @@ msgid ""
|
||||||
"InstallExceptionHandler called, but this platform does not yet support it."
|
"InstallExceptionHandler called, but this platform does not yet support it."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Installing WAD..."
|
msgid "Installing WAD..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2835,9 +2945,15 @@ msgstr ""
|
||||||
msgid "Invalid state"
|
msgid "Invalid state"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Italian"
|
msgid "Italian"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2988,11 +3104,19 @@ msgstr ""
|
||||||
msgid "Load State..."
|
msgid "Load State..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
msgid "Load Wii System Menu"
|
msgid "Load Wii System Menu"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
|
||||||
|
msgid "Load Wii System Menu"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Load Wii System Menu %d%c"
|
msgid "Load Wii System Menu %d%c"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3069,7 +3193,11 @@ msgstr ""
|
||||||
msgid "MadCatz Gameshark files(*.gcs)"
|
msgid "MadCatz Gameshark files(*.gcs)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
||||||
msgid "Main Stick"
|
msgid "Main Stick"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3100,7 +3228,11 @@ msgid "Memory Byte"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Memory Card"
|
msgid "Memory Card"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3277,7 +3409,11 @@ msgstr ""
|
||||||
msgid "NP Up"
|
msgid "NP Up"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
||||||
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
||||||
msgid "Name:"
|
msgid "Name:"
|
||||||
|
|
@ -3364,7 +3500,11 @@ msgstr ""
|
||||||
msgid "Not Set"
|
msgid "Not Set"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Not connected"
|
msgid "Not connected"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3425,7 +3565,10 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Open"
|
msgid "Open"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3551,8 +3694,13 @@ msgstr ""
|
||||||
msgid "Paths"
|
msgid "Paths"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
||||||
msgid "Pause"
|
msgid "Pause"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3572,8 +3720,13 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Play"
|
msgid "Play"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3599,7 +3752,11 @@ msgstr ""
|
||||||
msgid "Players"
|
msgid "Players"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Please confirm..."
|
msgid "Please confirm..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3805,10 +3962,17 @@ msgstr ""
|
||||||
msgid "Refresh game list"
|
msgid "Refresh game list"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434
|
||||||
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Remove"
|
msgid "Remove"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3824,7 +3988,10 @@ msgid "Render to Main Window"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
||||||
msgid "Reset"
|
msgid "Reset"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3867,7 +4034,11 @@ msgstr ""
|
||||||
msgid "Safe"
|
msgid "Safe"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Sample Rate:"
|
msgid "Sample Rate:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3951,7 +4122,11 @@ msgstr ""
|
||||||
msgid "Scaled EFB Copy"
|
msgid "Scaled EFB Copy"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Scanning %s"
|
msgid "Scanning %s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3991,12 +4166,21 @@ msgstr ""
|
||||||
msgid "Select"
|
msgid "Select"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
||||||
msgid "Select The Recording File"
|
msgid "Select The Recording File"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:740
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142
|
||||||
|
msgid "Select The Recording File"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Select a Wii WAD file to install"
|
msgid "Select a Wii WAD file to install"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -4019,6 +4203,7 @@ msgstr ""
|
||||||
msgid "Select the file to load"
|
msgid "Select the file to load"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -4028,6 +4213,17 @@ msgid "Select the state to load"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
||||||
|
msgid "Select the save file"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457
|
||||||
|
msgid "Select the state to load"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Select the state to save"
|
msgid "Select the state to save"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -4361,9 +4557,15 @@ msgstr ""
|
||||||
msgid "Space"
|
msgid "Space"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Spanish"
|
msgid "Spanish"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -4399,7 +4601,11 @@ msgstr ""
|
||||||
msgid "Standard Controller"
|
msgid "Standard Controller"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
||||||
msgid "Start"
|
msgid "Start"
|
||||||
|
|
@ -4434,7 +4640,10 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
||||||
msgid "Stop"
|
msgid "Stop"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -4506,7 +4715,10 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Take Screenshot"
|
msgid "Take Screenshot"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -4718,12 +4930,19 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Toggle Fullscreen"
|
msgid "Toggle Fullscreen"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Top"
|
msgid "Top"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -4825,6 +5044,16 @@ msgstr ""
|
||||||
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
||||||
|
#, c-format
|
||||||
|
msgid ""
|
||||||
|
"Unknown pointer %#08x\n"
|
||||||
|
"Continue?"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
||||||
msgid "Up"
|
msgid "Up"
|
||||||
|
|
@ -5026,7 +5255,11 @@ msgstr ""
|
||||||
msgid "Wii Save Import"
|
msgid "Wii Save Import"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wii save files (*.bin)|*.bin"
|
msgid "Wii save files (*.bin)|*.bin"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -5053,7 +5286,11 @@ msgid ""
|
||||||
"Do you want to reconnect immediately?"
|
"Do you want to reconnect immediately?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wiimote Connected"
|
msgid "Wiimote Connected"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -5085,9 +5322,15 @@ msgstr ""
|
||||||
msgid "Word Wrap"
|
msgid "Word Wrap"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Working..."
|
msgid "Working..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,8 +7,13 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: Dolphin Emu\n"
|
"Project-Id-Version: Dolphin Emu\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
"PO-Revision-Date: 2011-12-18 13:39-0600\n"
|
"PO-Revision-Date: 2011-12-18 13:39-0600\n"
|
||||||
|
=======
|
||||||
|
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
||||||
|
"PO-Revision-Date: 2011-09-13 17:28+0200\n"
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
"Last-Translator: Linktothepast <kostamarino@hotmail.com>\n"
|
"Last-Translator: Linktothepast <kostamarino@hotmail.com>\n"
|
||||||
"Language-Team: Gpower2 <gpower2@yahoo.com>\n"
|
"Language-Team: Gpower2 <gpower2@yahoo.com>\n"
|
||||||
"Language: Greek\n"
|
"Language: Greek\n"
|
||||||
|
|
@ -426,13 +431,21 @@ msgstr "Επιτάχυνση"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471
|
||||||
msgid "Accuracy:"
|
msgid "Accuracy:"
|
||||||
|
<<<<<<< HEAD
|
||||||
msgstr "Ακρίβεια:"
|
msgstr "Ακρίβεια:"
|
||||||
|
=======
|
||||||
|
msgstr ""
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314
|
||||||
msgid "Accurate VBeam emulation"
|
msgid "Accurate VBeam emulation"
|
||||||
msgstr "Ακριβής VBeam εξομοίωση"
|
msgstr "Ακριβής VBeam εξομοίωση"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
#, fuzzy
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Accurately emulate EFB copies.\n"
|
"Accurately emulate EFB copies.\n"
|
||||||
"Some games depend on this for certain graphical effects or gameplay "
|
"Some games depend on this for certain graphical effects or gameplay "
|
||||||
|
|
@ -560,9 +573,15 @@ msgstr "Προσθήκη Patch"
|
||||||
msgid "Add new pane"
|
msgid "Add new pane"
|
||||||
msgstr "Προσθήκη νέου pane"
|
msgstr "Προσθήκη νέου pane"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Add..."
|
msgid "Add..."
|
||||||
msgstr "Προσθήκη..."
|
msgstr "Προσθήκη..."
|
||||||
|
|
||||||
|
|
@ -618,8 +637,13 @@ msgstr "Όλες οι εικόνες GC/Wii (gcm, iso, ciso, gcz)"
|
||||||
msgid "All Gamecube GCM files (gcm)"
|
msgid "All Gamecube GCM files (gcm)"
|
||||||
msgstr "Όλα τα αρχεία Gamecube GCM (gcm)"
|
msgstr "Όλα τα αρχεία Gamecube GCM (gcm)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "All Save States (sav, s##)"
|
msgid "All Save States (sav, s##)"
|
||||||
msgstr "Όλα τα Σημεία Αποθήκευσης(sav, s##)"
|
msgstr "Όλα τα Σημεία Αποθήκευσης(sav, s##)"
|
||||||
|
|
||||||
|
|
@ -648,8 +672,14 @@ msgstr ""
|
||||||
"Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
|
"Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
|
||||||
|
<<<<<<< HEAD
|
||||||
msgid "Alternate Wiimote Timing"
|
msgid "Alternate Wiimote Timing"
|
||||||
msgstr "Εναλλακτικός Χρονισμός Wiimote"
|
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:372
|
||||||
msgid "Anisotropic Filtering:"
|
msgid "Anisotropic Filtering:"
|
||||||
|
|
@ -708,7 +738,11 @@ msgstr ""
|
||||||
"Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το αρχείο; Θα εξαφανιστεί για "
|
"Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το αρχείο; Θα εξαφανιστεί για "
|
||||||
"πάντα!"
|
"πάντα!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
||||||
msgid "Aspect Ratio:"
|
msgid "Aspect Ratio:"
|
||||||
msgstr "Αναλογία Οθόνης:"
|
msgstr "Αναλογία Οθόνης:"
|
||||||
|
|
@ -729,7 +763,11 @@ msgstr "Backend Ήχου:"
|
||||||
msgid "AudioCommon: Error opening AO device.\n"
|
msgid "AudioCommon: Error opening AO device.\n"
|
||||||
msgstr "AudioCommon: Σφάλμα ανοίγματος AO συσκευής.\n"
|
msgstr "AudioCommon: Σφάλμα ανοίγματος AO συσκευής.\n"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
||||||
msgid "Auto"
|
msgid "Auto"
|
||||||
msgstr "Αυτόματα"
|
msgstr "Αυτόματα"
|
||||||
|
|
@ -764,11 +802,14 @@ msgid ""
|
||||||
"\n"
|
"\n"
|
||||||
"If unsure, leave this checked."
|
"If unsure, leave this checked."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
<<<<<<< HEAD
|
||||||
"Δημιουργεί αυτόματα τα mipmaps αντί να τα αποκωδικοποιεί από την μνήμη.\n"
|
"Δημιουργεί αυτόματα τα mipmaps αντί να τα αποκωδικοποιεί από την μνήμη.\n"
|
||||||
"Αυξάνει λίγο τις επιδόσεις, αλλά μπορεί να προκαλέσει μικρά ελαττώματα στις "
|
"Αυξάνει λίγο τις επιδόσεις, αλλά μπορεί να προκαλέσει μικρά ελαττώματα στις "
|
||||||
"υφές.\n"
|
"υφές.\n"
|
||||||
"\n"
|
"\n"
|
||||||
"Αν δεν είστε σίγουροι, αφήστε το επιλεγμένο."
|
"Αν δεν είστε σίγουροι, αφήστε το επιλεγμένο."
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:27
|
||||||
msgid "Back"
|
msgid "Back"
|
||||||
|
|
@ -846,7 +887,11 @@ msgid "Blue Right"
|
||||||
msgstr "Δεξί Μπλε"
|
msgstr "Δεξί Μπλε"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Bottom"
|
msgid "Bottom"
|
||||||
msgstr "Βάση"
|
msgstr "Βάση"
|
||||||
|
|
||||||
|
|
@ -879,7 +924,11 @@ msgstr "Εύρεση φακέλου προορισμού"
|
||||||
msgid "Buffer:"
|
msgid "Buffer:"
|
||||||
msgstr "Buffer:"
|
msgstr "Buffer:"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
||||||
msgid "Buttons"
|
msgid "Buttons"
|
||||||
|
|
@ -1082,7 +1131,11 @@ msgstr "Επιλέξτε ένα αρχείο για άνοιγμα"
|
||||||
msgid "Choose a memory card:"
|
msgid "Choose a memory card:"
|
||||||
msgstr "Επιλέξτε μια κάρτα μνήμης:"
|
msgstr "Επιλέξτε μια κάρτα μνήμης:"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Choose file to use as apploader: (applies to discs constructed from "
|
"Choose file to use as apploader: (applies to discs constructed from "
|
||||||
"directories only)"
|
"directories only)"
|
||||||
|
|
@ -1124,7 +1177,11 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
||||||
msgid "Close"
|
msgid "Close"
|
||||||
msgstr "Κλείσιμο"
|
msgstr "Κλείσιμο"
|
||||||
|
|
@ -1233,7 +1290,11 @@ msgstr "Σύνδεση Wiimote 3"
|
||||||
msgid "Connect Wiimote 4"
|
msgid "Connect Wiimote 4"
|
||||||
msgstr "Σύνδεση Wiimote 4"
|
msgstr "Σύνδεση Wiimote 4"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Connecting..."
|
msgid "Connecting..."
|
||||||
msgstr "Γίνεται Σύνδεση..."
|
msgstr "Γίνεται Σύνδεση..."
|
||||||
|
|
||||||
|
|
@ -1352,7 +1413,11 @@ msgstr "Δημιουργία νέας οπτικής"
|
||||||
msgid "Created by KDE-Look.org"
|
msgid "Created by KDE-Look.org"
|
||||||
msgstr "Δημιουργήθηκε από KDE-Look.org"
|
msgstr "Δημιουργήθηκε από KDE-Look.org"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]"
|
"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -1429,7 +1494,11 @@ msgid "DSP Emulator Engine"
|
||||||
msgstr "Μηχανή Εξομοίωσης DSP"
|
msgstr "Μηχανή Εξομοίωσης DSP"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "DSP HLE emulation (fast)"
|
msgid "DSP HLE emulation (fast)"
|
||||||
msgstr "DSP HLE εξομοίωση (γρήγορη)"
|
msgstr "DSP HLE εξομοίωση (γρήγορη)"
|
||||||
|
|
||||||
|
|
@ -1660,7 +1729,11 @@ msgstr ""
|
||||||
msgid "Divide"
|
msgid "Divide"
|
||||||
msgstr "Divide"
|
msgstr "Divide"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Do you want to stop the current emulation?"
|
msgid "Do you want to stop the current emulation?"
|
||||||
msgstr "Θέλετε να σταματήσετε την τρέχουσα εξομοίωση;"
|
msgstr "Θέλετε να σταματήσετε την τρέχουσα εξομοίωση;"
|
||||||
|
|
||||||
|
|
@ -1689,12 +1762,21 @@ msgstr "Ρυθμίσεις Εξοιμοιωμένου Dolphin Wiimote"
|
||||||
msgid "Dolphin FIFO"
|
msgid "Dolphin FIFO"
|
||||||
msgstr "Dolphin FIFO"
|
msgstr "Dolphin FIFO"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
msgid "Dolphin GCPad Configuration"
|
msgid "Dolphin GCPad Configuration"
|
||||||
msgstr "Ρυθμίσεις Dolphin GCPad"
|
msgstr "Ρυθμίσεις Dolphin GCPad"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204
|
||||||
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
msgstr "Ρυθμίσεις Dolphin GCPad"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Dolphin TAS Movies (*.dtm)"
|
msgid "Dolphin TAS Movies (*.dtm)"
|
||||||
msgstr "Dolphin TAS Ταινίες (*.dtm)"
|
msgstr "Dolphin TAS Ταινίες (*.dtm)"
|
||||||
|
|
||||||
|
|
@ -1706,7 +1788,11 @@ msgstr "Ρυθμίσεις Dolphin Wiimote"
|
||||||
msgid "Dolphin at &Google Code"
|
msgid "Dolphin at &Google Code"
|
||||||
msgstr "Dolphin στο &Google Code"
|
msgstr "Dolphin στο &Google Code"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for "
|
"Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for "
|
||||||
"files..."
|
"files..."
|
||||||
|
|
@ -1714,7 +1800,11 @@ msgstr ""
|
||||||
"Το Dolphin δεν μπόρεσε να βρει GC/Wii ISO. Κάντε διπλό κλίκ εδώ για εύρεση "
|
"Το Dolphin δεν μπόρεσε να βρει GC/Wii ISO. Κάντε διπλό κλίκ εδώ για εύρεση "
|
||||||
"αρχείων..."
|
"αρχείων..."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Dolphin is currently set to hide all games. Doubleclick here to show all "
|
"Dolphin is currently set to hide all games. Doubleclick here to show all "
|
||||||
"games..."
|
"games..."
|
||||||
|
|
@ -1792,9 +1882,15 @@ msgstr ""
|
||||||
"\n"
|
"\n"
|
||||||
"Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
|
"Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Dutch"
|
msgid "Dutch"
|
||||||
msgstr "Ολλανδικά"
|
msgstr "Ολλανδικά"
|
||||||
|
|
||||||
|
|
@ -1939,6 +2035,7 @@ msgstr "Ενεργοποίηση BAT"
|
||||||
msgid "Enable Block Merging"
|
msgid "Enable Block Merging"
|
||||||
msgstr "Ενεργοποίηση Block Merging"
|
msgstr "Ενεργοποίηση Block Merging"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
||||||
msgid "Enable Bounding Box Calculation"
|
msgid "Enable Bounding Box Calculation"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -1948,6 +2045,14 @@ msgid "Enable Cache"
|
||||||
msgstr "Ενεργοποίηση Cache"
|
msgstr "Ενεργοποίηση Cache"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
||||||
|
#, fuzzy
|
||||||
|
msgid "Enable Cache"
|
||||||
|
msgstr "Ενεργοποίηση Cheat"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Enable Cheats"
|
msgid "Enable Cheats"
|
||||||
msgstr "Ενεργοποίηση Cheat"
|
msgstr "Ενεργοποίηση Cheat"
|
||||||
|
|
||||||
|
|
@ -2048,7 +2153,11 @@ msgstr ""
|
||||||
"\n"
|
"\n"
|
||||||
"Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
|
"Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
|
"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
|
||||||
"ANY other game."
|
"ANY other game."
|
||||||
|
|
@ -2104,9 +2213,15 @@ msgstr ""
|
||||||
msgid "End"
|
msgid "End"
|
||||||
msgstr "Τέλος"
|
msgstr "Τέλος"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "English"
|
msgid "English"
|
||||||
msgstr "Αγγλικά"
|
msgstr "Αγγλικά"
|
||||||
|
|
||||||
|
|
@ -2135,6 +2250,7 @@ msgstr "Ίσο"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
msgid "Error"
|
msgid "Error"
|
||||||
msgstr "Σφάλμα"
|
msgstr "Σφάλμα"
|
||||||
|
|
@ -2146,11 +2262,18 @@ msgid ""
|
||||||
"Sorry, Wii recording is temporarily broken."
|
"Sorry, Wii recording is temporarily broken."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169
|
||||||
|
msgid "Error"
|
||||||
|
msgstr "Σφάλμα"
|
||||||
|
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
||||||
msgid "Error loading selected language. Falling back to system default."
|
msgid "Error loading selected language. Falling back to system default."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Αποτυχία φόρτωσης της επιλεγμένης γλώσσας. Επαναφορά στην προεπιλογή "
|
"Αποτυχία φόρτωσης της επιλεγμένης γλώσσας. Επαναφορά στην προεπιλογή "
|
||||||
"συστήματος."
|
"συστήματος."
|
||||||
|
<<<<<<< HEAD
|
||||||
|
|
||||||
#: Source/Core/Common/Src/ChunkFile.h:180
|
#: Source/Core/Common/Src/ChunkFile.h:180
|
||||||
#, c-format
|
#, c-format
|
||||||
|
|
@ -2158,6 +2281,8 @@ msgid ""
|
||||||
"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
|
"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
|
||||||
"Aborting savestate load..."
|
"Aborting savestate load..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
|
||||||
#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279
|
#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279
|
||||||
#, c-format
|
#, c-format
|
||||||
|
|
@ -2431,11 +2556,19 @@ msgstr "Αποτυχία εγγραφής της κεφαλίδας για το
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:475
|
||||||
msgid "Fast"
|
msgid "Fast"
|
||||||
|
<<<<<<< HEAD
|
||||||
msgstr "Γρήγορη"
|
msgstr "Γρήγορη"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498
|
||||||
msgid "Fast Mipmaps"
|
msgid "Fast Mipmaps"
|
||||||
msgstr "Γρήγορα Mipmaps"
|
msgstr "Γρήγορα Mipmaps"
|
||||||
|
=======
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498
|
||||||
|
msgid "Fast Mipmaps"
|
||||||
|
msgstr ""
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313
|
||||||
msgid "Fast version of the MMU. Does not work for every game."
|
msgid "Fast version of the MMU. Does not work for every game."
|
||||||
|
|
@ -2605,9 +2738,15 @@ msgstr "Καρέ Προς Εγγραφή"
|
||||||
msgid "Free Look"
|
msgid "Free Look"
|
||||||
msgstr "Ελεύθερη Ματιά"
|
msgstr "Ελεύθερη Ματιά"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "French"
|
msgid "French"
|
||||||
msgstr "Γαλλικά"
|
msgstr "Γαλλικά"
|
||||||
|
|
||||||
|
|
@ -2674,7 +2813,11 @@ msgid "Gamecube &Pad Settings"
|
||||||
msgstr "Ρυθμίσεις Gamecube &Pad"
|
msgstr "Ρυθμίσεις Gamecube &Pad"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
||||||
msgstr "Κάρτες Μνήμης Gamecube (*.raw,*.gcp)"
|
msgstr "Κάρτες Μνήμης Gamecube (*.raw,*.gcp)"
|
||||||
|
|
||||||
|
|
@ -2697,8 +2840,12 @@ msgstr ""
|
||||||
"(ή είναι ένας κακός κωδικός ή ο τύπος του κωδικού δεν υποστηρίζεται.)"
|
"(ή είναι ένας κακός κωδικός ή ο τύπος του κωδικού δεν υποστηρίζεται.)"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
||||||
msgid "General"
|
msgid "General"
|
||||||
msgstr "Γενικά"
|
msgstr "Γενικά"
|
||||||
|
|
@ -2707,9 +2854,15 @@ msgstr "Γενικά"
|
||||||
msgid "General Settings"
|
msgid "General Settings"
|
||||||
msgstr "Γενικές Ρυθμίσεις"
|
msgstr "Γενικές Ρυθμίσεις"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "German"
|
msgid "German"
|
||||||
msgstr "Γερμανικά"
|
msgstr "Γερμανικά"
|
||||||
|
|
||||||
|
|
@ -2733,6 +2886,10 @@ msgid "Greater Than"
|
||||||
msgstr "Μεγαλύτερο από"
|
msgstr "Μεγαλύτερο από"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
#, fuzzy
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Greatly increases quality of textures generated using render to texture "
|
"Greatly increases quality of textures generated using render to texture "
|
||||||
"effects.\n"
|
"effects.\n"
|
||||||
|
|
@ -2843,8 +3000,12 @@ msgid "Hotkey Configuration"
|
||||||
msgstr "Ρυθμίσεις Πλήκτρων Συντόμευσης"
|
msgstr "Ρυθμίσεις Πλήκτρων Συντόμευσης"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Hotkeys"
|
msgid "Hotkeys"
|
||||||
msgstr "Πλήκτρα Συντόμευσης"
|
msgstr "Πλήκτρα Συντόμευσης"
|
||||||
|
|
||||||
|
|
@ -2925,7 +3086,11 @@ msgstr ""
|
||||||
"Αν τα FPS διακυμαίνονται, αυτή η επιλογή μπορείο να βοηθήσει. (Ενεργό = "
|
"Αν τα FPS διακυμαίνονται, αυτή η επιλογή μπορείο να βοηθήσει. (Ενεργό = "
|
||||||
"Συμβατό, Ανενεργό = Γρήγορο)"
|
"Συμβατό, Ανενεργό = Γρήγορο)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you "
|
"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."
|
"also have to disable Audio Throttle in DSP to make it effective."
|
||||||
|
|
@ -3071,7 +3236,11 @@ msgstr ""
|
||||||
"InstallExceptionHandler καλέστηκε, αλλά αυτή η πλατφόρμα δεν το υποστηρίζει "
|
"InstallExceptionHandler καλέστηκε, αλλά αυτή η πλατφόρμα δεν το υποστηρίζει "
|
||||||
"ακόμα."
|
"ακόμα."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Installing WAD..."
|
msgid "Installing WAD..."
|
||||||
msgstr "Γίνεται εγκατάσταση WAD..."
|
msgstr "Γίνεται εγκατάσταση WAD..."
|
||||||
|
|
||||||
|
|
@ -3153,9 +3322,15 @@ msgstr "Μη έγκυρο αρχείο εγγραφής"
|
||||||
msgid "Invalid state"
|
msgid "Invalid state"
|
||||||
msgstr "Μη έγκυρο κατάσταση"
|
msgstr "Μη έγκυρο κατάσταση"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Italian"
|
msgid "Italian"
|
||||||
msgstr "Ιταλικά"
|
msgstr "Ιταλικά"
|
||||||
|
|
||||||
|
|
@ -3313,11 +3488,19 @@ msgstr "Φόρτωση Σημείου Αποθήκευσης 8"
|
||||||
msgid "Load State..."
|
msgid "Load State..."
|
||||||
msgstr "Φόρτωση Σημείου Αποθήκευσης..."
|
msgstr "Φόρτωση Σημείου Αποθήκευσης..."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
msgid "Load Wii System Menu"
|
msgid "Load Wii System Menu"
|
||||||
msgstr "Φόρτωση Μενού Συστήματος Wii"
|
msgstr "Φόρτωση Μενού Συστήματος Wii"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
|
||||||
|
msgid "Load Wii System Menu"
|
||||||
|
msgstr "Φόρτωση Μενού Συστήματος Wii"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Load Wii System Menu %d%c"
|
msgid "Load Wii System Menu %d%c"
|
||||||
msgstr "Φόρτωση Μενού Συστήματος Wii %d%c"
|
msgstr "Φόρτωση Μενού Συστήματος Wii %d%c"
|
||||||
|
|
@ -3399,7 +3582,11 @@ msgstr "MMU Speed Hack"
|
||||||
msgid "MadCatz Gameshark files(*.gcs)"
|
msgid "MadCatz Gameshark files(*.gcs)"
|
||||||
msgstr "Αρχεία MadCatz Gameshark (*.gcs)"
|
msgstr "Αρχεία MadCatz Gameshark (*.gcs)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
||||||
msgid "Main Stick"
|
msgid "Main Stick"
|
||||||
msgstr "Κύριο Stick"
|
msgstr "Κύριο Stick"
|
||||||
|
|
@ -3430,7 +3617,11 @@ msgid "Memory Byte"
|
||||||
msgstr "Memory Byte"
|
msgstr "Memory Byte"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Memory Card"
|
msgid "Memory Card"
|
||||||
msgstr "Κάρτα Μνήμης"
|
msgstr "Κάρτα Μνήμης"
|
||||||
|
|
||||||
|
|
@ -3630,7 +3821,11 @@ msgstr "NP Tab"
|
||||||
msgid "NP Up"
|
msgid "NP Up"
|
||||||
msgstr "NP Up"
|
msgstr "NP Up"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
||||||
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
||||||
msgid "Name:"
|
msgid "Name:"
|
||||||
|
|
@ -3717,7 +3912,11 @@ msgstr "Όχι ίσο"
|
||||||
msgid "Not Set"
|
msgid "Not Set"
|
||||||
msgstr "Μη Ορισμένο"
|
msgstr "Μη Ορισμένο"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Not connected"
|
msgid "Not connected"
|
||||||
msgstr "Μη Συνδεδεμένο"
|
msgstr "Μη Συνδεδεμένο"
|
||||||
|
|
||||||
|
|
@ -3778,7 +3977,10 @@ msgstr "Διαθέσιμα μόνο %d μπλοκ"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Open"
|
msgid "Open"
|
||||||
msgstr "Άνοιγμα"
|
msgstr "Άνοιγμα"
|
||||||
|
|
||||||
|
|
@ -3910,8 +4112,13 @@ msgstr "Patches"
|
||||||
msgid "Paths"
|
msgid "Paths"
|
||||||
msgstr "Φάκελοι"
|
msgstr "Φάκελοι"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
||||||
msgid "Pause"
|
msgid "Pause"
|
||||||
msgstr "Παύση"
|
msgstr "Παύση"
|
||||||
|
|
@ -3931,8 +4138,13 @@ msgstr "Οπτική %d"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Play"
|
msgid "Play"
|
||||||
msgstr "Αναπαραγωγή"
|
msgstr "Αναπαραγωγή"
|
||||||
|
|
||||||
|
|
@ -3958,7 +4170,11 @@ msgstr "Ρυθμίσεις Αναπαραγωγής"
|
||||||
msgid "Players"
|
msgid "Players"
|
||||||
msgstr "Παίχτες"
|
msgstr "Παίχτες"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Please confirm..."
|
msgid "Please confirm..."
|
||||||
msgstr "Παρακαλώ επιβεβαιώστε..."
|
msgstr "Παρακαλώ επιβεβαιώστε..."
|
||||||
|
|
||||||
|
|
@ -4169,10 +4385,17 @@ msgstr "Ανανέωση Λίστας"
|
||||||
msgid "Refresh game list"
|
msgid "Refresh game list"
|
||||||
msgstr "Ανανέωση λίστας παιχνιδιών"
|
msgstr "Ανανέωση λίστας παιχνιδιών"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434
|
||||||
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Remove"
|
msgid "Remove"
|
||||||
msgstr "Αφαίρεση"
|
msgstr "Αφαίρεση"
|
||||||
|
|
||||||
|
|
@ -4191,7 +4414,10 @@ msgid "Render to Main Window"
|
||||||
msgstr "Αναπαραγωγή στο Κεντρικό Παράθυρο"
|
msgstr "Αναπαραγωγή στο Κεντρικό Παράθυρο"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
||||||
msgid "Reset"
|
msgid "Reset"
|
||||||
msgstr "Επανεκκίνηση"
|
msgstr "Επανεκκίνηση"
|
||||||
|
|
@ -4232,9 +4458,15 @@ msgstr "Απ&οθήκευση Σημείου Αποθήκευσης"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473
|
||||||
msgid "Safe"
|
msgid "Safe"
|
||||||
|
<<<<<<< HEAD
|
||||||
msgstr "Ασφαλής"
|
msgstr "Ασφαλής"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
|
=======
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Sample Rate:"
|
msgid "Sample Rate:"
|
||||||
msgstr "Ρυθμός Δειγματοληψίας:"
|
msgstr "Ρυθμός Δειγματοληψίας:"
|
||||||
|
|
||||||
|
|
@ -4318,7 +4550,11 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401
|
||||||
msgid "Scaled EFB Copy"
|
msgid "Scaled EFB Copy"
|
||||||
|
<<<<<<< HEAD
|
||||||
msgstr "Κλιμακούμενα EFB Αντίγραφα"
|
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:634
|
||||||
#, c-format
|
#, c-format
|
||||||
|
|
@ -4360,12 +4596,21 @@ msgstr "Η ενότητα %s δε βρέθηκε στο SYSCONF"
|
||||||
msgid "Select"
|
msgid "Select"
|
||||||
msgstr "Επιλογή"
|
msgstr "Επιλογή"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
||||||
msgid "Select The Recording File"
|
msgid "Select The Recording File"
|
||||||
msgstr "Επιλέξτε το Αρχείο Εγγραφής"
|
msgstr "Επιλέξτε το Αρχείο Εγγραφής"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:740
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142
|
||||||
|
msgid "Select The Recording File"
|
||||||
|
msgstr "Επιλέξτε το Αρχείο Εγγραφής"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Select a Wii WAD file to install"
|
msgid "Select a Wii WAD file to install"
|
||||||
msgstr "Επιλέξτε ένα Wii WAD αρχείο για εγκατάσταση"
|
msgstr "Επιλέξτε ένα Wii WAD αρχείο για εγκατάσταση"
|
||||||
|
|
||||||
|
|
@ -4391,6 +4636,7 @@ msgstr "Επιλέξτε αιωρούμενα παράθυρα"
|
||||||
msgid "Select the file to load"
|
msgid "Select the file to load"
|
||||||
msgstr "Επιλέξτε το αρχείο για φόρτωση"
|
msgstr "Επιλέξτε το αρχείο για φόρτωση"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
msgstr "Επιλέξτε αρχείο αποθήκευσης"
|
msgstr "Επιλέξτε αρχείο αποθήκευσης"
|
||||||
|
|
@ -4400,6 +4646,17 @@ msgid "Select the state to load"
|
||||||
msgstr "Επιλέξτε το σημείο φόρτωσης"
|
msgstr "Επιλέξτε το σημείο φόρτωσης"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
||||||
|
msgid "Select the save file"
|
||||||
|
msgstr "Επιλέξτε αρχείο αποθήκευσης"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457
|
||||||
|
msgid "Select the state to load"
|
||||||
|
msgstr "Επιλέξτε το σημείο φόρτωσης"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Select the state to save"
|
msgid "Select the state to save"
|
||||||
msgstr "Επιλέξτε το σημείο αποθήκευσης"
|
msgstr "Επιλέξτε το σημείο αποθήκευσης"
|
||||||
|
|
||||||
|
|
@ -4475,7 +4732,11 @@ msgstr "Διαχωριστής"
|
||||||
msgid "Serbian"
|
msgid "Serbian"
|
||||||
msgstr "Σερβικά"
|
msgstr "Σερβικά"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Serial Port 1 - This is the port which devices such as the net adapter use"
|
"Serial Port 1 - This is the port which devices such as the net adapter use"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -4704,6 +4965,7 @@ msgid "Skip EFB Access from CPU"
|
||||||
msgstr "Παράλειψη EFB Πρόσβασης από τη CPU"
|
msgstr "Παράλειψη EFB Πρόσβασης από τη CPU"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
|
||||||
|
<<<<<<< HEAD
|
||||||
msgid ""
|
msgid ""
|
||||||
"Skip the destination alpha pass used in many games for various graphical "
|
"Skip the destination alpha pass used in many games for various graphical "
|
||||||
"effects.\n"
|
"effects.\n"
|
||||||
|
|
@ -4729,9 +4991,29 @@ msgstr ""
|
||||||
"Μερικές φορές μπορεί να βελτιώσει την οπτική ποιότητα.\n"
|
"Μερικές φορές μπορεί να βελτιώσει την οπτική ποιότητα.\n"
|
||||||
"Αν αντιμετωπίζετε προβλήματα, δοκιμάστε να αυξήσετε την ακρίβεια της cache "
|
"Αν αντιμετωπίζετε προβλήματα, δοκιμάστε να αυξήσετε την ακρίβεια της cache "
|
||||||
"υφών ή απενεργοποιήστε αυτήν την επιλογή.\n"
|
"υφών ή απενεργοποιήστε αυτήν την επιλογή.\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"
|
"\n"
|
||||||
"Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
|
"Αν δεν είστε σίγουροι, αφήστε το αποεπιλεγμένο."
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
|
||||||
|
msgid ""
|
||||||
|
"Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
|
||||||
|
"Sometimes also increases visual quality.\n"
|
||||||
|
"If you're experiencing any issues, try raising texture cache accuracy or "
|
||||||
|
"disable this option.\n"
|
||||||
|
"\n"
|
||||||
|
"If unsure, leave this unchecked."
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:387
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:387
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:399
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:399
|
||||||
#, c-format
|
#, c-format
|
||||||
|
|
@ -4785,9 +5067,15 @@ msgstr "Αποτυχία δημιουργίας buffer ήχου: %s"
|
||||||
msgid "Space"
|
msgid "Space"
|
||||||
msgstr "Space"
|
msgstr "Space"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Spanish"
|
msgid "Spanish"
|
||||||
msgstr "Ισπανικά"
|
msgstr "Ισπανικά"
|
||||||
|
|
||||||
|
|
@ -4832,7 +5120,11 @@ msgstr "Τετράγωνο Stick"
|
||||||
msgid "Standard Controller"
|
msgid "Standard Controller"
|
||||||
msgstr "Τυπικός Controller"
|
msgstr "Τυπικός Controller"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
||||||
msgid "Start"
|
msgid "Start"
|
||||||
|
|
@ -4867,7 +5159,10 @@ msgstr "Stick"
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
||||||
msgid "Stop"
|
msgid "Stop"
|
||||||
msgstr "Διακοπή"
|
msgstr "Διακοπή"
|
||||||
|
|
@ -4880,11 +5175,14 @@ msgid ""
|
||||||
"\n"
|
"\n"
|
||||||
"If unsure, leave this checked."
|
"If unsure, leave this checked."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
<<<<<<< HEAD
|
||||||
"Αποθήκευση των EFB αντιγράφων σε GPU αντικείμενα υφών.\n"
|
"Αποθήκευση των EFB αντιγράφων σε GPU αντικείμενα υφών.\n"
|
||||||
"Αυτό δεν είναι τόσο ακριβές, αλλά δουλεύει αρκετά καλά για τα περισσότερα "
|
"Αυτό δεν είναι τόσο ακριβές, αλλά δουλεύει αρκετά καλά για τα περισσότερα "
|
||||||
"παιχνίδια και προσφέρει μεγάλη επιτάχυνση σε σχέση με EFB σε RAM.\n"
|
"παιχνίδια και προσφέρει μεγάλη επιτάχυνση σε σχέση με EFB σε RAM.\n"
|
||||||
"\n"
|
"\n"
|
||||||
"Αν δεν είστε σίγουροι, αφήστε το επιλεγμένο."
|
"Αν δεν είστε σίγουροι, αφήστε το επιλεγμένο."
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
||||||
msgid "Stretch to Window"
|
msgid "Stretch to Window"
|
||||||
|
|
@ -4944,7 +5242,10 @@ msgstr "Δεξί Table"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Take Screenshot"
|
msgid "Take Screenshot"
|
||||||
msgstr "Δημιουργία Στιγμιότυπου"
|
msgstr "Δημιουργία Στιγμιότυπου"
|
||||||
|
|
||||||
|
|
@ -4957,12 +5258,23 @@ msgid "Test"
|
||||||
msgstr "Τέστ"
|
msgstr "Τέστ"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438
|
||||||
|
<<<<<<< HEAD
|
||||||
msgid "Texture"
|
msgid "Texture"
|
||||||
msgstr "Υφή"
|
msgstr "Υφή"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455
|
||||||
msgid "Texture Cache"
|
msgid "Texture Cache"
|
||||||
msgstr "Cache Υφών"
|
msgstr "Cache Υφών"
|
||||||
|
=======
|
||||||
|
#, fuzzy
|
||||||
|
msgid "Texture"
|
||||||
|
msgstr "Εξαγωγή Υφών"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:455
|
||||||
|
#, fuzzy
|
||||||
|
msgid "Texture Cache"
|
||||||
|
msgstr "Καθαρισμός Cache"
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:530
|
||||||
msgid "Texture Format Overlay"
|
msgid "Texture Format Overlay"
|
||||||
|
|
@ -5034,10 +5346,13 @@ msgid ""
|
||||||
"\n"
|
"\n"
|
||||||
"If unsure, use the second-fastest value from the right."
|
"If unsure, use the second-fastest value from the right."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
<<<<<<< HEAD
|
||||||
"Όσο πιο ασφαλής είναι αυτή η ρύθμιση, τόσο λιγότερο πιθανό ο εξομοιωτής να "
|
"Όσο πιο ασφαλής είναι αυτή η ρύθμιση, τόσο λιγότερο πιθανό ο εξομοιωτής να "
|
||||||
"χάσει ανανεώσεις των υφών από την RAM.\n"
|
"χάσει ανανεώσεις των υφών από την RAM.\n"
|
||||||
"\n"
|
"\n"
|
||||||
"Αν δεν είστε σίγουροι, χρησιμοποιήστε την δεύτερη γρηγορότερη τιμή από δεξιά."
|
"Αν δεν είστε σίγουροι, χρησιμοποιήστε την δεύτερη γρηγορότερη τιμή από δεξιά."
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447
|
||||||
msgid "The save you are trying to copy has an invalid file size"
|
msgid "The save you are trying to copy has an invalid file size"
|
||||||
|
|
@ -5199,12 +5514,19 @@ msgstr "Εναλλαγή Όλων Τύπων Καταγραφής "
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Toggle Fullscreen"
|
msgid "Toggle Fullscreen"
|
||||||
msgstr "Εναλλαγή Πλήρους Οθόνης"
|
msgstr "Εναλλαγή Πλήρους Οθόνης"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Top"
|
msgid "Top"
|
||||||
msgstr "Κορυφή"
|
msgstr "Κορυφή"
|
||||||
|
|
||||||
|
|
@ -5314,6 +5636,18 @@ msgstr "Ελήφθη άγνωστο μήνυμα με id : %d"
|
||||||
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
||||||
msgstr "Ελήφθη άγνωστο μήνυμα με:%d από τον παίκτη:%d Αποσύνδεση παίκτη!"
|
msgstr "Ελήφθη άγνωστο μήνυμα με:%d από τον παίκτη:%d Αποσύνδεση παίκτη!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
||||||
|
#, c-format
|
||||||
|
msgid ""
|
||||||
|
"Unknown pointer %#08x\n"
|
||||||
|
"Continue?"
|
||||||
|
msgstr ""
|
||||||
|
"Άγνωστος δείκτης %#08x\n"
|
||||||
|
"Συνέχεια;"
|
||||||
|
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
||||||
msgid "Up"
|
msgid "Up"
|
||||||
|
|
@ -5540,7 +5874,11 @@ msgstr "Wii NAND Ρίζα:"
|
||||||
msgid "Wii Save Import"
|
msgid "Wii Save Import"
|
||||||
msgstr "Εισαγωγή Αποθήκευσης Wii"
|
msgstr "Εισαγωγή Αποθήκευσης Wii"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wii save files (*.bin)|*.bin"
|
msgid "Wii save files (*.bin)|*.bin"
|
||||||
msgstr "Αρχεία αποθήκευσης Wii (*.bin)|*.bin"
|
msgstr "Αρχεία αποθήκευσης Wii (*.bin)|*.bin"
|
||||||
|
|
||||||
|
|
@ -5571,7 +5909,11 @@ msgstr ""
|
||||||
"ή πιθανόν να οφείλεται σε χρόνο αδράνειας ή κάποιον άλλο λόγο.\n"
|
"ή πιθανόν να οφείλεται σε χρόνο αδράνειας ή κάποιον άλλο λόγο.\n"
|
||||||
"Θέλετε να γίνει άμεση επανασύνδεση;"
|
"Θέλετε να γίνει άμεση επανασύνδεση;"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wiimote Connected"
|
msgid "Wiimote Connected"
|
||||||
msgstr "Συνδεδεμένο Wiimote"
|
msgstr "Συνδεδεμένο Wiimote"
|
||||||
|
|
||||||
|
|
@ -5603,9 +5945,15 @@ msgstr "Windows Right"
|
||||||
msgid "Word Wrap"
|
msgid "Word Wrap"
|
||||||
msgstr "Αναδίπλωση Λέξεων"
|
msgstr "Αναδίπλωση Λέξεων"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Working..."
|
msgid "Working..."
|
||||||
msgstr "Σε εργασία..."
|
msgstr "Σε εργασία..."
|
||||||
|
|
||||||
|
|
@ -5817,6 +6165,7 @@ msgstr "zNear Διόρθωση: "
|
||||||
msgid "| OR"
|
msgid "| OR"
|
||||||
msgstr "| OR"
|
msgstr "| OR"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#~ msgid "Cannot record movies in read-only mode."
|
#~ msgid "Cannot record movies in read-only mode."
|
||||||
#~ msgstr ""
|
#~ msgstr ""
|
||||||
#~ "Δεν μπορεί να γίνει εγγραφή ταινιών σε λειτουργία μόνο για ανάγνωση."
|
#~ "Δεν μπορεί να γίνει εγγραφή ταινιών σε λειτουργία μόνο για ανάγνωση."
|
||||||
|
|
@ -5827,3 +6176,7 @@ msgstr "| OR"
|
||||||
#~ msgstr ""
|
#~ msgstr ""
|
||||||
#~ "Άγνωστος δείκτης %#08x\n"
|
#~ "Άγνωστος δείκτης %#08x\n"
|
||||||
#~ "Συνέχεια;"
|
#~ "Συνέχεια;"
|
||||||
|
=======
|
||||||
|
#~ msgid "Disable Wiimote Speaker"
|
||||||
|
#~ msgstr "Απενεργοποίηση Ηχείου Wiimote"
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,11 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: Dolphin Emu\n"
|
"Project-Id-Version: Dolphin Emu\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
|
=======
|
||||||
|
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
"PO-Revision-Date: 2011-01-06 14:53+0100\n"
|
"PO-Revision-Date: 2011-01-06 14:53+0100\n"
|
||||||
"Last-Translator: BhaaL <bhaal@0x1337.org>\n"
|
"Last-Translator: BhaaL <bhaal@0x1337.org>\n"
|
||||||
"Language-Team: \n"
|
"Language-Team: \n"
|
||||||
|
|
@ -505,9 +509,15 @@ msgstr ""
|
||||||
msgid "Add new pane"
|
msgid "Add new pane"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Add..."
|
msgid "Add..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -561,8 +571,13 @@ msgstr ""
|
||||||
msgid "All Gamecube GCM files (gcm)"
|
msgid "All Gamecube GCM files (gcm)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "All Save States (sav, s##)"
|
msgid "All Save States (sav, s##)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -640,7 +655,11 @@ msgstr ""
|
||||||
msgid "Are you sure you want to delete this file? It will be gone forever!"
|
msgid "Are you sure you want to delete this file? It will be gone forever!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
||||||
msgid "Aspect Ratio:"
|
msgid "Aspect Ratio:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -661,7 +680,11 @@ msgstr ""
|
||||||
msgid "AudioCommon: Error opening AO device.\n"
|
msgid "AudioCommon: Error opening AO device.\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
||||||
msgid "Auto"
|
msgid "Auto"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -769,7 +792,11 @@ msgid "Blue Right"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Bottom"
|
msgid "Bottom"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -802,7 +829,11 @@ msgstr ""
|
||||||
msgid "Buffer:"
|
msgid "Buffer:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
||||||
msgid "Buttons"
|
msgid "Buttons"
|
||||||
|
|
@ -1024,7 +1055,11 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
||||||
msgid "Close"
|
msgid "Close"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -1133,7 +1168,11 @@ msgstr ""
|
||||||
msgid "Connect Wiimote 4"
|
msgid "Connect Wiimote 4"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Connecting..."
|
msgid "Connecting..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1308,7 +1347,11 @@ msgid "DSP Emulator Engine"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "DSP HLE emulation (fast)"
|
msgid "DSP HLE emulation (fast)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1518,7 +1561,11 @@ msgstr ""
|
||||||
msgid "Divide"
|
msgid "Divide"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Do you want to stop the current emulation?"
|
msgid "Do you want to stop the current emulation?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1547,12 +1594,21 @@ msgstr ""
|
||||||
msgid "Dolphin FIFO"
|
msgid "Dolphin FIFO"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
msgid "Dolphin GCPad Configuration"
|
msgid "Dolphin GCPad Configuration"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204
|
||||||
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Dolphin TAS Movies (*.dtm)"
|
msgid "Dolphin TAS Movies (*.dtm)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1635,9 +1691,15 @@ msgid ""
|
||||||
"If unsure, leave this unchecked."
|
"If unsure, leave this unchecked."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Dutch"
|
msgid "Dutch"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1760,15 +1822,22 @@ msgstr ""
|
||||||
msgid "Enable Block Merging"
|
msgid "Enable Block Merging"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
||||||
msgid "Enable Bounding Box Calculation"
|
msgid "Enable Bounding Box Calculation"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
||||||
msgid "Enable Cache"
|
msgid "Enable Cache"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Enable Cheats"
|
msgid "Enable Cheats"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1894,9 +1963,15 @@ msgstr ""
|
||||||
msgid "End"
|
msgid "End"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "English"
|
msgid "English"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1925,6 +2000,7 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
msgid "Error"
|
msgid "Error"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -1936,6 +2012,12 @@ msgid ""
|
||||||
"Sorry, Wii recording is temporarily broken."
|
"Sorry, Wii recording is temporarily broken."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169
|
||||||
|
msgid "Error"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
||||||
msgid "Error loading selected language. Falling back to system default."
|
msgid "Error loading selected language. Falling back to system default."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2350,9 +2432,15 @@ msgstr ""
|
||||||
msgid "Free Look"
|
msgid "Free Look"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "French"
|
msgid "French"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2418,7 +2506,11 @@ msgid "Gamecube &Pad Settings"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2439,8 +2531,12 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
||||||
msgid "General"
|
msgid "General"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2449,9 +2545,15 @@ msgstr ""
|
||||||
msgid "General Settings"
|
msgid "General Settings"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "German"
|
msgid "German"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2566,8 +2668,12 @@ msgid "Hotkey Configuration"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Hotkeys"
|
msgid "Hotkeys"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2757,7 +2863,11 @@ msgid ""
|
||||||
"InstallExceptionHandler called, but this platform does not yet support it."
|
"InstallExceptionHandler called, but this platform does not yet support it."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Installing WAD..."
|
msgid "Installing WAD..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2834,9 +2944,15 @@ msgstr ""
|
||||||
msgid "Invalid state"
|
msgid "Invalid state"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Italian"
|
msgid "Italian"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2987,11 +3103,19 @@ msgstr ""
|
||||||
msgid "Load State..."
|
msgid "Load State..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
msgid "Load Wii System Menu"
|
msgid "Load Wii System Menu"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
|
||||||
|
msgid "Load Wii System Menu"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Load Wii System Menu %d%c"
|
msgid "Load Wii System Menu %d%c"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3068,7 +3192,11 @@ msgstr ""
|
||||||
msgid "MadCatz Gameshark files(*.gcs)"
|
msgid "MadCatz Gameshark files(*.gcs)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
||||||
msgid "Main Stick"
|
msgid "Main Stick"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3099,7 +3227,11 @@ msgid "Memory Byte"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Memory Card"
|
msgid "Memory Card"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3276,7 +3408,11 @@ msgstr ""
|
||||||
msgid "NP Up"
|
msgid "NP Up"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
||||||
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
||||||
msgid "Name:"
|
msgid "Name:"
|
||||||
|
|
@ -3363,7 +3499,11 @@ msgstr ""
|
||||||
msgid "Not Set"
|
msgid "Not Set"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Not connected"
|
msgid "Not connected"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3424,7 +3564,10 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Open"
|
msgid "Open"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3550,8 +3693,13 @@ msgstr ""
|
||||||
msgid "Paths"
|
msgid "Paths"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
||||||
msgid "Pause"
|
msgid "Pause"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3571,8 +3719,13 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Play"
|
msgid "Play"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3598,7 +3751,11 @@ msgstr ""
|
||||||
msgid "Players"
|
msgid "Players"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Please confirm..."
|
msgid "Please confirm..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3804,10 +3961,17 @@ msgstr ""
|
||||||
msgid "Refresh game list"
|
msgid "Refresh game list"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434
|
||||||
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Remove"
|
msgid "Remove"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3823,7 +3987,10 @@ msgid "Render to Main Window"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
||||||
msgid "Reset"
|
msgid "Reset"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3866,7 +4033,11 @@ msgstr ""
|
||||||
msgid "Safe"
|
msgid "Safe"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Sample Rate:"
|
msgid "Sample Rate:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3950,7 +4121,11 @@ msgstr ""
|
||||||
msgid "Scaled EFB Copy"
|
msgid "Scaled EFB Copy"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Scanning %s"
|
msgid "Scanning %s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3990,12 +4165,21 @@ msgstr ""
|
||||||
msgid "Select"
|
msgid "Select"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
||||||
msgid "Select The Recording File"
|
msgid "Select The Recording File"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:740
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142
|
||||||
|
msgid "Select The Recording File"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Select a Wii WAD file to install"
|
msgid "Select a Wii WAD file to install"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -4018,6 +4202,7 @@ msgstr ""
|
||||||
msgid "Select the file to load"
|
msgid "Select the file to load"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -4027,6 +4212,17 @@ msgid "Select the state to load"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
||||||
|
msgid "Select the save file"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457
|
||||||
|
msgid "Select the state to load"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Select the state to save"
|
msgid "Select the state to save"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -4360,9 +4556,15 @@ msgstr ""
|
||||||
msgid "Space"
|
msgid "Space"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Spanish"
|
msgid "Spanish"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -4398,7 +4600,11 @@ msgstr ""
|
||||||
msgid "Standard Controller"
|
msgid "Standard Controller"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
||||||
msgid "Start"
|
msgid "Start"
|
||||||
|
|
@ -4433,7 +4639,10 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
||||||
msgid "Stop"
|
msgid "Stop"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -4505,7 +4714,10 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Take Screenshot"
|
msgid "Take Screenshot"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -4717,12 +4929,19 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Toggle Fullscreen"
|
msgid "Toggle Fullscreen"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Top"
|
msgid "Top"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -4824,6 +5043,16 @@ msgstr ""
|
||||||
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
||||||
|
#, c-format
|
||||||
|
msgid ""
|
||||||
|
"Unknown pointer %#08x\n"
|
||||||
|
"Continue?"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
||||||
msgid "Up"
|
msgid "Up"
|
||||||
|
|
@ -5025,7 +5254,11 @@ msgstr ""
|
||||||
msgid "Wii Save Import"
|
msgid "Wii Save Import"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wii save files (*.bin)|*.bin"
|
msgid "Wii save files (*.bin)|*.bin"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -5052,7 +5285,11 @@ msgid ""
|
||||||
"Do you want to reconnect immediately?"
|
"Do you want to reconnect immediately?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wiimote Connected"
|
msgid "Wiimote Connected"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -5084,9 +5321,15 @@ msgstr ""
|
||||||
msgid "Word Wrap"
|
msgid "Word Wrap"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Working..."
|
msgid "Working..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,8 +7,13 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: Dolphin Emu\n"
|
"Project-Id-Version: Dolphin Emu\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
"PO-Revision-Date: 2011-12-09 00:28+0100\n"
|
"PO-Revision-Date: 2011-12-09 00:28+0100\n"
|
||||||
|
=======
|
||||||
|
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
||||||
|
"PO-Revision-Date: 2011-08-11 15:30+0100\n"
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
"Last-Translator: Petiso Carambanal <diegoae@gmail.com>\n"
|
"Last-Translator: Petiso Carambanal <diegoae@gmail.com>\n"
|
||||||
"Language-Team: DARIO_FF <LL@li.org>\n"
|
"Language-Team: DARIO_FF <LL@li.org>\n"
|
||||||
"Language: Spanish\n"
|
"Language: Spanish\n"
|
||||||
|
|
@ -431,6 +436,10 @@ msgid "Accurate VBeam emulation"
|
||||||
msgstr "Emulación de VBeam Precisa"
|
msgstr "Emulación de VBeam Precisa"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
#, fuzzy
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Accurately emulate EFB copies.\n"
|
"Accurately emulate EFB copies.\n"
|
||||||
"Some games depend on this for certain graphical effects or gameplay "
|
"Some games depend on this for certain graphical effects or gameplay "
|
||||||
|
|
@ -559,9 +568,15 @@ msgstr "Añadir Parche"
|
||||||
msgid "Add new pane"
|
msgid "Add new pane"
|
||||||
msgstr "Añadir nueva ventana"
|
msgstr "Añadir nueva ventana"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Add..."
|
msgid "Add..."
|
||||||
msgstr "Añadir..."
|
msgstr "Añadir..."
|
||||||
|
|
||||||
|
|
@ -630,8 +645,13 @@ msgstr "Todas las imágenes GC/Wii (gcm, iso, ciso, gcz)"
|
||||||
msgid "All Gamecube GCM files (gcm)"
|
msgid "All Gamecube GCM files (gcm)"
|
||||||
msgstr "Todos los archivos Gamecube GCM (gcm)"
|
msgstr "Todos los archivos Gamecube GCM (gcm)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "All Save States (sav, s##)"
|
msgid "All Save States (sav, s##)"
|
||||||
msgstr "Todos los estados guardados (sav, s##)"
|
msgstr "Todos los estados guardados (sav, s##)"
|
||||||
|
|
||||||
|
|
@ -660,8 +680,14 @@ msgstr ""
|
||||||
"Si está inseguro, déjelo sin marcar."
|
"Si está inseguro, déjelo sin marcar."
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
|
||||||
|
<<<<<<< HEAD
|
||||||
msgid "Alternate Wiimote Timing"
|
msgid "Alternate Wiimote Timing"
|
||||||
msgstr "Sincronización alternativa del Wiimote"
|
msgstr "Sincronización alternativa del Wiimote"
|
||||||
|
=======
|
||||||
|
#, fuzzy
|
||||||
|
msgid "Alternate Wiimote Timing"
|
||||||
|
msgstr "Wiimote emulado"
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372
|
||||||
msgid "Anisotropic Filtering:"
|
msgid "Anisotropic Filtering:"
|
||||||
|
|
@ -718,7 +744,11 @@ msgstr ""
|
||||||
msgid "Are you sure you want to delete this file? It will be gone forever!"
|
msgid "Are you sure you want to delete this file? It will be gone forever!"
|
||||||
msgstr "¿Seguro que quiere borrar este archivo? ¡Desaparecerá para siempre!"
|
msgstr "¿Seguro que quiere borrar este archivo? ¡Desaparecerá para siempre!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
||||||
msgid "Aspect Ratio:"
|
msgid "Aspect Ratio:"
|
||||||
msgstr "Relación de aspecto:"
|
msgstr "Relación de aspecto:"
|
||||||
|
|
@ -739,7 +769,11 @@ msgstr "Motor de Audio:"
|
||||||
msgid "AudioCommon: Error opening AO device.\n"
|
msgid "AudioCommon: Error opening AO device.\n"
|
||||||
msgstr "AudioCommon: Error al abrir dispositivo AO.\n"
|
msgstr "AudioCommon: Error al abrir dispositivo AO.\n"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
||||||
msgid "Auto"
|
msgid "Auto"
|
||||||
msgstr "Automático"
|
msgstr "Automático"
|
||||||
|
|
@ -855,7 +889,11 @@ msgid "Blue Right"
|
||||||
msgstr "Azul derecha"
|
msgstr "Azul derecha"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Bottom"
|
msgid "Bottom"
|
||||||
msgstr "Inferior"
|
msgstr "Inferior"
|
||||||
|
|
||||||
|
|
@ -888,7 +926,11 @@ msgstr "Busca un directorio de salida"
|
||||||
msgid "Buffer:"
|
msgid "Buffer:"
|
||||||
msgstr "Búfer"
|
msgstr "Búfer"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
||||||
msgid "Buttons"
|
msgid "Buttons"
|
||||||
|
|
@ -1095,7 +1137,11 @@ msgstr "Escoge un archivo a abrir"
|
||||||
msgid "Choose a memory card:"
|
msgid "Choose a memory card:"
|
||||||
msgstr "Escoge una tarjeta de memoria:"
|
msgstr "Escoge una tarjeta de memoria:"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Choose file to use as apploader: (applies to discs constructed from "
|
"Choose file to use as apploader: (applies to discs constructed from "
|
||||||
"directories only)"
|
"directories only)"
|
||||||
|
|
@ -1137,7 +1183,11 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
||||||
msgid "Close"
|
msgid "Close"
|
||||||
msgstr "Cerrar"
|
msgstr "Cerrar"
|
||||||
|
|
@ -1246,7 +1296,11 @@ msgstr "Conectar Wiimote 3"
|
||||||
msgid "Connect Wiimote 4"
|
msgid "Connect Wiimote 4"
|
||||||
msgstr "Conectar Wiimote 4"
|
msgstr "Conectar Wiimote 4"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Connecting..."
|
msgid "Connecting..."
|
||||||
msgstr "Conectando..."
|
msgstr "Conectando..."
|
||||||
|
|
||||||
|
|
@ -1364,7 +1418,11 @@ msgstr "Crear nueva perspectiva"
|
||||||
msgid "Created by KDE-Look.org"
|
msgid "Created by KDE-Look.org"
|
||||||
msgstr "Creado por KDE-Look.org"
|
msgstr "Creado por KDE-Look.org"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]"
|
"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -1438,7 +1496,11 @@ msgid "DSP Emulator Engine"
|
||||||
msgstr "Motor de emulación DSP"
|
msgstr "Motor de emulación DSP"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "DSP HLE emulation (fast)"
|
msgid "DSP HLE emulation (fast)"
|
||||||
msgstr "Emulación DSP HLE (rápido)"
|
msgstr "Emulación DSP HLE (rápido)"
|
||||||
|
|
||||||
|
|
@ -1669,7 +1731,11 @@ msgstr ""
|
||||||
msgid "Divide"
|
msgid "Divide"
|
||||||
msgstr "Dividir"
|
msgstr "Dividir"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Do you want to stop the current emulation?"
|
msgid "Do you want to stop the current emulation?"
|
||||||
msgstr "¿Quieres detener la emulación actual?"
|
msgstr "¿Quieres detener la emulación actual?"
|
||||||
|
|
||||||
|
|
@ -1698,12 +1764,21 @@ msgstr "Configuración de wiimote emulado de Dolphin"
|
||||||
msgid "Dolphin FIFO"
|
msgid "Dolphin FIFO"
|
||||||
msgstr "Dolphin FIFO"
|
msgstr "Dolphin FIFO"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
msgid "Dolphin GCPad Configuration"
|
msgid "Dolphin GCPad Configuration"
|
||||||
msgstr "Configuración de GCPad Dolphin"
|
msgstr "Configuración de GCPad Dolphin"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204
|
||||||
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
msgstr "Configuración de GCPad Dolphin"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Dolphin TAS Movies (*.dtm)"
|
msgid "Dolphin TAS Movies (*.dtm)"
|
||||||
msgstr "Películas TAS de Dolphin (*.dtm)"
|
msgstr "Películas TAS de Dolphin (*.dtm)"
|
||||||
|
|
||||||
|
|
@ -1715,7 +1790,11 @@ msgstr "Configuración de wiimote de Dolphin"
|
||||||
msgid "Dolphin at &Google Code"
|
msgid "Dolphin at &Google Code"
|
||||||
msgstr "Dolphin en &Google Code"
|
msgstr "Dolphin en &Google Code"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for "
|
"Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for "
|
||||||
"files..."
|
"files..."
|
||||||
|
|
@ -1723,7 +1802,11 @@ msgstr ""
|
||||||
"Dolphin no pudo encontrar ninguna ISO de GC/Wii. Haz doble clic aquí para "
|
"Dolphin no pudo encontrar ninguna ISO de GC/Wii. Haz doble clic aquí para "
|
||||||
"buscar..."
|
"buscar..."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Dolphin is currently set to hide all games. Doubleclick here to show all "
|
"Dolphin is currently set to hide all games. Doubleclick here to show all "
|
||||||
"games..."
|
"games..."
|
||||||
|
|
@ -1799,9 +1882,15 @@ msgstr ""
|
||||||
"\n"
|
"\n"
|
||||||
"Si está inseguro, déjelo sin marcar."
|
"Si está inseguro, déjelo sin marcar."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Dutch"
|
msgid "Dutch"
|
||||||
msgstr "Holandés"
|
msgstr "Holandés"
|
||||||
|
|
||||||
|
|
@ -1940,15 +2029,22 @@ msgstr "Habilitar BAT"
|
||||||
msgid "Enable Block Merging"
|
msgid "Enable Block Merging"
|
||||||
msgstr "Habilitar asociación de bloques"
|
msgstr "Habilitar asociación de bloques"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
||||||
msgid "Enable Bounding Box Calculation"
|
msgid "Enable Bounding Box Calculation"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
||||||
msgid "Enable Cache"
|
msgid "Enable Cache"
|
||||||
msgstr "Habilitar caché"
|
msgstr "Habilitar caché"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Enable Cheats"
|
msgid "Enable Cheats"
|
||||||
msgstr "Habilitar trucos"
|
msgstr "Habilitar trucos"
|
||||||
|
|
||||||
|
|
@ -2048,7 +2144,11 @@ msgstr ""
|
||||||
"\n"
|
"\n"
|
||||||
"Si está inseguro, déjelo sin marcar."
|
"Si está inseguro, déjelo sin marcar."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
|
"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
|
||||||
"ANY other game."
|
"ANY other game."
|
||||||
|
|
@ -2103,9 +2203,15 @@ msgstr ""
|
||||||
msgid "End"
|
msgid "End"
|
||||||
msgstr "Fin"
|
msgstr "Fin"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "English"
|
msgid "English"
|
||||||
msgstr "Inglés"
|
msgstr "Inglés"
|
||||||
|
|
||||||
|
|
@ -2134,6 +2240,7 @@ msgstr "Igual"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
msgid "Error"
|
msgid "Error"
|
||||||
msgstr "Error"
|
msgstr "Error"
|
||||||
|
|
@ -2145,6 +2252,12 @@ msgid ""
|
||||||
"Sorry, Wii recording is temporarily broken."
|
"Sorry, Wii recording is temporarily broken."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169
|
||||||
|
msgid "Error"
|
||||||
|
msgstr "Error"
|
||||||
|
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
||||||
msgid "Error loading selected language. Falling back to system default."
|
msgid "Error loading selected language. Falling back to system default."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2153,6 +2266,7 @@ msgstr ""
|
||||||
#: Source/Core/Common/Src/ChunkFile.h:180
|
#: Source/Core/Common/Src/ChunkFile.h:180
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid ""
|
msgid ""
|
||||||
|
<<<<<<< HEAD
|
||||||
"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
|
"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
|
||||||
"Aborting savestate load..."
|
"Aborting savestate load..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2160,6 +2274,8 @@ msgstr ""
|
||||||
#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279
|
#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid ""
|
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 "
|
"Error: Trying to access %s fonts but they are not loaded. Games may not show "
|
||||||
"fonts correctly, or crash."
|
"fonts correctly, or crash."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2603,9 +2719,15 @@ msgstr "Frames a grabar"
|
||||||
msgid "Free Look"
|
msgid "Free Look"
|
||||||
msgstr "Cámara libre"
|
msgstr "Cámara libre"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "French"
|
msgid "French"
|
||||||
msgstr "Francés"
|
msgstr "Francés"
|
||||||
|
|
||||||
|
|
@ -2672,7 +2794,11 @@ msgid "Gamecube &Pad Settings"
|
||||||
msgstr "&Configuración del mando Gamecube"
|
msgstr "&Configuración del mando Gamecube"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
||||||
msgstr "Tarjetas de memoria de Gamecube (*.raw,*.gcp)"
|
msgstr "Tarjetas de memoria de Gamecube (*.raw,*.gcp)"
|
||||||
|
|
||||||
|
|
@ -2695,8 +2821,12 @@ msgstr ""
|
||||||
"(puede ser un código incorrecto o su tipo no es soportado todavía.)"
|
"(puede ser un código incorrecto o su tipo no es soportado todavía.)"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
||||||
msgid "General"
|
msgid "General"
|
||||||
msgstr "General"
|
msgstr "General"
|
||||||
|
|
@ -2705,9 +2835,15 @@ msgstr "General"
|
||||||
msgid "General Settings"
|
msgid "General Settings"
|
||||||
msgstr "Ajustes generales"
|
msgstr "Ajustes generales"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "German"
|
msgid "German"
|
||||||
msgstr "Alemán"
|
msgstr "Alemán"
|
||||||
|
|
||||||
|
|
@ -2730,6 +2866,10 @@ msgid "Greater Than"
|
||||||
msgstr "Mayor que"
|
msgstr "Mayor que"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
#, fuzzy
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Greatly increases quality of textures generated using render to texture "
|
"Greatly increases quality of textures generated using render to texture "
|
||||||
"effects.\n"
|
"effects.\n"
|
||||||
|
|
@ -2739,10 +2879,17 @@ msgid ""
|
||||||
"\n"
|
"\n"
|
||||||
"If unsure, leave this checked."
|
"If unsure, leave this checked."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
<<<<<<< HEAD
|
||||||
"Mejora bastante la calidad de las texturas generadas usando los efectos de "
|
"Mejora bastante la calidad de las texturas generadas usando los efectos de "
|
||||||
"renderización para la textura.\n"
|
"renderización para la textura.\n"
|
||||||
"Aumentar la resolución interna va a mejorar el efecto de este ajuste.\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 "
|
"Reduce ligeramente el desempeño y posiblemente cause fallos (altamente "
|
||||||
|
=======
|
||||||
|
"Aumenta bastante la calidad de las texturas generadas utilizando los efectos "
|
||||||
|
"de renderización para la textura.\n"
|
||||||
|
"Aumentar la resolución interna va a mejorar el efecto de esta definición.\n"
|
||||||
|
"Diminuye ligeramente el desempenño y probablemente provoca fallos (aunque es "
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
"improbable).\n"
|
"improbable).\n"
|
||||||
"\n"
|
"\n"
|
||||||
"Si está inseguro, déjelo marcado."
|
"Si está inseguro, déjelo marcado."
|
||||||
|
|
@ -2840,8 +2987,12 @@ msgid "Hotkey Configuration"
|
||||||
msgstr "Configuración de atajos"
|
msgstr "Configuración de atajos"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Hotkeys"
|
msgid "Hotkeys"
|
||||||
msgstr "Atajos"
|
msgstr "Atajos"
|
||||||
|
|
||||||
|
|
@ -2922,7 +3073,11 @@ msgstr ""
|
||||||
"Si los FPS son erróneos, esta opción puede ayudar. (ON = Compatible, OFF = "
|
"Si los FPS son erróneos, esta opción puede ayudar. (ON = Compatible, OFF = "
|
||||||
"Rápido)"
|
"Rápido)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you "
|
"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."
|
"also have to disable Audio Throttle in DSP to make it effective."
|
||||||
|
|
@ -3066,7 +3221,11 @@ msgstr ""
|
||||||
"Se ha llamado InstallExceptionHandler, pero esta plataforma no lo soporta "
|
"Se ha llamado InstallExceptionHandler, pero esta plataforma no lo soporta "
|
||||||
"todavía."
|
"todavía."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Installing WAD..."
|
msgid "Installing WAD..."
|
||||||
msgstr "Instalando WAD..."
|
msgstr "Instalando WAD..."
|
||||||
|
|
||||||
|
|
@ -3148,9 +3307,15 @@ msgstr "Archivo de grabación no válido"
|
||||||
msgid "Invalid state"
|
msgid "Invalid state"
|
||||||
msgstr "Estado no válido"
|
msgstr "Estado no válido"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Italian"
|
msgid "Italian"
|
||||||
msgstr "Italiano"
|
msgstr "Italiano"
|
||||||
|
|
||||||
|
|
@ -3308,11 +3473,19 @@ msgstr "&Cargar estado 8"
|
||||||
msgid "Load State..."
|
msgid "Load State..."
|
||||||
msgstr "Cargar estado..."
|
msgstr "Cargar estado..."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
msgid "Load Wii System Menu"
|
msgid "Load Wii System Menu"
|
||||||
msgstr "Cargar Menú de sistema Wii"
|
msgstr "Cargar Menú de sistema Wii"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
|
||||||
|
msgid "Load Wii System Menu"
|
||||||
|
msgstr "Cargar Menú de sistema Wii"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Load Wii System Menu %d%c"
|
msgid "Load Wii System Menu %d%c"
|
||||||
msgstr "Cargar Menú de sistema Wii %d %c"
|
msgstr "Cargar Menú de sistema Wii %d %c"
|
||||||
|
|
@ -3394,7 +3567,11 @@ msgstr "Hack de velocidad MMU"
|
||||||
msgid "MadCatz Gameshark files(*.gcs)"
|
msgid "MadCatz Gameshark files(*.gcs)"
|
||||||
msgstr "Archivos MadCatz Gameshark (*.gcs)"
|
msgstr "Archivos MadCatz Gameshark (*.gcs)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
||||||
msgid "Main Stick"
|
msgid "Main Stick"
|
||||||
msgstr "Stick principal"
|
msgstr "Stick principal"
|
||||||
|
|
@ -3425,7 +3602,11 @@ msgid "Memory Byte"
|
||||||
msgstr "Byte de memoria"
|
msgstr "Byte de memoria"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Memory Card"
|
msgid "Memory Card"
|
||||||
msgstr "Tarjeta de memoria"
|
msgstr "Tarjeta de memoria"
|
||||||
|
|
||||||
|
|
@ -3523,9 +3704,12 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Mueva el puntero del ratón sobre una opción para obtener una descripción "
|
"Mueva el puntero del ratón sobre una opción para obtener una descripción "
|
||||||
"detallada.\n"
|
"detallada.\n"
|
||||||
|
<<<<<<< HEAD
|
||||||
"\n"
|
"\n"
|
||||||
"\n"
|
"\n"
|
||||||
"\n"
|
"\n"
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
"\n"
|
"\n"
|
||||||
"\n"
|
"\n"
|
||||||
"\n"
|
"\n"
|
||||||
|
|
@ -3626,7 +3810,11 @@ msgstr "NP Tab"
|
||||||
msgid "NP Up"
|
msgid "NP Up"
|
||||||
msgstr "NP Arriba"
|
msgstr "NP Arriba"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
||||||
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
||||||
msgid "Name:"
|
msgid "Name:"
|
||||||
|
|
@ -3713,7 +3901,11 @@ msgstr "No Igual"
|
||||||
msgid "Not Set"
|
msgid "Not Set"
|
||||||
msgstr "No Definido"
|
msgstr "No Definido"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Not connected"
|
msgid "Not connected"
|
||||||
msgstr "Sin conectar"
|
msgstr "Sin conectar"
|
||||||
|
|
||||||
|
|
@ -3774,7 +3966,10 @@ msgstr "Solo %d bloques disponibles"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Open"
|
msgid "Open"
|
||||||
msgstr "Abrir"
|
msgstr "Abrir"
|
||||||
|
|
||||||
|
|
@ -3906,8 +4101,13 @@ msgstr "Parches"
|
||||||
msgid "Paths"
|
msgid "Paths"
|
||||||
msgstr "Directorios"
|
msgstr "Directorios"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
||||||
msgid "Pause"
|
msgid "Pause"
|
||||||
msgstr "Pausa"
|
msgstr "Pausa"
|
||||||
|
|
@ -3927,8 +4127,13 @@ msgstr "Perspectiva %d"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Play"
|
msgid "Play"
|
||||||
msgstr "Reproducir"
|
msgstr "Reproducir"
|
||||||
|
|
||||||
|
|
@ -3954,7 +4159,11 @@ msgstr "Opciones de reproducción"
|
||||||
msgid "Players"
|
msgid "Players"
|
||||||
msgstr "Jugadores"
|
msgstr "Jugadores"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Please confirm..."
|
msgid "Please confirm..."
|
||||||
msgstr "Confirme, por favor..."
|
msgstr "Confirme, por favor..."
|
||||||
|
|
||||||
|
|
@ -4165,10 +4374,17 @@ msgstr "Actualizar lista"
|
||||||
msgid "Refresh game list"
|
msgid "Refresh game list"
|
||||||
msgstr "Actualizar lista de juegos"
|
msgstr "Actualizar lista de juegos"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434
|
||||||
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Remove"
|
msgid "Remove"
|
||||||
msgstr "Eliminar"
|
msgstr "Eliminar"
|
||||||
|
|
||||||
|
|
@ -4187,7 +4403,10 @@ msgid "Render to Main Window"
|
||||||
msgstr "Renderizar a ventana principal"
|
msgstr "Renderizar a ventana principal"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
||||||
msgid "Reset"
|
msgid "Reset"
|
||||||
msgstr "Reiniciar"
|
msgstr "Reiniciar"
|
||||||
|
|
@ -4230,7 +4449,11 @@ msgstr "Guardar estado"
|
||||||
msgid "Safe"
|
msgid "Safe"
|
||||||
msgstr "Seguro"
|
msgstr "Seguro"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Sample Rate:"
|
msgid "Sample Rate:"
|
||||||
msgstr "Frecuencia del sonido:"
|
msgstr "Frecuencia del sonido:"
|
||||||
|
|
||||||
|
|
@ -4356,12 +4579,21 @@ msgstr "No se ha encontrado la sección %s en SYSCONF"
|
||||||
msgid "Select"
|
msgid "Select"
|
||||||
msgstr "Seleccionar"
|
msgstr "Seleccionar"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
||||||
msgid "Select The Recording File"
|
msgid "Select The Recording File"
|
||||||
msgstr "Seleccionar archivo de grabación"
|
msgstr "Seleccionar archivo de grabación"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:740
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142
|
||||||
|
msgid "Select The Recording File"
|
||||||
|
msgstr "Seleccionar archivo de grabación"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Select a Wii WAD file to install"
|
msgid "Select a Wii WAD file to install"
|
||||||
msgstr "Elige un WAD de Wii para instalar"
|
msgstr "Elige un WAD de Wii para instalar"
|
||||||
|
|
||||||
|
|
@ -4387,6 +4619,7 @@ msgstr "Selecciona las ventanas flotantes"
|
||||||
msgid "Select the file to load"
|
msgid "Select the file to load"
|
||||||
msgstr "Selecciona el archivo para cargar"
|
msgstr "Selecciona el archivo para cargar"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
msgstr "Selecciona el archivo de guardado"
|
msgstr "Selecciona el archivo de guardado"
|
||||||
|
|
@ -4396,6 +4629,17 @@ msgid "Select the state to load"
|
||||||
msgstr "Selecciona el estado para cargar"
|
msgstr "Selecciona el estado para cargar"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
||||||
|
msgid "Select the save file"
|
||||||
|
msgstr "Selecciona el archivo de guardado"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457
|
||||||
|
msgid "Select the state to load"
|
||||||
|
msgstr "Selecciona el estado para cargar"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Select the state to save"
|
msgid "Select the state to save"
|
||||||
msgstr "Selecciona el estado para guardar"
|
msgstr "Selecciona el estado para guardar"
|
||||||
|
|
||||||
|
|
@ -4470,7 +4714,11 @@ msgstr "Separador"
|
||||||
msgid "Serbian"
|
msgid "Serbian"
|
||||||
msgstr "Serbio"
|
msgstr "Serbio"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Serial Port 1 - This is the port which devices such as the net adapter use"
|
"Serial Port 1 - This is the port which devices such as the net adapter use"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -4699,6 +4947,7 @@ msgid "Skip EFB Access from CPU"
|
||||||
msgstr "Saltar el acceso al EFB desde la CPU"
|
msgstr "Saltar el acceso al EFB desde la CPU"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
|
||||||
|
<<<<<<< HEAD
|
||||||
msgid ""
|
msgid ""
|
||||||
"Skip the destination alpha pass used in many games for various graphical "
|
"Skip the destination alpha pass used in many games for various graphical "
|
||||||
"effects.\n"
|
"effects.\n"
|
||||||
|
|
@ -4719,6 +4968,28 @@ msgid ""
|
||||||
"\n"
|
"\n"
|
||||||
"If unsure, leave this unchecked."
|
"If unsure, leave this unchecked."
|
||||||
msgstr ""
|
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 "
|
"Aumenta ligeramente las copias de EFB a la RAM al sacrificar exactitud de "
|
||||||
"emulación.\n"
|
"emulación.\n"
|
||||||
"A veces también aumenta la calidad visual.\n"
|
"A veces también aumenta la calidad visual.\n"
|
||||||
|
|
@ -4779,9 +5050,15 @@ msgstr "Falló la creación del búfer de sonido: %s"
|
||||||
msgid "Space"
|
msgid "Space"
|
||||||
msgstr "Espacio"
|
msgstr "Espacio"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Spanish"
|
msgid "Spanish"
|
||||||
msgstr "Español"
|
msgstr "Español"
|
||||||
|
|
||||||
|
|
@ -4825,7 +5102,11 @@ msgstr "Stick cuadrado"
|
||||||
msgid "Standard Controller"
|
msgid "Standard Controller"
|
||||||
msgstr "Control estándar"
|
msgstr "Control estándar"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
||||||
msgid "Start"
|
msgid "Start"
|
||||||
|
|
@ -4860,7 +5141,10 @@ msgstr "Stick"
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
||||||
msgid "Stop"
|
msgid "Stop"
|
||||||
msgstr "Detener"
|
msgstr "Detener"
|
||||||
|
|
@ -4940,7 +5224,10 @@ msgstr "Tabla derecha"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Take Screenshot"
|
msgid "Take Screenshot"
|
||||||
msgstr "Captura de pantalla"
|
msgstr "Captura de pantalla"
|
||||||
|
|
||||||
|
|
@ -5191,12 +5478,19 @@ msgstr "Alternar todos los tipos de registro"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Toggle Fullscreen"
|
msgid "Toggle Fullscreen"
|
||||||
msgstr "Cambiar a pantalla completa"
|
msgstr "Cambiar a pantalla completa"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Top"
|
msgid "Top"
|
||||||
msgstr "Superior"
|
msgstr "Superior"
|
||||||
|
|
||||||
|
|
@ -5303,6 +5597,17 @@ msgstr "Se recibió un mensaje desconocido de id: %d"
|
||||||
#: Source/Core/Core/Src/NetPlayServer.cpp:504
|
#: Source/Core/Core/Src/NetPlayServer.cpp:504
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
msgstr ""
|
||||||
|
"Mensaje desconocido con id:%d recibido del jugador:%d ¡Echando al jugador!"
|
||||||
|
|
||||||
|
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
||||||
|
#, c-format
|
||||||
|
msgid ""
|
||||||
|
"Unknown pointer %#08x\n"
|
||||||
|
"Continue?"
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Mensaje desconocido con id:%d recibido del jugador:%d ¡Echando al jugador!"
|
"Mensaje desconocido con id:%d recibido del jugador:%d ¡Echando al jugador!"
|
||||||
|
|
||||||
|
|
@ -5532,7 +5837,11 @@ msgstr "Raíz de la NAND de Wii:"
|
||||||
msgid "Wii Save Import"
|
msgid "Wii Save Import"
|
||||||
msgstr "Importar guardado de Wii"
|
msgstr "Importar guardado de Wii"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wii save files (*.bin)|*.bin"
|
msgid "Wii save files (*.bin)|*.bin"
|
||||||
msgstr "Archivos de guardado Wii (*.bin)|*.bin"
|
msgstr "Archivos de guardado Wii (*.bin)|*.bin"
|
||||||
|
|
||||||
|
|
@ -5563,7 +5872,11 @@ msgstr ""
|
||||||
"o mucho tiempo de espera, o alguna otra razón.\n"
|
"o mucho tiempo de espera, o alguna otra razón.\n"
|
||||||
"¿Desea reconectarlo inmediatamente?"
|
"¿Desea reconectarlo inmediatamente?"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wiimote Connected"
|
msgid "Wiimote Connected"
|
||||||
msgstr "Wiimote conectado"
|
msgstr "Wiimote conectado"
|
||||||
|
|
||||||
|
|
@ -5595,9 +5908,15 @@ msgstr "Windows Derecha"
|
||||||
msgid "Word Wrap"
|
msgid "Word Wrap"
|
||||||
msgstr "Word Wrap"
|
msgstr "Word Wrap"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Working..."
|
msgid "Working..."
|
||||||
msgstr "Trabajando..."
|
msgstr "Trabajando..."
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,8 +7,13 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: Dolphin Emu\n"
|
"Project-Id-Version: Dolphin Emu\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
"PO-Revision-Date: 2011-10-28 23:40+0100\n"
|
"PO-Revision-Date: 2011-10-28 23:40+0100\n"
|
||||||
|
=======
|
||||||
|
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
||||||
|
"PO-Revision-Date: 2011-08-10 17:42+0100\n"
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
"Last-Translator: Pascal\n"
|
"Last-Translator: Pascal\n"
|
||||||
"Language-Team: \n"
|
"Language-Team: \n"
|
||||||
"Language: French\n"
|
"Language: French\n"
|
||||||
|
|
@ -429,6 +434,10 @@ msgid "Accurate VBeam emulation"
|
||||||
msgstr "Emulation fidèle VBeam"
|
msgstr "Emulation fidèle VBeam"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
#, fuzzy
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Accurately emulate EFB copies.\n"
|
"Accurately emulate EFB copies.\n"
|
||||||
"Some games depend on this for certain graphical effects or gameplay "
|
"Some games depend on this for certain graphical effects or gameplay "
|
||||||
|
|
@ -556,9 +565,15 @@ msgstr "Ajouter un patch"
|
||||||
msgid "Add new pane"
|
msgid "Add new pane"
|
||||||
msgstr "Ajouter un nouveau panneau"
|
msgstr "Ajouter un nouveau panneau"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Add..."
|
msgid "Add..."
|
||||||
msgstr "Ajouter..."
|
msgstr "Ajouter..."
|
||||||
|
|
||||||
|
|
@ -627,8 +642,13 @@ msgstr "Toutes les images GC/Wii (gcm, iso, ciso, gcz)"
|
||||||
msgid "All Gamecube GCM files (gcm)"
|
msgid "All Gamecube GCM files (gcm)"
|
||||||
msgstr "Tous les fichiers GameCube GCM (gcm)"
|
msgstr "Tous les fichiers GameCube GCM (gcm)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "All Save States (sav, s##)"
|
msgid "All Save States (sav, s##)"
|
||||||
msgstr "Tous les états sauvegardés (sav, s##)"
|
msgstr "Tous les états sauvegardés (sav, s##)"
|
||||||
|
|
||||||
|
|
@ -657,8 +677,14 @@ msgstr ""
|
||||||
"Dans le doute, décochez cette case."
|
"Dans le doute, décochez cette case."
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
|
||||||
|
<<<<<<< HEAD
|
||||||
msgid "Alternate Wiimote Timing"
|
msgid "Alternate Wiimote Timing"
|
||||||
msgstr "Délai alternatif de communication avec la Wiimote"
|
msgstr "Délai alternatif de communication avec la Wiimote"
|
||||||
|
=======
|
||||||
|
#, fuzzy
|
||||||
|
msgid "Alternate Wiimote Timing"
|
||||||
|
msgstr "Wiimote émulée"
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372
|
||||||
msgid "Anisotropic Filtering:"
|
msgid "Anisotropic Filtering:"
|
||||||
|
|
@ -718,7 +744,11 @@ msgstr ""
|
||||||
"Êtes-vous sûr de vouloir supprimer ce fichier ? Il sera supprimé "
|
"Êtes-vous sûr de vouloir supprimer ce fichier ? Il sera supprimé "
|
||||||
"définitivement !"
|
"définitivement !"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
||||||
msgid "Aspect Ratio:"
|
msgid "Aspect Ratio:"
|
||||||
msgstr "Format d'écran :"
|
msgstr "Format d'écran :"
|
||||||
|
|
@ -739,7 +769,11 @@ msgstr "Moteur audio :"
|
||||||
msgid "AudioCommon: Error opening AO device.\n"
|
msgid "AudioCommon: Error opening AO device.\n"
|
||||||
msgstr "AudioCommon : impossible d'ouvrir le périphérique AO.\n"
|
msgstr "AudioCommon : impossible d'ouvrir le périphérique AO.\n"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
||||||
msgid "Auto"
|
msgid "Auto"
|
||||||
msgstr "Auto"
|
msgstr "Auto"
|
||||||
|
|
@ -858,7 +892,11 @@ msgid "Blue Right"
|
||||||
msgstr "Bleu Droite"
|
msgstr "Bleu Droite"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Bottom"
|
msgid "Bottom"
|
||||||
msgstr "Bas"
|
msgstr "Bas"
|
||||||
|
|
||||||
|
|
@ -891,7 +929,11 @@ msgstr "Parcourir un dossier de destination"
|
||||||
msgid "Buffer:"
|
msgid "Buffer:"
|
||||||
msgstr "Buffer :"
|
msgstr "Buffer :"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
||||||
msgid "Buttons"
|
msgid "Buttons"
|
||||||
|
|
@ -1099,7 +1141,11 @@ msgstr "Choisir un fichier à ouvrir"
|
||||||
msgid "Choose a memory card:"
|
msgid "Choose a memory card:"
|
||||||
msgstr "Choisir une carte mémoire :"
|
msgstr "Choisir une carte mémoire :"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Choose file to use as apploader: (applies to discs constructed from "
|
"Choose file to use as apploader: (applies to discs constructed from "
|
||||||
"directories only)"
|
"directories only)"
|
||||||
|
|
@ -1141,7 +1187,11 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
||||||
msgid "Close"
|
msgid "Close"
|
||||||
msgstr "Fermer"
|
msgstr "Fermer"
|
||||||
|
|
@ -1250,7 +1300,11 @@ msgstr "Connecter la 3è Wiimote"
|
||||||
msgid "Connect Wiimote 4"
|
msgid "Connect Wiimote 4"
|
||||||
msgstr "Connecter la 4è Wiimote"
|
msgstr "Connecter la 4è Wiimote"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Connecting..."
|
msgid "Connecting..."
|
||||||
msgstr "Connexion..."
|
msgstr "Connexion..."
|
||||||
|
|
||||||
|
|
@ -1369,7 +1423,11 @@ msgstr "Créer une nouvelle perspective"
|
||||||
msgid "Created by KDE-Look.org"
|
msgid "Created by KDE-Look.org"
|
||||||
msgstr "Créé par KDE-Look.org"
|
msgstr "Créé par KDE-Look.org"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]"
|
"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -1443,7 +1501,11 @@ msgid "DSP Emulator Engine"
|
||||||
msgstr "Moteur d'émulation du DSP (Audio)"
|
msgstr "Moteur d'émulation du DSP (Audio)"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "DSP HLE emulation (fast)"
|
msgid "DSP HLE emulation (fast)"
|
||||||
msgstr "Emulation du DSP en HLE (rapide)"
|
msgstr "Emulation du DSP en HLE (rapide)"
|
||||||
|
|
||||||
|
|
@ -1674,7 +1736,11 @@ msgstr ""
|
||||||
msgid "Divide"
|
msgid "Divide"
|
||||||
msgstr "Diviser"
|
msgstr "Diviser"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Do you want to stop the current emulation?"
|
msgid "Do you want to stop the current emulation?"
|
||||||
msgstr "Voulez-vous arrêter l'émulation en cours ?"
|
msgstr "Voulez-vous arrêter l'émulation en cours ?"
|
||||||
|
|
||||||
|
|
@ -1703,12 +1769,21 @@ msgstr "Configuration de la Wiimote pour Dolphin"
|
||||||
msgid "Dolphin FIFO"
|
msgid "Dolphin FIFO"
|
||||||
msgstr "Dolphin FIFO"
|
msgstr "Dolphin FIFO"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
msgid "Dolphin GCPad Configuration"
|
msgid "Dolphin GCPad Configuration"
|
||||||
msgstr "Configuration de la manette GC pour Dolphin"
|
msgstr "Configuration de la manette GC pour Dolphin"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204
|
||||||
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
msgstr "Configuration de la manette GC pour Dolphin"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Dolphin TAS Movies (*.dtm)"
|
msgid "Dolphin TAS Movies (*.dtm)"
|
||||||
msgstr "Films TAS Dolphin (*.dtm)"
|
msgstr "Films TAS Dolphin (*.dtm)"
|
||||||
|
|
||||||
|
|
@ -1720,7 +1795,11 @@ msgstr "Configuration de la Wiimote pour Dolphin"
|
||||||
msgid "Dolphin at &Google Code"
|
msgid "Dolphin at &Google Code"
|
||||||
msgstr "Dolphin dans &Google Code"
|
msgstr "Dolphin dans &Google Code"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for "
|
"Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for "
|
||||||
"files..."
|
"files..."
|
||||||
|
|
@ -1728,7 +1807,11 @@ msgstr ""
|
||||||
"Dolphin n'a pas trouvé d'ISO GC/Wii. Double-cliquez ici pour chercher des "
|
"Dolphin n'a pas trouvé d'ISO GC/Wii. Double-cliquez ici pour chercher des "
|
||||||
"fichiers..."
|
"fichiers..."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Dolphin is currently set to hide all games. Doubleclick here to show all "
|
"Dolphin is currently set to hide all games. Doubleclick here to show all "
|
||||||
"games..."
|
"games..."
|
||||||
|
|
@ -1805,9 +1888,15 @@ msgstr ""
|
||||||
"\n"
|
"\n"
|
||||||
"Dans le doute, décochez cette case."
|
"Dans le doute, décochez cette case."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Dutch"
|
msgid "Dutch"
|
||||||
msgstr "Néerlandais"
|
msgstr "Néerlandais"
|
||||||
|
|
||||||
|
|
@ -1951,15 +2040,22 @@ msgstr "Activer BAT"
|
||||||
msgid "Enable Block Merging"
|
msgid "Enable Block Merging"
|
||||||
msgstr "Activer l'assemblage de blocs"
|
msgstr "Activer l'assemblage de blocs"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
||||||
msgid "Enable Bounding Box Calculation"
|
msgid "Enable Bounding Box Calculation"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
||||||
msgid "Enable Cache"
|
msgid "Enable Cache"
|
||||||
msgstr "Activer le cache"
|
msgstr "Activer le cache"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Enable Cheats"
|
msgid "Enable Cheats"
|
||||||
msgstr "Activer les Cheats"
|
msgstr "Activer les Cheats"
|
||||||
|
|
||||||
|
|
@ -2060,7 +2156,11 @@ msgstr ""
|
||||||
"\n"
|
"\n"
|
||||||
"Dans le doute, décochez cette case."
|
"Dans le doute, décochez cette case."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
|
"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
|
||||||
"ANY other game."
|
"ANY other game."
|
||||||
|
|
@ -2116,9 +2216,15 @@ msgstr ""
|
||||||
msgid "End"
|
msgid "End"
|
||||||
msgstr "Fin"
|
msgstr "Fin"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "English"
|
msgid "English"
|
||||||
msgstr "Anglais"
|
msgstr "Anglais"
|
||||||
|
|
||||||
|
|
@ -2147,6 +2253,7 @@ msgstr "Egal"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
msgid "Error"
|
msgid "Error"
|
||||||
msgstr "Erreur"
|
msgstr "Erreur"
|
||||||
|
|
@ -2158,6 +2265,12 @@ msgid ""
|
||||||
"Sorry, Wii recording is temporarily broken."
|
"Sorry, Wii recording is temporarily broken."
|
||||||
msgstr ""
|
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
|
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
||||||
msgid "Error loading selected language. Falling back to system default."
|
msgid "Error loading selected language. Falling back to system default."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2167,6 +2280,7 @@ msgstr ""
|
||||||
#: Source/Core/Common/Src/ChunkFile.h:180
|
#: Source/Core/Common/Src/ChunkFile.h:180
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid ""
|
msgid ""
|
||||||
|
<<<<<<< HEAD
|
||||||
"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
|
"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
|
||||||
"Aborting savestate load..."
|
"Aborting savestate load..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2174,6 +2288,8 @@ msgstr ""
|
||||||
#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279
|
#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid ""
|
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 "
|
"Error: Trying to access %s fonts but they are not loaded. Games may not show "
|
||||||
"fonts correctly, or crash."
|
"fonts correctly, or crash."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2619,9 +2735,15 @@ msgstr "Images à enregistrer :"
|
||||||
msgid "Free Look"
|
msgid "Free Look"
|
||||||
msgstr "Vue libre"
|
msgstr "Vue libre"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "French"
|
msgid "French"
|
||||||
msgstr "Français"
|
msgstr "Français"
|
||||||
|
|
||||||
|
|
@ -2688,7 +2810,11 @@ msgid "Gamecube &Pad Settings"
|
||||||
msgstr "Paramètres de la &manette GameCube"
|
msgstr "Paramètres de la &manette GameCube"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
||||||
msgstr "Carte mémoires de GameCube (*.raw,*.gcp)"
|
msgstr "Carte mémoires de GameCube (*.raw,*.gcp)"
|
||||||
|
|
||||||
|
|
@ -2711,8 +2837,12 @@ msgstr ""
|
||||||
"(ou c'est un mauvais code, ou il n'est pas encore pris en charge.)"
|
"(ou c'est un mauvais code, ou il n'est pas encore pris en charge.)"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
||||||
msgid "General"
|
msgid "General"
|
||||||
msgstr "Général"
|
msgstr "Général"
|
||||||
|
|
@ -2721,9 +2851,15 @@ msgstr "Général"
|
||||||
msgid "General Settings"
|
msgid "General Settings"
|
||||||
msgstr "Paramètres généraux"
|
msgstr "Paramètres généraux"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "German"
|
msgid "German"
|
||||||
msgstr "Allemand"
|
msgstr "Allemand"
|
||||||
|
|
||||||
|
|
@ -2746,6 +2882,10 @@ msgid "Greater Than"
|
||||||
msgstr "Plus grand que"
|
msgstr "Plus grand que"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
#, fuzzy
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Greatly increases quality of textures generated using render to texture "
|
"Greatly increases quality of textures generated using render to texture "
|
||||||
"effects.\n"
|
"effects.\n"
|
||||||
|
|
@ -2759,8 +2899,11 @@ msgstr ""
|
||||||
"effets de rendu vers texture.\n"
|
"effets de rendu vers texture.\n"
|
||||||
"Le fait d'augmenter la résolution interne améliore l'impact de cette "
|
"Le fait d'augmenter la résolution interne améliore l'impact de cette "
|
||||||
"option.\n"
|
"option.\n"
|
||||||
|
<<<<<<< HEAD
|
||||||
"Baisse légèrement les performances et peut provoquer quelques pépins (mais "
|
"Baisse légèrement les performances et peut provoquer quelques pépins (mais "
|
||||||
"peu probable).\n"
|
"peu probable).\n"
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
"\n"
|
"\n"
|
||||||
"Dans le doute, cochez cette case."
|
"Dans le doute, cochez cette case."
|
||||||
|
|
||||||
|
|
@ -2859,8 +3002,12 @@ msgid "Hotkey Configuration"
|
||||||
msgstr "Configuration des raccourcis clavier"
|
msgstr "Configuration des raccourcis clavier"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Hotkeys"
|
msgid "Hotkeys"
|
||||||
msgstr "Raccourcis clavier"
|
msgstr "Raccourcis clavier"
|
||||||
|
|
||||||
|
|
@ -2941,7 +3088,11 @@ msgstr ""
|
||||||
"Si les FPS ne sont pas corrects, cette option peut résoudre le souci. (ON = "
|
"Si les FPS ne sont pas corrects, cette option peut résoudre le souci. (ON = "
|
||||||
"Compatible, OFF = Vitesse)"
|
"Compatible, OFF = Vitesse)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you "
|
"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."
|
"also have to disable Audio Throttle in DSP to make it effective."
|
||||||
|
|
@ -3085,7 +3236,11 @@ msgstr ""
|
||||||
"InstallExceptionHandler a été appelé, mais cette plateforme ne le prend pas "
|
"InstallExceptionHandler a été appelé, mais cette plateforme ne le prend pas "
|
||||||
"encore en charge."
|
"encore en charge."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Installing WAD..."
|
msgid "Installing WAD..."
|
||||||
msgstr "Installation du WAD..."
|
msgstr "Installation du WAD..."
|
||||||
|
|
||||||
|
|
@ -3167,9 +3322,15 @@ msgstr "Fichier d'enregitrement non valide"
|
||||||
msgid "Invalid state"
|
msgid "Invalid state"
|
||||||
msgstr "Etat non valide"
|
msgstr "Etat non valide"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Italian"
|
msgid "Italian"
|
||||||
msgstr "Italien"
|
msgstr "Italien"
|
||||||
|
|
||||||
|
|
@ -3327,11 +3488,19 @@ msgstr "Charger l'état du Slot 8"
|
||||||
msgid "Load State..."
|
msgid "Load State..."
|
||||||
msgstr "Charger un état..."
|
msgstr "Charger un état..."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
msgid "Load Wii System Menu"
|
msgid "Load Wii System Menu"
|
||||||
msgstr "Charger le Menu Système Wii"
|
msgstr "Charger le Menu Système Wii"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
|
||||||
|
msgid "Load Wii System Menu"
|
||||||
|
msgstr "Charger le Menu Système Wii"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Load Wii System Menu %d%c"
|
msgid "Load Wii System Menu %d%c"
|
||||||
msgstr "Charger le Menu Système Wii %d%c"
|
msgstr "Charger le Menu Système Wii %d%c"
|
||||||
|
|
@ -3415,7 +3584,11 @@ msgstr "Hack de vitesse pour le MMU"
|
||||||
msgid "MadCatz Gameshark files(*.gcs)"
|
msgid "MadCatz Gameshark files(*.gcs)"
|
||||||
msgstr "Fichiers MadCatz Gameshark (*.gcs)"
|
msgstr "Fichiers MadCatz Gameshark (*.gcs)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
||||||
msgid "Main Stick"
|
msgid "Main Stick"
|
||||||
msgstr "Stick principal"
|
msgstr "Stick principal"
|
||||||
|
|
@ -3446,7 +3619,11 @@ msgid "Memory Byte"
|
||||||
msgstr "Octet mémoire"
|
msgstr "Octet mémoire"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Memory Card"
|
msgid "Memory Card"
|
||||||
msgstr "Carte mémoire"
|
msgstr "Carte mémoire"
|
||||||
|
|
||||||
|
|
@ -3647,7 +3824,11 @@ msgstr "NP Tabulation"
|
||||||
msgid "NP Up"
|
msgid "NP Up"
|
||||||
msgstr "NP Haut"
|
msgstr "NP Haut"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
||||||
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
||||||
msgid "Name:"
|
msgid "Name:"
|
||||||
|
|
@ -3734,7 +3915,11 @@ msgstr "Différent"
|
||||||
msgid "Not Set"
|
msgid "Not Set"
|
||||||
msgstr "Non défini"
|
msgstr "Non défini"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Not connected"
|
msgid "Not connected"
|
||||||
msgstr "Non connectée"
|
msgstr "Non connectée"
|
||||||
|
|
||||||
|
|
@ -3795,7 +3980,10 @@ msgstr "%d blocs disponibles seulement"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Open"
|
msgid "Open"
|
||||||
msgstr "Ouvrir"
|
msgstr "Ouvrir"
|
||||||
|
|
||||||
|
|
@ -3927,8 +4115,13 @@ msgstr "Patchs"
|
||||||
msgid "Paths"
|
msgid "Paths"
|
||||||
msgstr "Chemins"
|
msgstr "Chemins"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
||||||
msgid "Pause"
|
msgid "Pause"
|
||||||
msgstr "Pause"
|
msgstr "Pause"
|
||||||
|
|
@ -3948,8 +4141,13 @@ msgstr "Perspective %d"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Play"
|
msgid "Play"
|
||||||
msgstr "Démarrer"
|
msgstr "Démarrer"
|
||||||
|
|
||||||
|
|
@ -3975,7 +4173,11 @@ msgstr "Options de lecture"
|
||||||
msgid "Players"
|
msgid "Players"
|
||||||
msgstr "Joueurs"
|
msgstr "Joueurs"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Please confirm..."
|
msgid "Please confirm..."
|
||||||
msgstr "Veuillez confirmer..."
|
msgstr "Veuillez confirmer..."
|
||||||
|
|
||||||
|
|
@ -4187,10 +4389,17 @@ msgstr "Rafraîchir la liste"
|
||||||
msgid "Refresh game list"
|
msgid "Refresh game list"
|
||||||
msgstr "Rafraîchir la liste des jeux"
|
msgstr "Rafraîchir la liste des jeux"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434
|
||||||
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Remove"
|
msgid "Remove"
|
||||||
msgstr "Retirer"
|
msgstr "Retirer"
|
||||||
|
|
||||||
|
|
@ -4209,7 +4418,10 @@ msgid "Render to Main Window"
|
||||||
msgstr "Rendu dans la fenêtre principale"
|
msgstr "Rendu dans la fenêtre principale"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
||||||
msgid "Reset"
|
msgid "Reset"
|
||||||
msgstr "Reset"
|
msgstr "Reset"
|
||||||
|
|
@ -4252,7 +4464,11 @@ msgstr "Sau&vegarder l'état"
|
||||||
msgid "Safe"
|
msgid "Safe"
|
||||||
msgstr "Sûr "
|
msgstr "Sûr "
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Sample Rate:"
|
msgid "Sample Rate:"
|
||||||
msgstr "Echantillonnage :"
|
msgstr "Echantillonnage :"
|
||||||
|
|
||||||
|
|
@ -4378,12 +4594,21 @@ msgstr "La section %s n'a pas été trouvée dans SYSCONF"
|
||||||
msgid "Select"
|
msgid "Select"
|
||||||
msgstr "Select"
|
msgstr "Select"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
||||||
msgid "Select The Recording File"
|
msgid "Select The Recording File"
|
||||||
msgstr "Sélectionner le fichier d'enregistrement"
|
msgstr "Sélectionner le fichier d'enregistrement"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:740
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142
|
||||||
|
msgid "Select The Recording File"
|
||||||
|
msgstr "Sélectionner le fichier d'enregistrement"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Select a Wii WAD file to install"
|
msgid "Select a Wii WAD file to install"
|
||||||
msgstr "Sélectionner un fichier WAD de Wii à installer"
|
msgstr "Sélectionner un fichier WAD de Wii à installer"
|
||||||
|
|
||||||
|
|
@ -4409,6 +4634,7 @@ msgstr "Sélectionner les fenêtres flottantes"
|
||||||
msgid "Select the file to load"
|
msgid "Select the file to load"
|
||||||
msgstr "Sélectionner le fichier à charger"
|
msgstr "Sélectionner le fichier à charger"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
msgstr "Sélectionner le fichier à enregistrer"
|
msgstr "Sélectionner le fichier à enregistrer"
|
||||||
|
|
@ -4418,6 +4644,17 @@ msgid "Select the state to load"
|
||||||
msgstr "Sélectionner l'état à charger"
|
msgstr "Sélectionner l'état à charger"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
||||||
|
msgid "Select the save file"
|
||||||
|
msgstr "Sélectionner le fichier à enregistrer"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457
|
||||||
|
msgid "Select the state to load"
|
||||||
|
msgstr "Sélectionner l'état à charger"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Select the state to save"
|
msgid "Select the state to save"
|
||||||
msgstr "Sélectionner l'état à enregistrer"
|
msgstr "Sélectionner l'état à enregistrer"
|
||||||
|
|
||||||
|
|
@ -4493,7 +4730,11 @@ msgstr "Séparateur"
|
||||||
msgid "Serbian"
|
msgid "Serbian"
|
||||||
msgstr "Serbe"
|
msgstr "Serbe"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Serial Port 1 - This is the port which devices such as the net adapter use"
|
"Serial Port 1 - This is the port which devices such as the net adapter use"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -4722,6 +4963,7 @@ msgid "Skip EFB Access from CPU"
|
||||||
msgstr "Ignorer l'accès à l'EFB depuis le CPU"
|
msgstr "Ignorer l'accès à l'EFB depuis le CPU"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
|
||||||
|
<<<<<<< HEAD
|
||||||
msgid ""
|
msgid ""
|
||||||
"Skip the destination alpha pass used in many games for various graphical "
|
"Skip the destination alpha pass used in many games for various graphical "
|
||||||
"effects.\n"
|
"effects.\n"
|
||||||
|
|
@ -4742,6 +4984,28 @@ msgid ""
|
||||||
"\n"
|
"\n"
|
||||||
"If unsure, leave this unchecked."
|
"If unsure, leave this unchecked."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
=======
|
||||||
|
msgid ""
|
||||||
|
"Skip the destination alpha pass used in many games for various graphical "
|
||||||
|
"effects.\n"
|
||||||
|
"\n"
|
||||||
|
"If unsure, leave this unchecked."
|
||||||
|
msgstr ""
|
||||||
|
"Saute la passe alpha de destination, utilisée dans beaucoup de jeux pour "
|
||||||
|
"divers effets graphiques.\n"
|
||||||
|
"\n"
|
||||||
|
"Dans le doute, décochez cette case."
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
|
||||||
|
msgid ""
|
||||||
|
"Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
|
||||||
|
"Sometimes also increases visual quality.\n"
|
||||||
|
"If you're experiencing any issues, try raising texture cache accuracy or "
|
||||||
|
"disable this option.\n"
|
||||||
|
"\n"
|
||||||
|
"If unsure, leave this unchecked."
|
||||||
|
msgstr ""
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
"Accélère légèrement les copies d'EFB vers la RAM en sacrifiant la précision "
|
"Accélère légèrement les copies d'EFB vers la RAM en sacrifiant la précision "
|
||||||
"de l'émulation.\n"
|
"de l'émulation.\n"
|
||||||
"Améliore parfois la qualité visuelle.\n"
|
"Améliore parfois la qualité visuelle.\n"
|
||||||
|
|
@ -4803,9 +5067,15 @@ msgstr "Echec de la création du buffer audio : %s"
|
||||||
msgid "Space"
|
msgid "Space"
|
||||||
msgstr "Espace"
|
msgstr "Espace"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Spanish"
|
msgid "Spanish"
|
||||||
msgstr "Espagnol"
|
msgstr "Espagnol"
|
||||||
|
|
||||||
|
|
@ -4849,7 +5119,11 @@ msgstr "Stick carré"
|
||||||
msgid "Standard Controller"
|
msgid "Standard Controller"
|
||||||
msgstr "Contrôleur standard"
|
msgstr "Contrôleur standard"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
||||||
msgid "Start"
|
msgid "Start"
|
||||||
|
|
@ -4884,7 +5158,10 @@ msgstr "Stick"
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
||||||
msgid "Stop"
|
msgid "Stop"
|
||||||
msgstr "Arrêter"
|
msgstr "Arrêter"
|
||||||
|
|
@ -4961,7 +5238,10 @@ msgstr "Table Droite"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Take Screenshot"
|
msgid "Take Screenshot"
|
||||||
msgstr "Capture d'écran"
|
msgstr "Capture d'écran"
|
||||||
|
|
||||||
|
|
@ -5211,12 +5491,19 @@ msgstr "Activer tous les types de journaux"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Toggle Fullscreen"
|
msgid "Toggle Fullscreen"
|
||||||
msgstr "Activer le plein écran"
|
msgstr "Activer le plein écran"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Top"
|
msgid "Top"
|
||||||
msgstr "Haut"
|
msgstr "Haut"
|
||||||
|
|
||||||
|
|
@ -5323,6 +5610,17 @@ msgstr "Reception d'un message inconnu avec l'ID : %d"
|
||||||
#: Source/Core/Core/Src/NetPlayServer.cpp:504
|
#: Source/Core/Core/Src/NetPlayServer.cpp:504
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
msgstr ""
|
||||||
|
"Message inconnu avec l'ID %d reçue du lecteur %d. Banissement du lecteur !"
|
||||||
|
|
||||||
|
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
||||||
|
#, c-format
|
||||||
|
msgid ""
|
||||||
|
"Unknown pointer %#08x\n"
|
||||||
|
"Continue?"
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Message inconnu avec l'ID %d reçue du lecteur %d. Banissement du lecteur !"
|
"Message inconnu avec l'ID %d reçue du lecteur %d. Banissement du lecteur !"
|
||||||
|
|
||||||
|
|
@ -5551,7 +5849,11 @@ msgstr "Racine de la NAND (Wii) :"
|
||||||
msgid "Wii Save Import"
|
msgid "Wii Save Import"
|
||||||
msgstr "Importer une sauvegarde Wii"
|
msgstr "Importer une sauvegarde Wii"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wii save files (*.bin)|*.bin"
|
msgid "Wii save files (*.bin)|*.bin"
|
||||||
msgstr "Fichiers de sauvegarde Wii (*.bin)|*.bin"
|
msgstr "Fichiers de sauvegarde Wii (*.bin)|*.bin"
|
||||||
|
|
||||||
|
|
@ -5582,7 +5884,11 @@ msgstr ""
|
||||||
"ou bien c'est dû à un temps d'attente trop long, ou encore autre chose.\n"
|
"ou bien c'est dû à un temps d'attente trop long, ou encore autre chose.\n"
|
||||||
"Voulez-vous la reconnecter tout de suite ?"
|
"Voulez-vous la reconnecter tout de suite ?"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wiimote Connected"
|
msgid "Wiimote Connected"
|
||||||
msgstr "Wiimote connectée"
|
msgstr "Wiimote connectée"
|
||||||
|
|
||||||
|
|
@ -5614,9 +5920,15 @@ msgstr "Windows Droit"
|
||||||
msgid "Word Wrap"
|
msgid "Word Wrap"
|
||||||
msgstr "Casse"
|
msgstr "Casse"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Working..."
|
msgid "Working..."
|
||||||
msgstr "Travail..."
|
msgstr "Travail..."
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,11 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: Dolphin Emu\n"
|
"Project-Id-Version: Dolphin Emu\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
|
=======
|
||||||
|
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
"PO-Revision-Date: 2011-01-08 20:50+0200\n"
|
"PO-Revision-Date: 2011-01-08 20:50+0200\n"
|
||||||
"Last-Translator: Ely <nakeee@gmail.com>\n"
|
"Last-Translator: Ely <nakeee@gmail.com>\n"
|
||||||
"Language-Team: \n"
|
"Language-Team: \n"
|
||||||
|
|
@ -506,9 +510,15 @@ msgstr ""
|
||||||
msgid "Add new pane"
|
msgid "Add new pane"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Add..."
|
msgid "Add..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -562,8 +572,13 @@ msgstr ""
|
||||||
msgid "All Gamecube GCM files (gcm)"
|
msgid "All Gamecube GCM files (gcm)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "All Save States (sav, s##)"
|
msgid "All Save States (sav, s##)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -641,7 +656,11 @@ msgstr ""
|
||||||
msgid "Are you sure you want to delete this file? It will be gone forever!"
|
msgid "Are you sure you want to delete this file? It will be gone forever!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
||||||
msgid "Aspect Ratio:"
|
msgid "Aspect Ratio:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -662,7 +681,11 @@ msgstr ""
|
||||||
msgid "AudioCommon: Error opening AO device.\n"
|
msgid "AudioCommon: Error opening AO device.\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
||||||
msgid "Auto"
|
msgid "Auto"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -771,7 +794,11 @@ msgid "Blue Right"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Bottom"
|
msgid "Bottom"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -804,7 +831,11 @@ msgstr ""
|
||||||
msgid "Buffer:"
|
msgid "Buffer:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
||||||
msgid "Buttons"
|
msgid "Buttons"
|
||||||
|
|
@ -1026,7 +1057,11 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
||||||
msgid "Close"
|
msgid "Close"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -1135,7 +1170,11 @@ msgstr ""
|
||||||
msgid "Connect Wiimote 4"
|
msgid "Connect Wiimote 4"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Connecting..."
|
msgid "Connecting..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1310,7 +1349,11 @@ msgid "DSP Emulator Engine"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "DSP HLE emulation (fast)"
|
msgid "DSP HLE emulation (fast)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1520,7 +1563,11 @@ msgstr ""
|
||||||
msgid "Divide"
|
msgid "Divide"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Do you want to stop the current emulation?"
|
msgid "Do you want to stop the current emulation?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1549,13 +1596,22 @@ msgstr ""
|
||||||
msgid "Dolphin FIFO"
|
msgid "Dolphin FIFO"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Dolphin GCPad Configuration"
|
msgid "Dolphin GCPad Configuration"
|
||||||
msgstr "הגדרות גרפיקה"
|
msgstr "הגדרות גרפיקה"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Dolphin TAS Movies (*.dtm)"
|
msgid "Dolphin TAS Movies (*.dtm)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1638,9 +1694,15 @@ msgid ""
|
||||||
"If unsure, leave this unchecked."
|
"If unsure, leave this unchecked."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Dutch"
|
msgid "Dutch"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1763,15 +1825,22 @@ msgstr ""
|
||||||
msgid "Enable Block Merging"
|
msgid "Enable Block Merging"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
||||||
msgid "Enable Bounding Box Calculation"
|
msgid "Enable Bounding Box Calculation"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
||||||
msgid "Enable Cache"
|
msgid "Enable Cache"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Enable Cheats"
|
msgid "Enable Cheats"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1897,9 +1966,15 @@ msgstr ""
|
||||||
msgid "End"
|
msgid "End"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "English"
|
msgid "English"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1928,6 +2003,7 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
msgid "Error"
|
msgid "Error"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -1939,6 +2015,12 @@ msgid ""
|
||||||
"Sorry, Wii recording is temporarily broken."
|
"Sorry, Wii recording is temporarily broken."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169
|
||||||
|
msgid "Error"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
||||||
msgid "Error loading selected language. Falling back to system default."
|
msgid "Error loading selected language. Falling back to system default."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2353,9 +2435,15 @@ msgstr ""
|
||||||
msgid "Free Look"
|
msgid "Free Look"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "French"
|
msgid "French"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2424,7 +2512,11 @@ msgid "Gamecube &Pad Settings"
|
||||||
msgstr "הגדרות קול"
|
msgstr "הגדרות קול"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2445,8 +2537,12 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
||||||
msgid "General"
|
msgid "General"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2456,9 +2552,15 @@ msgstr ""
|
||||||
msgid "General Settings"
|
msgid "General Settings"
|
||||||
msgstr "הגדרות קול"
|
msgstr "הגדרות קול"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "German"
|
msgid "German"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2573,8 +2675,12 @@ msgid "Hotkey Configuration"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Hotkeys"
|
msgid "Hotkeys"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2764,7 +2870,11 @@ msgid ""
|
||||||
"InstallExceptionHandler called, but this platform does not yet support it."
|
"InstallExceptionHandler called, but this platform does not yet support it."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Installing WAD..."
|
msgid "Installing WAD..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2841,9 +2951,15 @@ msgstr ""
|
||||||
msgid "Invalid state"
|
msgid "Invalid state"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Italian"
|
msgid "Italian"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2994,11 +3110,19 @@ msgstr ""
|
||||||
msgid "Load State..."
|
msgid "Load State..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
msgid "Load Wii System Menu"
|
msgid "Load Wii System Menu"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
|
||||||
|
msgid "Load Wii System Menu"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Load Wii System Menu %d%c"
|
msgid "Load Wii System Menu %d%c"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3076,7 +3200,11 @@ msgstr ""
|
||||||
msgid "MadCatz Gameshark files(*.gcs)"
|
msgid "MadCatz Gameshark files(*.gcs)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
||||||
msgid "Main Stick"
|
msgid "Main Stick"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3107,7 +3235,11 @@ msgid "Memory Byte"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Memory Card"
|
msgid "Memory Card"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3284,7 +3416,11 @@ msgstr ""
|
||||||
msgid "NP Up"
|
msgid "NP Up"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
||||||
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
||||||
msgid "Name:"
|
msgid "Name:"
|
||||||
|
|
@ -3371,7 +3507,11 @@ msgstr ""
|
||||||
msgid "Not Set"
|
msgid "Not Set"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Not connected"
|
msgid "Not connected"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3432,7 +3572,10 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Open"
|
msgid "Open"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3558,8 +3701,13 @@ msgstr ""
|
||||||
msgid "Paths"
|
msgid "Paths"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
||||||
msgid "Pause"
|
msgid "Pause"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3579,8 +3727,13 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Play"
|
msgid "Play"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3606,7 +3759,11 @@ msgstr ""
|
||||||
msgid "Players"
|
msgid "Players"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Please confirm..."
|
msgid "Please confirm..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3812,10 +3969,17 @@ msgstr ""
|
||||||
msgid "Refresh game list"
|
msgid "Refresh game list"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434
|
||||||
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Remove"
|
msgid "Remove"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3831,7 +3995,10 @@ msgid "Render to Main Window"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
||||||
msgid "Reset"
|
msgid "Reset"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3874,7 +4041,11 @@ msgstr ""
|
||||||
msgid "Safe"
|
msgid "Safe"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Sample Rate:"
|
msgid "Sample Rate:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3958,7 +4129,11 @@ msgstr ""
|
||||||
msgid "Scaled EFB Copy"
|
msgid "Scaled EFB Copy"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Scanning %s"
|
msgid "Scanning %s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3998,12 +4173,21 @@ msgstr ""
|
||||||
msgid "Select"
|
msgid "Select"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
||||||
msgid "Select The Recording File"
|
msgid "Select The Recording File"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:740
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142
|
||||||
|
msgid "Select The Recording File"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Select a Wii WAD file to install"
|
msgid "Select a Wii WAD file to install"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -4026,6 +4210,7 @@ msgstr ""
|
||||||
msgid "Select the file to load"
|
msgid "Select the file to load"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -4035,6 +4220,17 @@ msgid "Select the state to load"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
||||||
|
msgid "Select the save file"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457
|
||||||
|
msgid "Select the state to load"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Select the state to save"
|
msgid "Select the state to save"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -4370,9 +4566,15 @@ msgstr ""
|
||||||
msgid "Space"
|
msgid "Space"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Spanish"
|
msgid "Spanish"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -4408,7 +4610,11 @@ msgstr ""
|
||||||
msgid "Standard Controller"
|
msgid "Standard Controller"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
||||||
msgid "Start"
|
msgid "Start"
|
||||||
|
|
@ -4443,7 +4649,10 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
||||||
msgid "Stop"
|
msgid "Stop"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -4515,7 +4724,10 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Take Screenshot"
|
msgid "Take Screenshot"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -4727,12 +4939,19 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Toggle Fullscreen"
|
msgid "Toggle Fullscreen"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Top"
|
msgid "Top"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -4834,6 +5053,16 @@ msgstr ""
|
||||||
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
||||||
|
#, c-format
|
||||||
|
msgid ""
|
||||||
|
"Unknown pointer %#08x\n"
|
||||||
|
"Continue?"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
||||||
msgid "Up"
|
msgid "Up"
|
||||||
|
|
@ -5036,7 +5265,11 @@ msgstr ""
|
||||||
msgid "Wii Save Import"
|
msgid "Wii Save Import"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wii save files (*.bin)|*.bin"
|
msgid "Wii save files (*.bin)|*.bin"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -5063,7 +5296,11 @@ msgid ""
|
||||||
"Do you want to reconnect immediately?"
|
"Do you want to reconnect immediately?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wiimote Connected"
|
msgid "Wiimote Connected"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -5095,9 +5332,15 @@ msgstr ""
|
||||||
msgid "Word Wrap"
|
msgid "Word Wrap"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Working..."
|
msgid "Working..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,8 +7,13 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: Dolphin Emu\n"
|
"Project-Id-Version: Dolphin Emu\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
"PO-Revision-Date: 2011-12-18 13:41-0600\n"
|
"PO-Revision-Date: 2011-12-18 13:41-0600\n"
|
||||||
|
=======
|
||||||
|
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
||||||
|
"PO-Revision-Date: 2011-06-04 14:29+0100\n"
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
"Last-Translator: Delirious <delirious@freemail.hu>\n"
|
"Last-Translator: Delirious <delirious@freemail.hu>\n"
|
||||||
"Language-Team: Delirious <delirious@freemail.hu>\n"
|
"Language-Team: Delirious <delirious@freemail.hu>\n"
|
||||||
"Language: Hungarian\n"
|
"Language: Hungarian\n"
|
||||||
|
|
@ -74,7 +79,11 @@ msgid "%s failed to be scrubbed. Probably the image is corrupt."
|
||||||
msgstr "%s tisztítása sikertelen. Valószínűleg a képfájl sérült."
|
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
|
#: Source/Core/Core/Src/HW/GCMemcard.cpp:97
|
||||||
|
<<<<<<< HEAD
|
||||||
#, c-format
|
#, c-format
|
||||||
|
=======
|
||||||
|
#, fuzzy, c-format
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"%s failed to load as a memorycard \n"
|
"%s failed to load as a memorycard \n"
|
||||||
" Card file size is invalid (0x%x bytes)"
|
" Card file size is invalid (0x%x bytes)"
|
||||||
|
|
@ -83,7 +92,11 @@ msgstr ""
|
||||||
" A kártya fájlmérete nem megfelelő (0x%x bájt)"
|
" A kártya fájlmérete nem megfelelő (0x%x bájt)"
|
||||||
|
|
||||||
#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
|
#: Source/Core/Core/Src/HW/GCMemcard.cpp:112
|
||||||
|
<<<<<<< HEAD
|
||||||
#, c-format
|
#, c-format
|
||||||
|
=======
|
||||||
|
#, fuzzy, c-format
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"%s failed to load as a memorycard \n"
|
"%s failed to load as a memorycard \n"
|
||||||
" Card size is invalid (0x%x bytes)"
|
" Card size is invalid (0x%x bytes)"
|
||||||
|
|
@ -429,6 +442,10 @@ msgid "Accurate VBeam emulation"
|
||||||
msgstr "Pontos VBeam emuláció"
|
msgstr "Pontos VBeam emuláció"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
#, fuzzy
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Accurately emulate EFB copies.\n"
|
"Accurately emulate EFB copies.\n"
|
||||||
"Some games depend on this for certain graphical effects or gameplay "
|
"Some games depend on this for certain graphical effects or gameplay "
|
||||||
|
|
@ -554,9 +571,15 @@ msgstr "Patch hozzáadása"
|
||||||
msgid "Add new pane"
|
msgid "Add new pane"
|
||||||
msgstr "Új mező hozzáadása"
|
msgstr "Új mező hozzáadása"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Add..."
|
msgid "Add..."
|
||||||
msgstr "Hozzáadás..."
|
msgstr "Hozzáadás..."
|
||||||
|
|
||||||
|
|
@ -626,8 +649,13 @@ msgstr "Minden GC/Wii képfájl (gcm, iso, ciso, gcz)"
|
||||||
msgid "All Gamecube GCM files (gcm)"
|
msgid "All Gamecube GCM files (gcm)"
|
||||||
msgstr "Minden Gamecube GCM fájl (gcm)"
|
msgstr "Minden Gamecube GCM fájl (gcm)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "All Save States (sav, s##)"
|
msgid "All Save States (sav, s##)"
|
||||||
msgstr "Minden állásmentés (sav, s##)"
|
msgstr "Minden állásmentés (sav, s##)"
|
||||||
|
|
||||||
|
|
@ -656,8 +684,14 @@ msgstr ""
|
||||||
"Ha bizonytalan vagy, hagyd kijelöletlenül."
|
"Ha bizonytalan vagy, hagyd kijelöletlenül."
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
|
||||||
|
<<<<<<< HEAD
|
||||||
msgid "Alternate Wiimote Timing"
|
msgid "Alternate Wiimote Timing"
|
||||||
msgstr "Változtatható Wiimote időzítés"
|
msgstr "Változtatható Wiimote időzítés"
|
||||||
|
=======
|
||||||
|
#, fuzzy
|
||||||
|
msgid "Alternate Wiimote Timing"
|
||||||
|
msgstr "Emulált Wiimote"
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372
|
||||||
msgid "Anisotropic Filtering:"
|
msgid "Anisotropic Filtering:"
|
||||||
|
|
@ -715,7 +749,11 @@ msgstr ""
|
||||||
msgid "Are you sure you want to delete this file? It will be gone forever!"
|
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!"
|
msgstr "Biztos törlöd ezt a fájlt? Végleg el fog veszni!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
||||||
msgid "Aspect Ratio:"
|
msgid "Aspect Ratio:"
|
||||||
msgstr "Képarány:"
|
msgstr "Képarány:"
|
||||||
|
|
@ -736,7 +774,11 @@ msgstr "Hang feldolgozó:"
|
||||||
msgid "AudioCommon: Error opening AO device.\n"
|
msgid "AudioCommon: Error opening AO device.\n"
|
||||||
msgstr "AudioCommon: Hiba az AO eszköz megnyitásakor.\n"
|
msgstr "AudioCommon: Hiba az AO eszköz megnyitásakor.\n"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
||||||
msgid "Auto"
|
msgid "Auto"
|
||||||
msgstr "Automatikus"
|
msgstr "Automatikus"
|
||||||
|
|
@ -853,7 +895,11 @@ msgid "Blue Right"
|
||||||
msgstr "Kék jobbra"
|
msgstr "Kék jobbra"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Bottom"
|
msgid "Bottom"
|
||||||
msgstr "Lent"
|
msgstr "Lent"
|
||||||
|
|
||||||
|
|
@ -886,7 +932,11 @@ msgstr "Kimeneti könyvtár tallózása"
|
||||||
msgid "Buffer:"
|
msgid "Buffer:"
|
||||||
msgstr "Puffer:"
|
msgstr "Puffer:"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
||||||
msgid "Buttons"
|
msgid "Buttons"
|
||||||
|
|
@ -1132,7 +1182,11 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
||||||
msgid "Close"
|
msgid "Close"
|
||||||
msgstr "Bezárás"
|
msgstr "Bezárás"
|
||||||
|
|
@ -1241,7 +1295,11 @@ msgstr "Wiimote 3 csatlakoztatása"
|
||||||
msgid "Connect Wiimote 4"
|
msgid "Connect Wiimote 4"
|
||||||
msgstr "Wiimote 4 csatlakoztatása"
|
msgstr "Wiimote 4 csatlakoztatása"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Connecting..."
|
msgid "Connecting..."
|
||||||
msgstr "Csatlakozás..."
|
msgstr "Csatlakozás..."
|
||||||
|
|
||||||
|
|
@ -1431,7 +1489,11 @@ msgid "DSP Emulator Engine"
|
||||||
msgstr "DSP emulátor motor"
|
msgstr "DSP emulátor motor"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "DSP HLE emulation (fast)"
|
msgid "DSP HLE emulation (fast)"
|
||||||
msgstr "DSP HLE emuláció (gyors)"
|
msgstr "DSP HLE emuláció (gyors)"
|
||||||
|
|
||||||
|
|
@ -1664,7 +1726,11 @@ msgstr ""
|
||||||
msgid "Divide"
|
msgid "Divide"
|
||||||
msgstr "Megosztás"
|
msgstr "Megosztás"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Do you want to stop the current emulation?"
|
msgid "Do you want to stop the current emulation?"
|
||||||
msgstr "Le akarod állítani az éppen működő emulációt?"
|
msgstr "Le akarod állítani az éppen működő emulációt?"
|
||||||
|
|
||||||
|
|
@ -1693,12 +1759,21 @@ msgstr "Dolphin emulált Wiimote beállítások"
|
||||||
msgid "Dolphin FIFO"
|
msgid "Dolphin FIFO"
|
||||||
msgstr "Dolphin FIFO"
|
msgstr "Dolphin FIFO"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
msgid "Dolphin GCPad Configuration"
|
msgid "Dolphin GCPad Configuration"
|
||||||
msgstr "Dolphin GCPad beállítások"
|
msgstr "Dolphin GCPad beállítások"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204
|
||||||
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
msgstr "Dolphin GCPad beállítások"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Dolphin TAS Movies (*.dtm)"
|
msgid "Dolphin TAS Movies (*.dtm)"
|
||||||
msgstr "Dolphin TAS videók (*.dtm)"
|
msgstr "Dolphin TAS videók (*.dtm)"
|
||||||
|
|
||||||
|
|
@ -1795,9 +1870,15 @@ msgstr ""
|
||||||
"\n"
|
"\n"
|
||||||
"Ha bizonytalan vagy, hagyd kijelöletlenül."
|
"Ha bizonytalan vagy, hagyd kijelöletlenül."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Dutch"
|
msgid "Dutch"
|
||||||
msgstr "Holland"
|
msgstr "Holland"
|
||||||
|
|
||||||
|
|
@ -1941,15 +2022,22 @@ msgstr "BAT használata"
|
||||||
msgid "Enable Block Merging"
|
msgid "Enable Block Merging"
|
||||||
msgstr "Blokk csatlakozás használata"
|
msgstr "Blokk csatlakozás használata"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
||||||
msgid "Enable Bounding Box Calculation"
|
msgid "Enable Bounding Box Calculation"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
||||||
msgid "Enable Cache"
|
msgid "Enable Cache"
|
||||||
msgstr "Gyorsítótár használata"
|
msgstr "Gyorsítótár használata"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Enable Cheats"
|
msgid "Enable Cheats"
|
||||||
msgstr "Csalások használata"
|
msgstr "Csalások használata"
|
||||||
|
|
||||||
|
|
@ -2105,9 +2193,15 @@ msgstr ""
|
||||||
msgid "End"
|
msgid "End"
|
||||||
msgstr "Vége"
|
msgstr "Vége"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "English"
|
msgid "English"
|
||||||
msgstr "Angol"
|
msgstr "Angol"
|
||||||
|
|
||||||
|
|
@ -2136,6 +2230,7 @@ msgstr "Egyenlő"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
msgid "Error"
|
msgid "Error"
|
||||||
msgstr "Hiba"
|
msgstr "Hiba"
|
||||||
|
|
@ -2147,6 +2242,12 @@ msgid ""
|
||||||
"Sorry, Wii recording is temporarily broken."
|
"Sorry, Wii recording is temporarily broken."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169
|
||||||
|
msgid "Error"
|
||||||
|
msgstr "Hiba"
|
||||||
|
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
||||||
msgid "Error loading selected language. Falling back to system default."
|
msgid "Error loading selected language. Falling back to system default."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2606,9 +2707,15 @@ msgstr "Rögzítendő képkockák"
|
||||||
msgid "Free Look"
|
msgid "Free Look"
|
||||||
msgstr "Szabad nézet"
|
msgstr "Szabad nézet"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "French"
|
msgid "French"
|
||||||
msgstr "Francia"
|
msgstr "Francia"
|
||||||
|
|
||||||
|
|
@ -2675,7 +2782,11 @@ msgid "Gamecube &Pad Settings"
|
||||||
msgstr "Gamecube &irányító beállítások"
|
msgstr "Gamecube &irányító beállítások"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
||||||
msgstr "Gamecube memóriakártyák (*.raw,*.gcp)"
|
msgstr "Gamecube memóriakártyák (*.raw,*.gcp)"
|
||||||
|
|
||||||
|
|
@ -2698,8 +2809,12 @@ msgstr ""
|
||||||
"(vagy rossz a kód vagy a kód típus még nem támogatott.)"
|
"(vagy rossz a kód vagy a kód típus még nem támogatott.)"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
||||||
msgid "General"
|
msgid "General"
|
||||||
msgstr "Általános"
|
msgstr "Általános"
|
||||||
|
|
@ -2708,9 +2823,15 @@ msgstr "Általános"
|
||||||
msgid "General Settings"
|
msgid "General Settings"
|
||||||
msgstr "Általános beállítások"
|
msgstr "Általános beállítások"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "German"
|
msgid "German"
|
||||||
msgstr "Német"
|
msgstr "Német"
|
||||||
|
|
||||||
|
|
@ -2732,6 +2853,10 @@ msgid "Greater Than"
|
||||||
msgstr "Nagyobb mint"
|
msgstr "Nagyobb mint"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
#, fuzzy
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Greatly increases quality of textures generated using render to texture "
|
"Greatly increases quality of textures generated using render to texture "
|
||||||
"effects.\n"
|
"effects.\n"
|
||||||
|
|
@ -2842,8 +2967,12 @@ msgid "Hotkey Configuration"
|
||||||
msgstr "Gyorsbillentyű beállítások"
|
msgstr "Gyorsbillentyű beállítások"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Hotkeys"
|
msgid "Hotkeys"
|
||||||
msgstr "Gyorsbill."
|
msgstr "Gyorsbill."
|
||||||
|
|
||||||
|
|
@ -3068,7 +3197,11 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"InstallExceptionHandler előidézve, de ez a platform még nem támogatja azt."
|
"InstallExceptionHandler előidézve, de ez a platform még nem támogatja azt."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Installing WAD..."
|
msgid "Installing WAD..."
|
||||||
msgstr "WAD telepítése..."
|
msgstr "WAD telepítése..."
|
||||||
|
|
||||||
|
|
@ -3150,9 +3283,15 @@ msgstr "Nem megfelelő rögzített fájl"
|
||||||
msgid "Invalid state"
|
msgid "Invalid state"
|
||||||
msgstr "Nem megfelelő mentés"
|
msgstr "Nem megfelelő mentés"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Italian"
|
msgid "Italian"
|
||||||
msgstr "Olasz"
|
msgstr "Olasz"
|
||||||
|
|
||||||
|
|
@ -3310,11 +3449,19 @@ msgstr "Állás betöltése a 8. helyről"
|
||||||
msgid "Load State..."
|
msgid "Load State..."
|
||||||
msgstr "Állás betöltése..."
|
msgstr "Állás betöltése..."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
msgid "Load Wii System Menu"
|
msgid "Load Wii System Menu"
|
||||||
msgstr "Wii rendszer menü betöltése"
|
msgstr "Wii rendszer menü betöltése"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
|
||||||
|
msgid "Load Wii System Menu"
|
||||||
|
msgstr "Wii rendszer menü betöltése"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Load Wii System Menu %d%c"
|
msgid "Load Wii System Menu %d%c"
|
||||||
msgstr "Wii rendszer menü betöltése %d%c"
|
msgstr "Wii rendszer menü betöltése %d%c"
|
||||||
|
|
@ -3396,7 +3543,11 @@ msgstr "MMU sebesség növelő hack"
|
||||||
msgid "MadCatz Gameshark files(*.gcs)"
|
msgid "MadCatz Gameshark files(*.gcs)"
|
||||||
msgstr "MadCatz Gameshark fájlok (*.gcs)"
|
msgstr "MadCatz Gameshark fájlok (*.gcs)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
||||||
msgid "Main Stick"
|
msgid "Main Stick"
|
||||||
msgstr "Főkar"
|
msgstr "Főkar"
|
||||||
|
|
@ -3427,7 +3578,11 @@ msgid "Memory Byte"
|
||||||
msgstr "Memória bájt"
|
msgstr "Memória bájt"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Memory Card"
|
msgid "Memory Card"
|
||||||
msgstr "Memóriakártya"
|
msgstr "Memóriakártya"
|
||||||
|
|
||||||
|
|
@ -3625,7 +3780,11 @@ msgstr "NP Tab"
|
||||||
msgid "NP Up"
|
msgid "NP Up"
|
||||||
msgstr "NP Up"
|
msgstr "NP Up"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
||||||
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
||||||
msgid "Name:"
|
msgid "Name:"
|
||||||
|
|
@ -3712,7 +3871,11 @@ msgstr "Nem egyenlő"
|
||||||
msgid "Not Set"
|
msgid "Not Set"
|
||||||
msgstr "Nincs beállítva"
|
msgstr "Nincs beállítva"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Not connected"
|
msgid "Not connected"
|
||||||
msgstr "Nincs csatlakoztatva"
|
msgstr "Nincs csatlakoztatva"
|
||||||
|
|
||||||
|
|
@ -3773,7 +3936,10 @@ msgstr "Csak %d blokk szabad"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Open"
|
msgid "Open"
|
||||||
msgstr "Megnyitás"
|
msgstr "Megnyitás"
|
||||||
|
|
||||||
|
|
@ -3904,8 +4070,13 @@ msgstr "Javítások"
|
||||||
msgid "Paths"
|
msgid "Paths"
|
||||||
msgstr "Mappák"
|
msgstr "Mappák"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
||||||
msgid "Pause"
|
msgid "Pause"
|
||||||
msgstr "Szünet"
|
msgstr "Szünet"
|
||||||
|
|
@ -3925,8 +4096,13 @@ msgstr "%d perspektíva"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Play"
|
msgid "Play"
|
||||||
msgstr "Indítás"
|
msgstr "Indítás"
|
||||||
|
|
||||||
|
|
@ -3952,7 +4128,11 @@ msgstr "Visszajátszási lehetőségek"
|
||||||
msgid "Players"
|
msgid "Players"
|
||||||
msgstr "Játékosok"
|
msgstr "Játékosok"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Please confirm..."
|
msgid "Please confirm..."
|
||||||
msgstr "Változtatás jóváhagyása..."
|
msgstr "Változtatás jóváhagyása..."
|
||||||
|
|
||||||
|
|
@ -4163,10 +4343,17 @@ msgstr "A lista frissítése"
|
||||||
msgid "Refresh game list"
|
msgid "Refresh game list"
|
||||||
msgstr "Játéklista frissítése"
|
msgstr "Játéklista frissítése"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434
|
||||||
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Remove"
|
msgid "Remove"
|
||||||
msgstr "Törlés"
|
msgstr "Törlés"
|
||||||
|
|
||||||
|
|
@ -4185,7 +4372,10 @@ msgid "Render to Main Window"
|
||||||
msgstr "Megjelenítés a főablakban"
|
msgstr "Megjelenítés a főablakban"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
||||||
msgid "Reset"
|
msgid "Reset"
|
||||||
msgstr "Alapra állítás"
|
msgstr "Alapra állítás"
|
||||||
|
|
@ -4228,7 +4418,11 @@ msgstr "Ál&lás mentése"
|
||||||
msgid "Safe"
|
msgid "Safe"
|
||||||
msgstr "Biztonságos"
|
msgstr "Biztonságos"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Sample Rate:"
|
msgid "Sample Rate:"
|
||||||
msgstr "Mintavételezési frekvencia:"
|
msgstr "Mintavételezési frekvencia:"
|
||||||
|
|
||||||
|
|
@ -4312,7 +4506,11 @@ msgstr "%s állásmentés videója sérült, videó rögzítése leáll..."
|
||||||
msgid "Scaled EFB Copy"
|
msgid "Scaled EFB Copy"
|
||||||
msgstr "Méretezett EFB másolat"
|
msgstr "Méretezett EFB másolat"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Scanning %s"
|
msgid "Scanning %s"
|
||||||
msgstr "Keresés %s"
|
msgstr "Keresés %s"
|
||||||
|
|
@ -4352,12 +4550,21 @@ msgstr "%s rész nem található a SYSCONF fájlban"
|
||||||
msgid "Select"
|
msgid "Select"
|
||||||
msgstr "Választás"
|
msgstr "Választás"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
||||||
msgid "Select The Recording File"
|
msgid "Select The Recording File"
|
||||||
msgstr "Válassz rögzítendő fájlt"
|
msgstr "Válassz rögzítendő fájlt"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:740
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142
|
||||||
|
msgid "Select The Recording File"
|
||||||
|
msgstr "Válassz rögzítendő fájlt"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Select a Wii WAD file to install"
|
msgid "Select a Wii WAD file to install"
|
||||||
msgstr "Válassz telepítendő Wii WAD fájlt"
|
msgstr "Válassz telepítendő Wii WAD fájlt"
|
||||||
|
|
||||||
|
|
@ -4383,6 +4590,7 @@ msgstr "Válassz lebegő ablakokat"
|
||||||
msgid "Select the file to load"
|
msgid "Select the file to load"
|
||||||
msgstr "Betöltendő fájl kiválasztása"
|
msgstr "Betöltendő fájl kiválasztása"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
msgstr "Válassz mentési fájlt"
|
msgstr "Válassz mentési fájlt"
|
||||||
|
|
@ -4392,6 +4600,17 @@ msgid "Select the state to load"
|
||||||
msgstr "Válassz betöltendő állásmentést"
|
msgstr "Válassz betöltendő állásmentést"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
||||||
|
msgid "Select the save file"
|
||||||
|
msgstr "Válassz mentési fájlt"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457
|
||||||
|
msgid "Select the state to load"
|
||||||
|
msgstr "Válassz betöltendő állásmentést"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Select the state to save"
|
msgid "Select the state to save"
|
||||||
msgstr "Válassz mentendő állást"
|
msgstr "Válassz mentendő állást"
|
||||||
|
|
||||||
|
|
@ -4773,9 +4992,15 @@ msgstr "Hang puffer létrehozása sikertelen: %s"
|
||||||
msgid "Space"
|
msgid "Space"
|
||||||
msgstr "Szóköz"
|
msgstr "Szóköz"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Spanish"
|
msgid "Spanish"
|
||||||
msgstr "Spanyol"
|
msgstr "Spanyol"
|
||||||
|
|
||||||
|
|
@ -4819,7 +5044,11 @@ msgstr "Negyzetes kar"
|
||||||
msgid "Standard Controller"
|
msgid "Standard Controller"
|
||||||
msgstr "Normál irányító"
|
msgstr "Normál irányító"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
||||||
msgid "Start"
|
msgid "Start"
|
||||||
|
|
@ -4854,7 +5083,10 @@ msgstr "Kar"
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
||||||
msgid "Stop"
|
msgid "Stop"
|
||||||
msgstr "Leállítás"
|
msgstr "Leállítás"
|
||||||
|
|
@ -4910,6 +5142,10 @@ msgstr "TAJVAN"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:144
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:144
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.h:32
|
#: Source/Core/DolphinWX/Src/TASInputDlg.h:32
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
#, fuzzy
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "TAS Input"
|
msgid "TAS Input"
|
||||||
msgstr "TAS bemenet"
|
msgstr "TAS bemenet"
|
||||||
|
|
||||||
|
|
@ -4932,7 +5168,10 @@ msgstr "Tábla jobbra"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Take Screenshot"
|
msgid "Take Screenshot"
|
||||||
msgstr "Pillanatkép készítése"
|
msgstr "Pillanatkép készítése"
|
||||||
|
|
||||||
|
|
@ -5178,12 +5417,19 @@ msgstr "Minden napló típus kijelölése"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Toggle Fullscreen"
|
msgid "Toggle Fullscreen"
|
||||||
msgstr "Váltás teljes nézetre"
|
msgstr "Váltás teljes nézetre"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Top"
|
msgid "Top"
|
||||||
msgstr "Fent"
|
msgstr "Fent"
|
||||||
|
|
||||||
|
|
@ -5294,6 +5540,18 @@ msgstr ""
|
||||||
"Ismeretlen üzenet érkezett ezzel az azonosítóval:%d ettől a játékostól:%d "
|
"Ismeretlen üzenet érkezett ezzel az azonosítóval:%d ettől a játékostól:%d "
|
||||||
"Játékos kirúgása!"
|
"Játékos kirúgása!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
||||||
|
#, c-format
|
||||||
|
msgid ""
|
||||||
|
"Unknown pointer %#08x\n"
|
||||||
|
"Continue?"
|
||||||
|
msgstr ""
|
||||||
|
"Ismeretlen mutató %#08x\n"
|
||||||
|
"Folytatod?"
|
||||||
|
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
||||||
msgid "Up"
|
msgid "Up"
|
||||||
|
|
@ -5517,7 +5775,11 @@ msgstr "Wii NAND gyökér könyvtár:"
|
||||||
msgid "Wii Save Import"
|
msgid "Wii Save Import"
|
||||||
msgstr "Wii mentés importálása"
|
msgstr "Wii mentés importálása"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wii save files (*.bin)|*.bin"
|
msgid "Wii save files (*.bin)|*.bin"
|
||||||
msgstr "Wii mentés fájlok (*.bin)|*.bin"
|
msgstr "Wii mentés fájlok (*.bin)|*.bin"
|
||||||
|
|
||||||
|
|
@ -5548,7 +5810,11 @@ msgstr ""
|
||||||
"esetleg az üresjárati időkorlát letelt vagy egyéb ok miatt történt.\n"
|
"esetleg az üresjárati időkorlát letelt vagy egyéb ok miatt történt.\n"
|
||||||
"Újra akarod csatlakoztatni most?"
|
"Újra akarod csatlakoztatni most?"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wiimote Connected"
|
msgid "Wiimote Connected"
|
||||||
msgstr "Wiimote csatlakoztatva"
|
msgstr "Wiimote csatlakoztatva"
|
||||||
|
|
||||||
|
|
@ -5580,9 +5846,15 @@ msgstr "Jobb Windows"
|
||||||
msgid "Word Wrap"
|
msgid "Word Wrap"
|
||||||
msgstr "Word Wrap"
|
msgstr "Word Wrap"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Working..."
|
msgid "Working..."
|
||||||
msgstr "Folyamatban..."
|
msgstr "Folyamatban..."
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,11 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: Dolphin Emu\n"
|
"Project-Id-Version: Dolphin Emu\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
|
=======
|
||||||
|
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
"PO-Revision-Date: 2011-04-08 20:40+0100\n"
|
"PO-Revision-Date: 2011-04-08 20:40+0100\n"
|
||||||
"Last-Translator: RebuMan, Dolphin Team\n"
|
"Last-Translator: RebuMan, Dolphin Team\n"
|
||||||
"Language-Team: \n"
|
"Language-Team: \n"
|
||||||
|
|
@ -552,9 +556,15 @@ msgstr "Aggiungi Patch"
|
||||||
msgid "Add new pane"
|
msgid "Add new pane"
|
||||||
msgstr "Aggiungi nuovo riquadro"
|
msgstr "Aggiungi nuovo riquadro"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Add..."
|
msgid "Add..."
|
||||||
msgstr "Aggiungi..."
|
msgstr "Aggiungi..."
|
||||||
|
|
||||||
|
|
@ -626,8 +636,13 @@ msgstr "Tutti i file di immagine GC/Wii (gcm, iso, ciso, gcz)"
|
||||||
msgid "All Gamecube GCM files (gcm)"
|
msgid "All Gamecube GCM files (gcm)"
|
||||||
msgstr "Tutti i file GCM GameCube (gcm)"
|
msgstr "Tutti i file GCM GameCube (gcm)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "All Save States (sav, s##)"
|
msgid "All Save States (sav, s##)"
|
||||||
msgstr "Tutti gli Stati di Gioco Salvati (sav, s##)"
|
msgstr "Tutti gli Stati di Gioco Salvati (sav, s##)"
|
||||||
|
|
||||||
|
|
@ -711,7 +726,11 @@ msgid "Are you sure you want to delete this file? It will be gone forever!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Sei sicuro di voler eliminare questo file? Sarà cancellato definitivamente!"
|
"Sei sicuro di voler eliminare questo file? Sarà cancellato definitivamente!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
||||||
msgid "Aspect Ratio:"
|
msgid "Aspect Ratio:"
|
||||||
msgstr "Aspetto:"
|
msgstr "Aspetto:"
|
||||||
|
|
@ -732,7 +751,11 @@ msgstr "Interfaccia Audio:"
|
||||||
msgid "AudioCommon: Error opening AO device.\n"
|
msgid "AudioCommon: Error opening AO device.\n"
|
||||||
msgstr "Audiocommon: Errore nell'apertura della periferica AO.\n"
|
msgstr "Audiocommon: Errore nell'apertura della periferica AO.\n"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
||||||
msgid "Auto"
|
msgid "Auto"
|
||||||
msgstr "Auto"
|
msgstr "Auto"
|
||||||
|
|
@ -845,7 +868,11 @@ msgid "Blue Right"
|
||||||
msgstr "Blu Destro"
|
msgstr "Blu Destro"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Bottom"
|
msgid "Bottom"
|
||||||
msgstr "Sotto"
|
msgstr "Sotto"
|
||||||
|
|
||||||
|
|
@ -878,7 +905,11 @@ msgstr "Cerca una directory di destinazione"
|
||||||
msgid "Buffer:"
|
msgid "Buffer:"
|
||||||
msgstr "Buffer:"
|
msgstr "Buffer:"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
||||||
msgid "Buttons"
|
msgid "Buttons"
|
||||||
|
|
@ -1116,7 +1147,11 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
||||||
msgid "Close"
|
msgid "Close"
|
||||||
msgstr "Chiudi"
|
msgstr "Chiudi"
|
||||||
|
|
@ -1226,7 +1261,11 @@ msgstr "Collega Wiimote 3"
|
||||||
msgid "Connect Wiimote 4"
|
msgid "Connect Wiimote 4"
|
||||||
msgstr "Collega Wiimote 4"
|
msgstr "Collega Wiimote 4"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Connecting..."
|
msgid "Connecting..."
|
||||||
msgstr "Connessione in corso..."
|
msgstr "Connessione in corso..."
|
||||||
|
|
||||||
|
|
@ -1415,7 +1454,11 @@ msgid "DSP Emulator Engine"
|
||||||
msgstr "Motore di Emulazione DSP"
|
msgstr "Motore di Emulazione DSP"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "DSP HLE emulation (fast)"
|
msgid "DSP HLE emulation (fast)"
|
||||||
msgstr "Emulazione DSP HLE (veloce)"
|
msgstr "Emulazione DSP HLE (veloce)"
|
||||||
|
|
||||||
|
|
@ -1635,7 +1678,11 @@ msgstr "Visualizza i tasti di input letti dall'emulatore."
|
||||||
msgid "Divide"
|
msgid "Divide"
|
||||||
msgstr "/"
|
msgstr "/"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Do you want to stop the current emulation?"
|
msgid "Do you want to stop the current emulation?"
|
||||||
msgstr "Vuoi interrompere l'emulazione in corso?"
|
msgstr "Vuoi interrompere l'emulazione in corso?"
|
||||||
|
|
||||||
|
|
@ -1664,12 +1711,21 @@ msgstr "Dolphin - Configurazione Wiimote Emulato"
|
||||||
msgid "Dolphin FIFO"
|
msgid "Dolphin FIFO"
|
||||||
msgstr "Dolphin FIFO"
|
msgstr "Dolphin FIFO"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
msgid "Dolphin GCPad Configuration"
|
msgid "Dolphin GCPad Configuration"
|
||||||
msgstr "Dolphin - Configurazione Controlli GC"
|
msgstr "Dolphin - Configurazione Controlli GC"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204
|
||||||
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
msgstr "Dolphin - Configurazione Controlli GC"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Dolphin TAS Movies (*.dtm)"
|
msgid "Dolphin TAS Movies (*.dtm)"
|
||||||
msgstr "Filmati TAS Dolphin (*.dtm)"
|
msgstr "Filmati TAS Dolphin (*.dtm)"
|
||||||
|
|
||||||
|
|
@ -1758,9 +1814,15 @@ msgid ""
|
||||||
"If unsure, leave this unchecked."
|
"If unsure, leave this unchecked."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Dutch"
|
msgid "Dutch"
|
||||||
msgstr "Olandese"
|
msgstr "Olandese"
|
||||||
|
|
||||||
|
|
@ -1889,16 +1951,23 @@ msgstr "Attiva BAT"
|
||||||
msgid "Enable Block Merging"
|
msgid "Enable Block Merging"
|
||||||
msgstr "Attiva Unione Blocchi"
|
msgstr "Attiva Unione Blocchi"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
||||||
msgid "Enable Bounding Box Calculation"
|
msgid "Enable Bounding Box Calculation"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Enable Cache"
|
msgid "Enable Cache"
|
||||||
msgstr "Attiva Cache"
|
msgstr "Attiva Cache"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Enable Cheats"
|
msgid "Enable Cheats"
|
||||||
msgstr "Abilita Trucchi"
|
msgstr "Abilita Trucchi"
|
||||||
|
|
||||||
|
|
@ -2039,9 +2108,15 @@ msgstr ""
|
||||||
msgid "End"
|
msgid "End"
|
||||||
msgstr "Fine"
|
msgstr "Fine"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "English"
|
msgid "English"
|
||||||
msgstr "Inglese"
|
msgstr "Inglese"
|
||||||
|
|
||||||
|
|
@ -2070,6 +2145,7 @@ msgstr "Uguale"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
msgid "Error"
|
msgid "Error"
|
||||||
msgstr "Errore/i"
|
msgstr "Errore/i"
|
||||||
|
|
@ -2081,6 +2157,12 @@ msgid ""
|
||||||
"Sorry, Wii recording is temporarily broken."
|
"Sorry, Wii recording is temporarily broken."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169
|
||||||
|
msgid "Error"
|
||||||
|
msgstr "Errore/i"
|
||||||
|
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
||||||
msgid "Error loading selected language. Falling back to system default."
|
msgid "Error loading selected language. Falling back to system default."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2545,9 +2627,15 @@ msgstr "Fotogrammi da Registrare:"
|
||||||
msgid "Free Look"
|
msgid "Free Look"
|
||||||
msgstr "Visuale Libera"
|
msgstr "Visuale Libera"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "French"
|
msgid "French"
|
||||||
msgstr "Francese"
|
msgstr "Francese"
|
||||||
|
|
||||||
|
|
@ -2615,7 +2703,11 @@ msgid "Gamecube &Pad Settings"
|
||||||
msgstr "Impostazioni &Controlli GameCube"
|
msgstr "Impostazioni &Controlli GameCube"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
||||||
msgstr "Schede di Memoria GameCube (*.raw,*.gcp)"
|
msgstr "Schede di Memoria GameCube (*.raw,*.gcp)"
|
||||||
|
|
||||||
|
|
@ -2638,8 +2730,12 @@ msgstr ""
|
||||||
"(codice corrotto oppure tipo di codice non ancora supportato.)"
|
"(codice corrotto oppure tipo di codice non ancora supportato.)"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
||||||
msgid "General"
|
msgid "General"
|
||||||
msgstr "Generale"
|
msgstr "Generale"
|
||||||
|
|
@ -2649,9 +2745,15 @@ msgstr "Generale"
|
||||||
msgid "General Settings"
|
msgid "General Settings"
|
||||||
msgstr "Impostazioni Interfaccia"
|
msgstr "Impostazioni Interfaccia"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "German"
|
msgid "German"
|
||||||
msgstr "Tedesco"
|
msgstr "Tedesco"
|
||||||
|
|
||||||
|
|
@ -2776,8 +2878,12 @@ msgid "Hotkey Configuration"
|
||||||
msgstr "Configurazione Tasti di Scelta Rapida"
|
msgstr "Configurazione Tasti di Scelta Rapida"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Hotkeys"
|
msgid "Hotkeys"
|
||||||
msgstr "Tasti di Scelta Rapida"
|
msgstr "Tasti di Scelta Rapida"
|
||||||
|
|
||||||
|
|
@ -2991,7 +3097,11 @@ msgstr ""
|
||||||
"E' stata sollevata un'Eccezione all'Installazione, tuttavia questa "
|
"E' stata sollevata un'Eccezione all'Installazione, tuttavia questa "
|
||||||
"piattaforma non la supporta ancora."
|
"piattaforma non la supporta ancora."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Installing WAD..."
|
msgid "Installing WAD..."
|
||||||
msgstr "Installazione WAD..."
|
msgstr "Installazione WAD..."
|
||||||
|
|
||||||
|
|
@ -3075,9 +3185,15 @@ msgstr "File di registrazione non valido"
|
||||||
msgid "Invalid state"
|
msgid "Invalid state"
|
||||||
msgstr "Stato non valido"
|
msgstr "Stato non valido"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Italian"
|
msgid "Italian"
|
||||||
msgstr "Italiano"
|
msgstr "Italiano"
|
||||||
|
|
||||||
|
|
@ -3236,12 +3352,20 @@ msgstr "Carica Stato di Gioco dall'Ingresso 8"
|
||||||
msgid "Load State..."
|
msgid "Load State..."
|
||||||
msgstr "Carica Stato di Gioco..."
|
msgstr "Carica Stato di Gioco..."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Load Wii System Menu"
|
msgid "Load Wii System Menu"
|
||||||
msgstr "Carica il Menu di Sistema Wii %d%c"
|
msgstr "Carica il Menu di Sistema Wii %d%c"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Load Wii System Menu %d%c"
|
msgid "Load Wii System Menu %d%c"
|
||||||
msgstr "Carica il Menu di Sistema Wii %d%c"
|
msgstr "Carica il Menu di Sistema Wii %d%c"
|
||||||
|
|
@ -3324,7 +3448,11 @@ msgstr "Hack Velocità MMU"
|
||||||
msgid "MadCatz Gameshark files(*.gcs)"
|
msgid "MadCatz Gameshark files(*.gcs)"
|
||||||
msgstr "File MadCatz Gameshark(*.gcs)"
|
msgstr "File MadCatz Gameshark(*.gcs)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
||||||
msgid "Main Stick"
|
msgid "Main Stick"
|
||||||
msgstr "Levetta Principale"
|
msgstr "Levetta Principale"
|
||||||
|
|
@ -3355,7 +3483,11 @@ msgid "Memory Byte"
|
||||||
msgstr "Byte"
|
msgstr "Byte"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Memory Card"
|
msgid "Memory Card"
|
||||||
msgstr "Scheda di Memoria"
|
msgstr "Scheda di Memoria"
|
||||||
|
|
||||||
|
|
@ -3541,7 +3673,11 @@ msgstr "TN Tab"
|
||||||
msgid "NP Up"
|
msgid "NP Up"
|
||||||
msgstr "TN Su"
|
msgstr "TN Su"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
||||||
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
||||||
msgid "Name:"
|
msgid "Name:"
|
||||||
|
|
@ -3628,7 +3764,11 @@ msgstr "Diverso"
|
||||||
msgid "Not Set"
|
msgid "Not Set"
|
||||||
msgstr "Non Impostato"
|
msgstr "Non Impostato"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Not connected"
|
msgid "Not connected"
|
||||||
msgstr "Non collegato"
|
msgstr "Non collegato"
|
||||||
|
|
||||||
|
|
@ -3689,7 +3829,10 @@ msgstr "Solo %d blocchi disponibili"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Open"
|
msgid "Open"
|
||||||
msgstr "Apri"
|
msgstr "Apri"
|
||||||
|
|
||||||
|
|
@ -3823,8 +3966,13 @@ msgstr "Patches"
|
||||||
msgid "Paths"
|
msgid "Paths"
|
||||||
msgstr "Percorsi"
|
msgstr "Percorsi"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
||||||
msgid "Pause"
|
msgid "Pause"
|
||||||
msgstr "Pausa"
|
msgstr "Pausa"
|
||||||
|
|
@ -3845,8 +3993,13 @@ msgstr "Prospettiva %d"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Play"
|
msgid "Play"
|
||||||
msgstr "Gioca"
|
msgstr "Gioca"
|
||||||
|
|
||||||
|
|
@ -3872,7 +4025,11 @@ msgstr "Opzioni di Riproduzione"
|
||||||
msgid "Players"
|
msgid "Players"
|
||||||
msgstr "Giocatori"
|
msgstr "Giocatori"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Please confirm..."
|
msgid "Please confirm..."
|
||||||
msgstr "Per favore confermare..."
|
msgstr "Per favore confermare..."
|
||||||
|
|
||||||
|
|
@ -4086,10 +4243,17 @@ msgstr "Aggiorna Elenco"
|
||||||
msgid "Refresh game list"
|
msgid "Refresh game list"
|
||||||
msgstr "Aggiorna elenco giochi"
|
msgstr "Aggiorna elenco giochi"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434
|
||||||
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Remove"
|
msgid "Remove"
|
||||||
msgstr "Rimuovi"
|
msgstr "Rimuovi"
|
||||||
|
|
||||||
|
|
@ -4108,7 +4272,10 @@ msgid "Render to Main Window"
|
||||||
msgstr "Rendering nella finestra Principale"
|
msgstr "Rendering nella finestra Principale"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
||||||
msgid "Reset"
|
msgid "Reset"
|
||||||
msgstr "Resetta"
|
msgstr "Resetta"
|
||||||
|
|
@ -4151,7 +4318,11 @@ msgstr "Sa&lva Stato di Gioco"
|
||||||
msgid "Safe"
|
msgid "Safe"
|
||||||
msgstr "Accurata"
|
msgstr "Accurata"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Sample Rate:"
|
msgid "Sample Rate:"
|
||||||
msgstr "Frequenza di Campionamento:"
|
msgstr "Frequenza di Campionamento:"
|
||||||
|
|
||||||
|
|
@ -4236,7 +4407,11 @@ msgstr "Il salvataggio del filmato %s è corrotto, arresto registrazione..."
|
||||||
msgid "Scaled EFB Copy"
|
msgid "Scaled EFB Copy"
|
||||||
msgstr "Scala Copie EFB"
|
msgstr "Scala Copie EFB"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, fuzzy, c-format
|
#, fuzzy, c-format
|
||||||
msgid "Scanning %s"
|
msgid "Scanning %s"
|
||||||
msgstr "Ricerca..."
|
msgstr "Ricerca..."
|
||||||
|
|
@ -4276,12 +4451,21 @@ msgstr "Sezione %s non trovata in SYSCONF"
|
||||||
msgid "Select"
|
msgid "Select"
|
||||||
msgstr "Seleziona"
|
msgstr "Seleziona"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
||||||
msgid "Select The Recording File"
|
msgid "Select The Recording File"
|
||||||
msgstr "Seleziona il File di Registrazione"
|
msgstr "Seleziona il File di Registrazione"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:740
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142
|
||||||
|
msgid "Select The Recording File"
|
||||||
|
msgstr "Seleziona il File di Registrazione"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Select a Wii WAD file to install"
|
msgid "Select a Wii WAD file to install"
|
||||||
msgstr "Seleziona un file WAD Wii da installare"
|
msgstr "Seleziona un file WAD Wii da installare"
|
||||||
|
|
||||||
|
|
@ -4307,6 +4491,7 @@ msgstr "Seleziona finestre libere/mobili"
|
||||||
msgid "Select the file to load"
|
msgid "Select the file to load"
|
||||||
msgstr "Seleziona il file da caricare"
|
msgstr "Seleziona il file da caricare"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
msgstr "Seleziona il file di salvataggio"
|
msgstr "Seleziona il file di salvataggio"
|
||||||
|
|
@ -4316,6 +4501,17 @@ msgid "Select the state to load"
|
||||||
msgstr "Seleziona lo stato di gioco da caricare"
|
msgstr "Seleziona lo stato di gioco da caricare"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
||||||
|
msgid "Select the save file"
|
||||||
|
msgstr "Seleziona il file di salvataggio"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457
|
||||||
|
msgid "Select the state to load"
|
||||||
|
msgstr "Seleziona lo stato di gioco da caricare"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Select the state to save"
|
msgid "Select the state to save"
|
||||||
msgstr "Seleziona lo stato di gioco da salvare"
|
msgstr "Seleziona lo stato di gioco da salvare"
|
||||||
|
|
||||||
|
|
@ -4670,9 +4866,15 @@ msgstr "Creazione buffer audio non riuscita: %s"
|
||||||
msgid "Space"
|
msgid "Space"
|
||||||
msgstr "Spazio"
|
msgstr "Spazio"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Spanish"
|
msgid "Spanish"
|
||||||
msgstr "Spagnolo"
|
msgstr "Spagnolo"
|
||||||
|
|
||||||
|
|
@ -4708,7 +4910,11 @@ msgstr "Levetta Quadrata"
|
||||||
msgid "Standard Controller"
|
msgid "Standard Controller"
|
||||||
msgstr "Controller Standard"
|
msgstr "Controller Standard"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
||||||
msgid "Start"
|
msgid "Start"
|
||||||
|
|
@ -4743,7 +4949,10 @@ msgstr "Levetta"
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
||||||
msgid "Stop"
|
msgid "Stop"
|
||||||
msgstr "Arresta"
|
msgstr "Arresta"
|
||||||
|
|
@ -4816,7 +5025,10 @@ msgstr "Semipiano destro"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Take Screenshot"
|
msgid "Take Screenshot"
|
||||||
msgstr "Genera un'Istantanea di Gioco"
|
msgstr "Genera un'Istantanea di Gioco"
|
||||||
|
|
||||||
|
|
@ -5061,12 +5273,19 @@ msgstr "Seleziona/Deseleziona tutti i Tipi di Log"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Toggle Fullscreen"
|
msgid "Toggle Fullscreen"
|
||||||
msgstr "Commuta a Schermo Intero"
|
msgstr "Commuta a Schermo Intero"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Top"
|
msgid "Top"
|
||||||
msgstr "Sopra"
|
msgstr "Sopra"
|
||||||
|
|
||||||
|
|
@ -5172,6 +5391,18 @@ msgstr ""
|
||||||
"Messaggio sconosciuto avente id:%d ricevuto dal giocatore:%d Giocatore "
|
"Messaggio sconosciuto avente id:%d ricevuto dal giocatore:%d Giocatore "
|
||||||
"espluso!!"
|
"espluso!!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
||||||
|
#, c-format
|
||||||
|
msgid ""
|
||||||
|
"Unknown pointer %#08x\n"
|
||||||
|
"Continue?"
|
||||||
|
msgstr ""
|
||||||
|
"Puntatore %#08x sconosciuto\n"
|
||||||
|
"Continuare?"
|
||||||
|
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
||||||
msgid "Up"
|
msgid "Up"
|
||||||
|
|
@ -5384,7 +5615,11 @@ msgstr "Origine DVD:"
|
||||||
msgid "Wii Save Import"
|
msgid "Wii Save Import"
|
||||||
msgstr "Importa Salvataggi Wii"
|
msgstr "Importa Salvataggi Wii"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wii save files (*.bin)|*.bin"
|
msgid "Wii save files (*.bin)|*.bin"
|
||||||
msgstr "Salva i file Wii (*.bin)|*.bin"
|
msgstr "Salva i file Wii (*.bin)|*.bin"
|
||||||
|
|
||||||
|
|
@ -5415,7 +5650,11 @@ msgstr ""
|
||||||
" o forse è dovuto ad altri motivi. \n"
|
" o forse è dovuto ad altri motivi. \n"
|
||||||
"Vuoi riconnettersi immediatamente?"
|
"Vuoi riconnettersi immediatamente?"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wiimote Connected"
|
msgid "Wiimote Connected"
|
||||||
msgstr "Wiimote Collegato"
|
msgstr "Wiimote Collegato"
|
||||||
|
|
||||||
|
|
@ -5448,9 +5687,15 @@ msgstr "Windows Destro"
|
||||||
msgid "Word Wrap"
|
msgid "Word Wrap"
|
||||||
msgstr "Adatta Testo"
|
msgstr "Adatta Testo"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Working..."
|
msgid "Working..."
|
||||||
msgstr "Attività in corso..."
|
msgstr "Attività in corso..."
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,8 +7,13 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: Dolphin Emu\n"
|
"Project-Id-Version: Dolphin Emu\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
"PO-Revision-Date: 2011-10-12 20:45+0900\n"
|
"PO-Revision-Date: 2011-10-12 20:45+0900\n"
|
||||||
|
=======
|
||||||
|
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
||||||
|
"PO-Revision-Date: 2011-08-19 08:37-0500\n"
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
"Last-Translator: DanbSky\n"
|
"Last-Translator: DanbSky\n"
|
||||||
"Language-Team: \n"
|
"Language-Team: \n"
|
||||||
"Language: Japanese\n"
|
"Language: Japanese\n"
|
||||||
|
|
@ -426,6 +431,10 @@ msgid "Accurate VBeam emulation"
|
||||||
msgstr "Accurate VBeam emulation"
|
msgstr "Accurate VBeam emulation"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
#, fuzzy
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Accurately emulate EFB copies.\n"
|
"Accurately emulate EFB copies.\n"
|
||||||
"Some games depend on this for certain graphical effects or gameplay "
|
"Some games depend on this for certain graphical effects or gameplay "
|
||||||
|
|
@ -550,9 +559,15 @@ msgstr "パッチを追加"
|
||||||
msgid "Add new pane"
|
msgid "Add new pane"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Add..."
|
msgid "Add..."
|
||||||
msgstr "追加"
|
msgstr "追加"
|
||||||
|
|
||||||
|
|
@ -618,8 +633,13 @@ msgstr "全ての GC/Wii イメージ (gcm, iso, ciso, gcz)"
|
||||||
msgid "All Gamecube GCM files (gcm)"
|
msgid "All Gamecube GCM files (gcm)"
|
||||||
msgstr "GC GCMファイル (gcm)|*.gcm"
|
msgstr "GC GCMファイル (gcm)|*.gcm"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "All Save States (sav, s##)"
|
msgid "All Save States (sav, s##)"
|
||||||
msgstr "全てのステートセーブファイル (sav, s##)"
|
msgstr "全てのステートセーブファイル (sav, s##)"
|
||||||
|
|
||||||
|
|
@ -648,8 +668,14 @@ msgstr ""
|
||||||
"よく分からなければ、チェックを入れないでください。"
|
"よく分からなければ、チェックを入れないでください。"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
|
||||||
|
<<<<<<< HEAD
|
||||||
msgid "Alternate Wiimote Timing"
|
msgid "Alternate Wiimote Timing"
|
||||||
msgstr "Wii リモコンの同期調整"
|
msgstr "Wii リモコンの同期調整"
|
||||||
|
=======
|
||||||
|
#, fuzzy
|
||||||
|
msgid "Alternate Wiimote Timing"
|
||||||
|
msgstr "Wii リモコンをエミュレート"
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372
|
||||||
msgid "Anisotropic Filtering:"
|
msgid "Anisotropic Filtering:"
|
||||||
|
|
@ -707,7 +733,11 @@ msgstr ""
|
||||||
msgid "Are you sure you want to delete this file? It will be gone forever!"
|
msgid "Are you sure you want to delete this file? It will be gone forever!"
|
||||||
msgstr "このタイトルの実体ファイルを削除しますか？元に戻すことはできません！"
|
msgstr "このタイトルの実体ファイルを削除しますか？元に戻すことはできません！"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
||||||
msgid "Aspect Ratio:"
|
msgid "Aspect Ratio:"
|
||||||
msgstr "アスペクト比："
|
msgstr "アスペクト比："
|
||||||
|
|
@ -728,7 +758,11 @@ msgstr "出力API (Audio Backend)"
|
||||||
msgid "AudioCommon: Error opening AO device.\n"
|
msgid "AudioCommon: Error opening AO device.\n"
|
||||||
msgstr "AudioCommon: Error opening AO device.\n"
|
msgstr "AudioCommon: Error opening AO device.\n"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
||||||
msgid "Auto"
|
msgid "Auto"
|
||||||
msgstr "自動"
|
msgstr "自動"
|
||||||
|
|
@ -843,7 +877,11 @@ msgid "Blue Right"
|
||||||
msgstr "青 - 右"
|
msgstr "青 - 右"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Bottom"
|
msgid "Bottom"
|
||||||
msgstr "下部"
|
msgstr "下部"
|
||||||
|
|
||||||
|
|
@ -876,7 +914,11 @@ msgstr "出力先を選択"
|
||||||
msgid "Buffer:"
|
msgid "Buffer:"
|
||||||
msgstr "バッファ："
|
msgstr "バッファ："
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
||||||
msgid "Buttons"
|
msgid "Buttons"
|
||||||
|
|
@ -1123,7 +1165,11 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
||||||
msgid "Close"
|
msgid "Close"
|
||||||
msgstr "閉じる"
|
msgstr "閉じる"
|
||||||
|
|
@ -1232,7 +1278,11 @@ msgstr "3PのWii リモコンを接続／切断"
|
||||||
msgid "Connect Wiimote 4"
|
msgid "Connect Wiimote 4"
|
||||||
msgstr "4PのWii リモコンを接続／切断"
|
msgstr "4PのWii リモコンを接続／切断"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Connecting..."
|
msgid "Connecting..."
|
||||||
msgstr "接続中..."
|
msgstr "接続中..."
|
||||||
|
|
||||||
|
|
@ -1423,7 +1473,11 @@ msgid "DSP Emulator Engine"
|
||||||
msgstr "DSPエミュレーション方式"
|
msgstr "DSPエミュレーション方式"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "DSP HLE emulation (fast)"
|
msgid "DSP HLE emulation (fast)"
|
||||||
msgstr "DSP-HLE エミュレーション (高速)"
|
msgstr "DSP-HLE エミュレーション (高速)"
|
||||||
|
|
||||||
|
|
@ -1654,7 +1708,11 @@ msgstr ""
|
||||||
msgid "Divide"
|
msgid "Divide"
|
||||||
msgstr "Divide"
|
msgstr "Divide"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Do you want to stop the current emulation?"
|
msgid "Do you want to stop the current emulation?"
|
||||||
msgstr "動作中のゲームを停止しますか？"
|
msgstr "動作中のゲームを停止しますか？"
|
||||||
|
|
||||||
|
|
@ -1683,12 +1741,21 @@ msgstr "Wii リモコンのエミュレーション設定"
|
||||||
msgid "Dolphin FIFO"
|
msgid "Dolphin FIFO"
|
||||||
msgstr "Dolphin FIFO"
|
msgstr "Dolphin FIFO"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
msgid "Dolphin GCPad Configuration"
|
msgid "Dolphin GCPad Configuration"
|
||||||
msgstr "GCコントローラ設定"
|
msgstr "GCコントローラ設定"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204
|
||||||
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
msgstr "GCコントローラ設定"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Dolphin TAS Movies (*.dtm)"
|
msgid "Dolphin TAS Movies (*.dtm)"
|
||||||
msgstr "Dolphin TAS ムービー (*.dtm)"
|
msgstr "Dolphin TAS ムービー (*.dtm)"
|
||||||
|
|
||||||
|
|
@ -1785,9 +1852,15 @@ msgstr ""
|
||||||
"\n"
|
"\n"
|
||||||
"よく分からなければ、チェックを入れないでください。"
|
"よく分からなければ、チェックを入れないでください。"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Dutch"
|
msgid "Dutch"
|
||||||
msgstr "オランダ語"
|
msgstr "オランダ語"
|
||||||
|
|
||||||
|
|
@ -1931,15 +2004,22 @@ msgstr "Enable BAT"
|
||||||
msgid "Enable Block Merging"
|
msgid "Enable Block Merging"
|
||||||
msgstr "Enable Block Merging"
|
msgstr "Enable Block Merging"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
||||||
msgid "Enable Bounding Box Calculation"
|
msgid "Enable Bounding Box Calculation"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
||||||
msgid "Enable Cache"
|
msgid "Enable Cache"
|
||||||
msgstr "Enable Cache"
|
msgstr "Enable Cache"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Enable Cheats"
|
msgid "Enable Cheats"
|
||||||
msgstr "チートコードを有効化"
|
msgstr "チートコードを有効化"
|
||||||
|
|
||||||
|
|
@ -2093,9 +2173,15 @@ msgstr ""
|
||||||
msgid "End"
|
msgid "End"
|
||||||
msgstr "End"
|
msgstr "End"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "English"
|
msgid "English"
|
||||||
msgstr "英語"
|
msgstr "英語"
|
||||||
|
|
||||||
|
|
@ -2124,6 +2210,7 @@ msgstr "に一致する"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
msgid "Error"
|
msgid "Error"
|
||||||
msgstr "エラー"
|
msgstr "エラー"
|
||||||
|
|
@ -2135,6 +2222,12 @@ msgid ""
|
||||||
"Sorry, Wii recording is temporarily broken."
|
"Sorry, Wii recording is temporarily broken."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169
|
||||||
|
msgid "Error"
|
||||||
|
msgstr "エラー"
|
||||||
|
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
||||||
msgid "Error loading selected language. Falling back to system default."
|
msgid "Error loading selected language. Falling back to system default."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2593,9 +2686,15 @@ msgstr "録画フレーム数設定"
|
||||||
msgid "Free Look"
|
msgid "Free Look"
|
||||||
msgstr "フリールック"
|
msgstr "フリールック"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "French"
|
msgid "French"
|
||||||
msgstr "フランス語"
|
msgstr "フランス語"
|
||||||
|
|
||||||
|
|
@ -2662,7 +2761,11 @@ msgid "Gamecube &Pad Settings"
|
||||||
msgstr "ゲームキューブ入力設定(&P)"
|
msgstr "ゲームキューブ入力設定(&P)"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
||||||
msgstr "メモリーカードファイル (*.raw,*.gcp)|*.raw;*.gcp"
|
msgstr "メモリーカードファイル (*.raw,*.gcp)|*.raw;*.gcp"
|
||||||
|
|
||||||
|
|
@ -2685,8 +2788,12 @@ msgstr ""
|
||||||
"(コードに問題があるか、まだサポートされていないタイプのコードです)"
|
"(コードに問題があるか、まだサポートされていないタイプのコードです)"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
||||||
msgid "General"
|
msgid "General"
|
||||||
msgstr "一般"
|
msgstr "一般"
|
||||||
|
|
@ -2695,9 +2802,15 @@ msgstr "一般"
|
||||||
msgid "General Settings"
|
msgid "General Settings"
|
||||||
msgstr "一般"
|
msgstr "一般"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "German"
|
msgid "German"
|
||||||
msgstr "ドイツ語"
|
msgstr "ドイツ語"
|
||||||
|
|
||||||
|
|
@ -2720,6 +2833,10 @@ msgid "Greater Than"
|
||||||
msgstr "より大きい"
|
msgstr "より大きい"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
#, fuzzy
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Greatly increases quality of textures generated using render to texture "
|
"Greatly increases quality of textures generated using render to texture "
|
||||||
"effects.\n"
|
"effects.\n"
|
||||||
|
|
@ -2829,8 +2946,12 @@ msgid "Hotkey Configuration"
|
||||||
msgstr "ホットキーの設定"
|
msgstr "ホットキーの設定"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Hotkeys"
|
msgid "Hotkeys"
|
||||||
msgstr "ホットキー"
|
msgstr "ホットキー"
|
||||||
|
|
||||||
|
|
@ -3053,7 +3174,11 @@ msgstr ""
|
||||||
"InstallExceptionHandler が呼び出されましたが、このプラットフォームはまだサ"
|
"InstallExceptionHandler が呼び出されましたが、このプラットフォームはまだサ"
|
||||||
"ポートされていません"
|
"ポートされていません"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Installing WAD..."
|
msgid "Installing WAD..."
|
||||||
msgstr "WADファイルを追加しています..."
|
msgstr "WADファイルを追加しています..."
|
||||||
|
|
||||||
|
|
@ -3135,9 +3260,15 @@ msgstr "不正な録画ファイル"
|
||||||
msgid "Invalid state"
|
msgid "Invalid state"
|
||||||
msgstr "不正なセーブ／ロードファイル"
|
msgstr "不正なセーブ／ロードファイル"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Italian"
|
msgid "Italian"
|
||||||
msgstr "イタリア語"
|
msgstr "イタリア語"
|
||||||
|
|
||||||
|
|
@ -3295,11 +3426,19 @@ msgstr "ステートロード - スロット 8"
|
||||||
msgid "Load State..."
|
msgid "Load State..."
|
||||||
msgstr "ファイルからロード"
|
msgstr "ファイルからロード"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
msgid "Load Wii System Menu"
|
msgid "Load Wii System Menu"
|
||||||
msgstr "Wiiメニューを起動"
|
msgstr "Wiiメニューを起動"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
|
||||||
|
msgid "Load Wii System Menu"
|
||||||
|
msgstr "Wiiメニューを起動"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Load Wii System Menu %d%c"
|
msgid "Load Wii System Menu %d%c"
|
||||||
msgstr "Wiiメニューを起動 ( バージョン：%d %c )"
|
msgstr "Wiiメニューを起動 ( バージョン：%d %c )"
|
||||||
|
|
@ -3382,7 +3521,11 @@ msgstr "MMU Speed Hack"
|
||||||
msgid "MadCatz Gameshark files(*.gcs)"
|
msgid "MadCatz Gameshark files(*.gcs)"
|
||||||
msgstr "MadCatz Gameshark セーブファイル(*.gcs)"
|
msgstr "MadCatz Gameshark セーブファイル(*.gcs)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
||||||
msgid "Main Stick"
|
msgid "Main Stick"
|
||||||
msgstr "コントロールスティック"
|
msgstr "コントロールスティック"
|
||||||
|
|
@ -3413,7 +3556,11 @@ msgid "Memory Byte"
|
||||||
msgstr "メモリバイト"
|
msgstr "メモリバイト"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Memory Card"
|
msgid "Memory Card"
|
||||||
msgstr "メモリーカード"
|
msgstr "メモリーカード"
|
||||||
|
|
||||||
|
|
@ -3609,7 +3756,11 @@ msgstr "NP Tab"
|
||||||
msgid "NP Up"
|
msgid "NP Up"
|
||||||
msgstr "NP Up"
|
msgstr "NP Up"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
||||||
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
||||||
msgid "Name:"
|
msgid "Name:"
|
||||||
|
|
@ -3696,7 +3847,11 @@ msgstr "に一致しない"
|
||||||
msgid "Not Set"
|
msgid "Not Set"
|
||||||
msgstr "未確認"
|
msgstr "未確認"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Not connected"
|
msgid "Not connected"
|
||||||
msgstr "未接続"
|
msgstr "未接続"
|
||||||
|
|
||||||
|
|
@ -3757,7 +3912,10 @@ msgstr "残り %d ブロックしかありません！"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Open"
|
msgid "Open"
|
||||||
msgstr "開く"
|
msgstr "開く"
|
||||||
|
|
||||||
|
|
@ -3888,8 +4046,13 @@ msgstr "パッチ"
|
||||||
msgid "Paths"
|
msgid "Paths"
|
||||||
msgstr "フォルダ"
|
msgstr "フォルダ"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
||||||
msgid "Pause"
|
msgid "Pause"
|
||||||
msgstr "一時停止"
|
msgstr "一時停止"
|
||||||
|
|
@ -3909,8 +4072,13 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Play"
|
msgid "Play"
|
||||||
msgstr "開始"
|
msgstr "開始"
|
||||||
|
|
||||||
|
|
@ -3936,7 +4104,11 @@ msgstr "再生オプション"
|
||||||
msgid "Players"
|
msgid "Players"
|
||||||
msgstr "プレイヤー一覧"
|
msgstr "プレイヤー一覧"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Please confirm..."
|
msgid "Please confirm..."
|
||||||
msgstr "確認"
|
msgstr "確認"
|
||||||
|
|
||||||
|
|
@ -4148,10 +4320,17 @@ msgstr "ゲームリストを再更新"
|
||||||
msgid "Refresh game list"
|
msgid "Refresh game list"
|
||||||
msgstr "ゲームリストを再更新します"
|
msgstr "ゲームリストを再更新します"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434
|
||||||
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Remove"
|
msgid "Remove"
|
||||||
msgstr "削除"
|
msgstr "削除"
|
||||||
|
|
||||||
|
|
@ -4170,7 +4349,10 @@ msgid "Render to Main Window"
|
||||||
msgstr "メインウィンドウ部分に描画"
|
msgstr "メインウィンドウ部分に描画"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
||||||
msgid "Reset"
|
msgid "Reset"
|
||||||
msgstr "初期化"
|
msgstr "初期化"
|
||||||
|
|
@ -4213,7 +4395,11 @@ msgstr "ステートセーブ(&V)"
|
||||||
msgid "Safe"
|
msgid "Safe"
|
||||||
msgstr "Safe"
|
msgstr "Safe"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Sample Rate:"
|
msgid "Sample Rate:"
|
||||||
msgstr "サンプルレート"
|
msgstr "サンプルレート"
|
||||||
|
|
||||||
|
|
@ -4297,7 +4483,11 @@ msgstr "Savestate movie %s の破損を確認しました。録画を中止し
|
||||||
msgid "Scaled EFB Copy"
|
msgid "Scaled EFB Copy"
|
||||||
msgstr "Scaled EFB Copy"
|
msgstr "Scaled EFB Copy"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Scanning %s"
|
msgid "Scanning %s"
|
||||||
msgstr "確認中... .%s"
|
msgstr "確認中... .%s"
|
||||||
|
|
@ -4337,12 +4527,21 @@ msgstr "Section %s not found in SYSCONF"
|
||||||
msgid "Select"
|
msgid "Select"
|
||||||
msgstr "選択"
|
msgstr "選択"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
||||||
msgid "Select The Recording File"
|
msgid "Select The Recording File"
|
||||||
msgstr "録画ファイルを選択"
|
msgstr "録画ファイルを選択"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:740
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142
|
||||||
|
msgid "Select The Recording File"
|
||||||
|
msgstr "録画ファイルを選択"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Select a Wii WAD file to install"
|
msgid "Select a Wii WAD file to install"
|
||||||
msgstr "追加するWADファイルを選択"
|
msgstr "追加するWADファイルを選択"
|
||||||
|
|
||||||
|
|
@ -4368,6 +4567,7 @@ msgstr ""
|
||||||
msgid "Select the file to load"
|
msgid "Select the file to load"
|
||||||
msgstr "ロードするファイルを選択"
|
msgstr "ロードするファイルを選択"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
msgstr "セーブファイルを選択"
|
msgstr "セーブファイルを選択"
|
||||||
|
|
@ -4377,6 +4577,17 @@ msgid "Select the state to load"
|
||||||
msgstr "ロードするステートセーブファイルを選択"
|
msgstr "ロードするステートセーブファイルを選択"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
||||||
|
msgid "Select the save file"
|
||||||
|
msgstr "セーブファイルを選択"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457
|
||||||
|
msgid "Select the state to load"
|
||||||
|
msgstr "ロードするステートセーブファイルを選択"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Select the state to save"
|
msgid "Select the state to save"
|
||||||
msgstr "ステートセーブの保存先を選択"
|
msgstr "ステートセーブの保存先を選択"
|
||||||
|
|
||||||
|
|
@ -4755,9 +4966,15 @@ msgstr "Sound buffer creation failed: %s"
|
||||||
msgid "Space"
|
msgid "Space"
|
||||||
msgstr "Space"
|
msgstr "Space"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Spanish"
|
msgid "Spanish"
|
||||||
msgstr "スペイン語"
|
msgstr "スペイン語"
|
||||||
|
|
||||||
|
|
@ -4801,7 +5018,11 @@ msgstr "丸み"
|
||||||
msgid "Standard Controller"
|
msgid "Standard Controller"
|
||||||
msgstr "標準コントローラ"
|
msgstr "標準コントローラ"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
||||||
msgid "Start"
|
msgid "Start"
|
||||||
|
|
@ -4836,7 +5057,10 @@ msgstr "スティック"
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
||||||
msgid "Stop"
|
msgid "Stop"
|
||||||
msgstr "停止"
|
msgstr "停止"
|
||||||
|
|
@ -4913,7 +5137,10 @@ msgstr "右テーブル"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Take Screenshot"
|
msgid "Take Screenshot"
|
||||||
msgstr "スクリーンショット"
|
msgstr "スクリーンショット"
|
||||||
|
|
||||||
|
|
@ -5164,12 +5391,19 @@ msgstr "全てのログ情報を選択／解除"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Toggle Fullscreen"
|
msgid "Toggle Fullscreen"
|
||||||
msgstr "フルスクリーン表示切り替え"
|
msgstr "フルスクリーン表示切り替え"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Top"
|
msgid "Top"
|
||||||
msgstr "上部"
|
msgstr "上部"
|
||||||
|
|
||||||
|
|
@ -5278,6 +5512,18 @@ msgstr "次のIDから不明なメッセージを受信 : %d"
|
||||||
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
||||||
msgstr "Unknown message with id:%d received from player:%d Kicking player!"
|
msgstr "Unknown message with id:%d received from player:%d Kicking player!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
||||||
|
#, c-format
|
||||||
|
msgid ""
|
||||||
|
"Unknown pointer %#08x\n"
|
||||||
|
"Continue?"
|
||||||
|
msgstr ""
|
||||||
|
"不明なポインタ %#08x\n"
|
||||||
|
"続けますか？"
|
||||||
|
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
||||||
msgid "Up"
|
msgid "Up"
|
||||||
|
|
@ -5501,7 +5747,11 @@ msgstr "Wii NANDルート"
|
||||||
msgid "Wii Save Import"
|
msgid "Wii Save Import"
|
||||||
msgstr "Wiiのセーブデータをインポート"
|
msgstr "Wiiのセーブデータをインポート"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wii save files (*.bin)|*.bin"
|
msgid "Wii save files (*.bin)|*.bin"
|
||||||
msgstr "Wiiセーブデータ (*.bin)|*.bin"
|
msgstr "Wiiセーブデータ (*.bin)|*.bin"
|
||||||
|
|
||||||
|
|
@ -5532,7 +5782,11 @@ msgstr ""
|
||||||
"またはしばらく入力がなかったため省電力モードに入ったのかもしれません\n"
|
"またはしばらく入力がなかったため省電力モードに入ったのかもしれません\n"
|
||||||
"再接続しますか？"
|
"再接続しますか？"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wiimote Connected"
|
msgid "Wiimote Connected"
|
||||||
msgstr "Wii リモコン接続中"
|
msgstr "Wii リモコン接続中"
|
||||||
|
|
||||||
|
|
@ -5564,9 +5818,15 @@ msgstr "Windows Right"
|
||||||
msgid "Word Wrap"
|
msgid "Word Wrap"
|
||||||
msgstr "ワードラップ"
|
msgstr "ワードラップ"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Working..."
|
msgid "Working..."
|
||||||
msgstr "動作中..."
|
msgstr "動作中..."
|
||||||
|
|
||||||
|
|
@ -6263,6 +6523,7 @@ msgstr "| (...もしくは)"
|
||||||
|
|
||||||
#~ msgid "This is usually used to play voice and sound effects."
|
#~ msgid "This is usually used to play voice and sound effects."
|
||||||
#~ msgstr "音声や効果音の再生によく使用されます"
|
#~ msgstr "音声や効果音の再生によく使用されます"
|
||||||
|
<<<<<<< HEAD
|
||||||
|
|
||||||
#~ msgid ""
|
#~ msgid ""
|
||||||
#~ "Unknown pointer %#08x\n"
|
#~ "Unknown pointer %#08x\n"
|
||||||
|
|
@ -6270,6 +6531,8 @@ msgstr "| (...もしくは)"
|
||||||
#~ msgstr ""
|
#~ msgstr ""
|
||||||
#~ "Unknown pointer %#08x\n"
|
#~ "Unknown pointer %#08x\n"
|
||||||
#~ "Continue?"
|
#~ "Continue?"
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
|
||||||
#~ msgid "Use FPS For Limiting"
|
#~ msgid "Use FPS For Limiting"
|
||||||
#~ msgstr "有効化"
|
#~ msgstr "有効化"
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,11 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: Dolphin Emu\n"
|
"Project-Id-Version: Dolphin Emu\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
|
=======
|
||||||
|
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
"PO-Revision-Date: 2011-07-07 10:24+0900\n"
|
"PO-Revision-Date: 2011-07-07 10:24+0900\n"
|
||||||
"Last-Translator: \n"
|
"Last-Translator: \n"
|
||||||
"Language-Team: \n"
|
"Language-Team: \n"
|
||||||
|
|
@ -549,9 +553,15 @@ msgstr "패치 추가"
|
||||||
msgid "Add new pane"
|
msgid "Add new pane"
|
||||||
msgstr "새로운 창 추가"
|
msgstr "새로운 창 추가"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Add..."
|
msgid "Add..."
|
||||||
msgstr "추가..."
|
msgstr "추가..."
|
||||||
|
|
||||||
|
|
@ -619,8 +629,13 @@ msgstr "모든 GC/Wii 이미지들 (gcm, iso, ciso, gcz)"
|
||||||
msgid "All Gamecube GCM files (gcm)"
|
msgid "All Gamecube GCM files (gcm)"
|
||||||
msgstr "모든 게임큐브 GCM 파일들 (gcm)"
|
msgstr "모든 게임큐브 GCM 파일들 (gcm)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "All Save States (sav, s##)"
|
msgid "All Save States (sav, s##)"
|
||||||
msgstr "모든 상태들 저장 (sav, s##)"
|
msgstr "모든 상태들 저장 (sav, s##)"
|
||||||
|
|
||||||
|
|
@ -708,7 +723,11 @@ msgstr ""
|
||||||
msgid "Are you sure you want to delete this file? It will be gone forever!"
|
msgid "Are you sure you want to delete this file? It will be gone forever!"
|
||||||
msgstr "이 파일을 정말로 지우고 싶습니까? 그것은 영원히 사라집니다!"
|
msgstr "이 파일을 정말로 지우고 싶습니까? 그것은 영원히 사라집니다!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
||||||
msgid "Aspect Ratio:"
|
msgid "Aspect Ratio:"
|
||||||
msgstr "종횡비:"
|
msgstr "종횡비:"
|
||||||
|
|
@ -729,7 +748,11 @@ msgstr "오디오 백엔드:"
|
||||||
msgid "AudioCommon: Error opening AO device.\n"
|
msgid "AudioCommon: Error opening AO device.\n"
|
||||||
msgstr "AudioCommon: AO 장치를 열기 에러.\n"
|
msgstr "AudioCommon: AO 장치를 열기 에러.\n"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
||||||
msgid "Auto"
|
msgid "Auto"
|
||||||
msgstr "자동"
|
msgstr "자동"
|
||||||
|
|
@ -844,7 +867,11 @@ msgid "Blue Right"
|
||||||
msgstr "파랑 오른쪽"
|
msgstr "파랑 오른쪽"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Bottom"
|
msgid "Bottom"
|
||||||
msgstr "아래"
|
msgstr "아래"
|
||||||
|
|
||||||
|
|
@ -877,7 +904,11 @@ msgstr "출력 디렉토리 둘러보기"
|
||||||
msgid "Buffer:"
|
msgid "Buffer:"
|
||||||
msgstr "버퍼:"
|
msgstr "버퍼:"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
||||||
msgid "Buttons"
|
msgid "Buttons"
|
||||||
|
|
@ -1118,7 +1149,11 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
||||||
msgid "Close"
|
msgid "Close"
|
||||||
msgstr "닫기"
|
msgstr "닫기"
|
||||||
|
|
@ -1227,7 +1262,11 @@ msgstr "위모트 3 연결"
|
||||||
msgid "Connect Wiimote 4"
|
msgid "Connect Wiimote 4"
|
||||||
msgstr "위모트 4 연결"
|
msgstr "위모트 4 연결"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Connecting..."
|
msgid "Connecting..."
|
||||||
msgstr "연결중..."
|
msgstr "연결중..."
|
||||||
|
|
||||||
|
|
@ -1418,7 +1457,11 @@ msgid "DSP Emulator Engine"
|
||||||
msgstr "DSP 에뮬레이터 엔진"
|
msgstr "DSP 에뮬레이터 엔진"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "DSP HLE emulation (fast)"
|
msgid "DSP HLE emulation (fast)"
|
||||||
msgstr "DSP HLE 에뮬레이션 (빠름)"
|
msgstr "DSP HLE 에뮬레이션 (빠름)"
|
||||||
|
|
||||||
|
|
@ -1647,7 +1690,11 @@ msgstr ""
|
||||||
msgid "Divide"
|
msgid "Divide"
|
||||||
msgstr "나누기"
|
msgstr "나누기"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Do you want to stop the current emulation?"
|
msgid "Do you want to stop the current emulation?"
|
||||||
msgstr "현재 에뮬레이션을 중단하고 싶습니까?"
|
msgstr "현재 에뮬레이션을 중단하고 싶습니까?"
|
||||||
|
|
||||||
|
|
@ -1676,12 +1723,21 @@ msgstr "돌핀 에뮬된 위모트 환경설정"
|
||||||
msgid "Dolphin FIFO"
|
msgid "Dolphin FIFO"
|
||||||
msgstr "돌핀 FIFO"
|
msgstr "돌핀 FIFO"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
msgid "Dolphin GCPad Configuration"
|
msgid "Dolphin GCPad Configuration"
|
||||||
msgstr "돌핀 GC패드 환경설정"
|
msgstr "돌핀 GC패드 환경설정"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204
|
||||||
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
msgstr "돌핀 GC패드 환경설정"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Dolphin TAS Movies (*.dtm)"
|
msgid "Dolphin TAS Movies (*.dtm)"
|
||||||
msgstr "돌핀 TAS 동영상 (*.dtm)"
|
msgstr "돌핀 TAS 동영상 (*.dtm)"
|
||||||
|
|
||||||
|
|
@ -1777,9 +1833,15 @@ msgstr ""
|
||||||
"\n"
|
"\n"
|
||||||
"확신 없다면, 이것을 언체크로 두세요."
|
"확신 없다면, 이것을 언체크로 두세요."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Dutch"
|
msgid "Dutch"
|
||||||
msgstr "네덜란드어"
|
msgstr "네덜란드어"
|
||||||
|
|
||||||
|
|
@ -1922,15 +1984,22 @@ msgstr "BAT 활성"
|
||||||
msgid "Enable Block Merging"
|
msgid "Enable Block Merging"
|
||||||
msgstr "블록 합치기 활성"
|
msgstr "블록 합치기 활성"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
||||||
msgid "Enable Bounding Box Calculation"
|
msgid "Enable Bounding Box Calculation"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
||||||
msgid "Enable Cache"
|
msgid "Enable Cache"
|
||||||
msgstr "캐쉬 활성"
|
msgstr "캐쉬 활성"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Enable Cheats"
|
msgid "Enable Cheats"
|
||||||
msgstr "치트 활성"
|
msgstr "치트 활성"
|
||||||
|
|
||||||
|
|
@ -2081,9 +2150,15 @@ msgstr ""
|
||||||
msgid "End"
|
msgid "End"
|
||||||
msgstr "끝"
|
msgstr "끝"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "English"
|
msgid "English"
|
||||||
msgstr "영어"
|
msgstr "영어"
|
||||||
|
|
||||||
|
|
@ -2112,6 +2187,7 @@ msgstr "같음"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
msgid "Error"
|
msgid "Error"
|
||||||
msgstr "에러"
|
msgstr "에러"
|
||||||
|
|
@ -2123,6 +2199,12 @@ msgid ""
|
||||||
"Sorry, Wii recording is temporarily broken."
|
"Sorry, Wii recording is temporarily broken."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169
|
||||||
|
msgid "Error"
|
||||||
|
msgstr "에러"
|
||||||
|
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
||||||
msgid "Error loading selected language. Falling back to system default."
|
msgid "Error loading selected language. Falling back to system default."
|
||||||
msgstr "선택된 언어 로딩 에러. 시스템 기본으로 돌아갑니다."
|
msgstr "선택된 언어 로딩 에러. 시스템 기본으로 돌아갑니다."
|
||||||
|
|
@ -2577,9 +2659,15 @@ msgstr "녹화할 프레임"
|
||||||
msgid "Free Look"
|
msgid "Free Look"
|
||||||
msgstr "자유로운 보기"
|
msgstr "자유로운 보기"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "French"
|
msgid "French"
|
||||||
msgstr "프랑스어"
|
msgstr "프랑스어"
|
||||||
|
|
||||||
|
|
@ -2646,7 +2734,11 @@ msgid "Gamecube &Pad Settings"
|
||||||
msgstr "게임큐브 패드 설정(&P)"
|
msgstr "게임큐브 패드 설정(&P)"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
||||||
msgstr "게임큐브 메모리 카드들 (*.raw,*.gcp)"
|
msgstr "게임큐브 메모리 카드들 (*.raw,*.gcp)"
|
||||||
|
|
||||||
|
|
@ -2669,8 +2761,12 @@ msgstr ""
|
||||||
"(잘못된 코드이거나 코드 타입이 아직 지원않된다.)"
|
"(잘못된 코드이거나 코드 타입이 아직 지원않된다.)"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
||||||
msgid "General"
|
msgid "General"
|
||||||
msgstr "일반"
|
msgstr "일반"
|
||||||
|
|
@ -2679,9 +2775,15 @@ msgstr "일반"
|
||||||
msgid "General Settings"
|
msgid "General Settings"
|
||||||
msgstr "일반 설정"
|
msgstr "일반 설정"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "German"
|
msgid "German"
|
||||||
msgstr "독일어"
|
msgstr "독일어"
|
||||||
|
|
||||||
|
|
@ -2811,8 +2913,12 @@ msgid "Hotkey Configuration"
|
||||||
msgstr "단축키 설정"
|
msgstr "단축키 설정"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Hotkeys"
|
msgid "Hotkeys"
|
||||||
msgstr "단축키들"
|
msgstr "단축키들"
|
||||||
|
|
||||||
|
|
@ -3034,7 +3140,11 @@ msgstr ""
|
||||||
"InstallExceptionHandler 호출됨, 하지만 이 플랫폼은 아직 그것을 지원하지 않습"
|
"InstallExceptionHandler 호출됨, 하지만 이 플랫폼은 아직 그것을 지원하지 않습"
|
||||||
"니다."
|
"니다."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Installing WAD..."
|
msgid "Installing WAD..."
|
||||||
msgstr "WAD 설치하기..."
|
msgstr "WAD 설치하기..."
|
||||||
|
|
||||||
|
|
@ -3116,9 +3226,15 @@ msgstr "비적합 기록 파일"
|
||||||
msgid "Invalid state"
|
msgid "Invalid state"
|
||||||
msgstr "비적합 상태"
|
msgstr "비적합 상태"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Italian"
|
msgid "Italian"
|
||||||
msgstr "이탈리아어"
|
msgstr "이탈리아어"
|
||||||
|
|
||||||
|
|
@ -3276,11 +3392,19 @@ msgstr "슬롯8 상태 로드"
|
||||||
msgid "Load State..."
|
msgid "Load State..."
|
||||||
msgstr "상태 로드..."
|
msgstr "상태 로드..."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
msgid "Load Wii System Menu"
|
msgid "Load Wii System Menu"
|
||||||
msgstr "Wii 시스템 메뉴 로드"
|
msgstr "Wii 시스템 메뉴 로드"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
|
||||||
|
msgid "Load Wii System Menu"
|
||||||
|
msgstr "Wii 시스템 메뉴 로드"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Load Wii System Menu %d%c"
|
msgid "Load Wii System Menu %d%c"
|
||||||
msgstr "Wii 시스템 메뉴 %d %c 로드"
|
msgstr "Wii 시스템 메뉴 %d %c 로드"
|
||||||
|
|
@ -3362,7 +3486,11 @@ msgstr "MMU 스피드 핵"
|
||||||
msgid "MadCatz Gameshark files(*.gcs)"
|
msgid "MadCatz Gameshark files(*.gcs)"
|
||||||
msgstr "MadCatz 게임샤크 파일들(*.gcs)"
|
msgstr "MadCatz 게임샤크 파일들(*.gcs)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
||||||
msgid "Main Stick"
|
msgid "Main Stick"
|
||||||
msgstr "메인 스틱"
|
msgstr "메인 스틱"
|
||||||
|
|
@ -3393,7 +3521,11 @@ msgid "Memory Byte"
|
||||||
msgstr "메모리 바이트"
|
msgstr "메모리 바이트"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Memory Card"
|
msgid "Memory Card"
|
||||||
msgstr "메모리 카드"
|
msgstr "메모리 카드"
|
||||||
|
|
||||||
|
|
@ -3591,7 +3723,11 @@ msgstr "NP 탭"
|
||||||
msgid "NP Up"
|
msgid "NP Up"
|
||||||
msgstr "NP 위"
|
msgstr "NP 위"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
||||||
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
||||||
msgid "Name:"
|
msgid "Name:"
|
||||||
|
|
@ -3678,7 +3814,11 @@ msgstr "같지 않음"
|
||||||
msgid "Not Set"
|
msgid "Not Set"
|
||||||
msgstr "설정 안함"
|
msgstr "설정 안함"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Not connected"
|
msgid "Not connected"
|
||||||
msgstr "연결되지 않음"
|
msgstr "연결되지 않음"
|
||||||
|
|
||||||
|
|
@ -3739,7 +3879,10 @@ msgstr "%d 블럭들만 유용한"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Open"
|
msgid "Open"
|
||||||
msgstr "열기"
|
msgstr "열기"
|
||||||
|
|
||||||
|
|
@ -3867,8 +4010,13 @@ msgstr "패치"
|
||||||
msgid "Paths"
|
msgid "Paths"
|
||||||
msgstr "경로"
|
msgstr "경로"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
||||||
msgid "Pause"
|
msgid "Pause"
|
||||||
msgstr "일시정지"
|
msgstr "일시정지"
|
||||||
|
|
@ -3888,8 +4036,13 @@ msgstr "관점 %d"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Play"
|
msgid "Play"
|
||||||
msgstr " 실행 "
|
msgstr " 실행 "
|
||||||
|
|
||||||
|
|
@ -3915,7 +4068,11 @@ msgstr "재생 옵션"
|
||||||
msgid "Players"
|
msgid "Players"
|
||||||
msgstr "플레이어"
|
msgstr "플레이어"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Please confirm..."
|
msgid "Please confirm..."
|
||||||
msgstr "확인해주세요..."
|
msgstr "확인해주세요..."
|
||||||
|
|
||||||
|
|
@ -4127,10 +4284,17 @@ msgstr "목록 새로 고침"
|
||||||
msgid "Refresh game list"
|
msgid "Refresh game list"
|
||||||
msgstr "게임 목록 새로 고침"
|
msgstr "게임 목록 새로 고침"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434
|
||||||
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Remove"
|
msgid "Remove"
|
||||||
msgstr "제거"
|
msgstr "제거"
|
||||||
|
|
||||||
|
|
@ -4149,7 +4313,10 @@ msgid "Render to Main Window"
|
||||||
msgstr "메인 윈도우에 렌더"
|
msgstr "메인 윈도우에 렌더"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
||||||
msgid "Reset"
|
msgid "Reset"
|
||||||
msgstr "리셋"
|
msgstr "리셋"
|
||||||
|
|
@ -4192,7 +4359,11 @@ msgstr "상태 저장(&v) "
|
||||||
msgid "Safe"
|
msgid "Safe"
|
||||||
msgstr "안전"
|
msgstr "안전"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Sample Rate:"
|
msgid "Sample Rate:"
|
||||||
msgstr "샘플율:"
|
msgstr "샘플율:"
|
||||||
|
|
||||||
|
|
@ -4276,7 +4447,11 @@ msgstr "%s 영상 상태저장이 손상되었습니다, 영상 기록 중지...
|
||||||
msgid "Scaled EFB Copy"
|
msgid "Scaled EFB Copy"
|
||||||
msgstr "스케일된 EFB 복사"
|
msgstr "스케일된 EFB 복사"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Scanning %s"
|
msgid "Scanning %s"
|
||||||
msgstr "스캐닝 %s"
|
msgstr "스캐닝 %s"
|
||||||
|
|
@ -4316,12 +4491,21 @@ msgstr "섹션 %s를 SYSCONF에서 찾을 수 없음"
|
||||||
msgid "Select"
|
msgid "Select"
|
||||||
msgstr "선택"
|
msgstr "선택"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
||||||
msgid "Select The Recording File"
|
msgid "Select The Recording File"
|
||||||
msgstr "기록 파일 선택"
|
msgstr "기록 파일 선택"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:740
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142
|
||||||
|
msgid "Select The Recording File"
|
||||||
|
msgstr "기록 파일 선택"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Select a Wii WAD file to install"
|
msgid "Select a Wii WAD file to install"
|
||||||
msgstr "설치할 Wii WAD 파일 선택"
|
msgstr "설치할 Wii WAD 파일 선택"
|
||||||
|
|
||||||
|
|
@ -4347,6 +4531,7 @@ msgstr "유동적인 윈도우즈 선택"
|
||||||
msgid "Select the file to load"
|
msgid "Select the file to load"
|
||||||
msgstr "로드할 파일 선택"
|
msgstr "로드할 파일 선택"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
msgstr "저장 파일을 선택"
|
msgstr "저장 파일을 선택"
|
||||||
|
|
@ -4356,6 +4541,17 @@ msgid "Select the state to load"
|
||||||
msgstr "로드할 상태 선택"
|
msgstr "로드할 상태 선택"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
||||||
|
msgid "Select the save file"
|
||||||
|
msgstr "저장 파일을 선택"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457
|
||||||
|
msgid "Select the state to load"
|
||||||
|
msgstr "로드할 상태 선택"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Select the state to save"
|
msgid "Select the state to save"
|
||||||
msgstr "저장할 상태 선택"
|
msgstr "저장할 상태 선택"
|
||||||
|
|
||||||
|
|
@ -4730,9 +4926,15 @@ msgstr "사운드 버퍼 생성 실패했습니다: %s"
|
||||||
msgid "Space"
|
msgid "Space"
|
||||||
msgstr "스페이스"
|
msgstr "스페이스"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Spanish"
|
msgid "Spanish"
|
||||||
msgstr "스페인어"
|
msgstr "스페인어"
|
||||||
|
|
||||||
|
|
@ -4776,7 +4978,11 @@ msgstr "스퀘어 스틱"
|
||||||
msgid "Standard Controller"
|
msgid "Standard Controller"
|
||||||
msgstr "표준 컨트롤러"
|
msgstr "표준 컨트롤러"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
||||||
msgid "Start"
|
msgid "Start"
|
||||||
|
|
@ -4811,7 +5017,10 @@ msgstr "스틱"
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
||||||
msgid "Stop"
|
msgid "Stop"
|
||||||
msgstr "중지"
|
msgstr "중지"
|
||||||
|
|
@ -4887,7 +5096,10 @@ msgstr "테이블 오른쪽"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Take Screenshot"
|
msgid "Take Screenshot"
|
||||||
msgstr "스크린샷 찍기"
|
msgstr "스크린샷 찍기"
|
||||||
|
|
||||||
|
|
@ -5129,12 +5341,19 @@ msgstr "모든 로그 타입 토글"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Toggle Fullscreen"
|
msgid "Toggle Fullscreen"
|
||||||
msgstr "전체화면 토글"
|
msgstr "전체화면 토글"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Top"
|
msgid "Top"
|
||||||
msgstr "위"
|
msgstr "위"
|
||||||
|
|
||||||
|
|
@ -5242,6 +5461,18 @@ msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"id:%d의 알려지지 않은 메시지, 플레이어:%d 플레이어 킥킹으로 부터 전달된!"
|
"id:%d의 알려지지 않은 메시지, 플레이어:%d 플레이어 킥킹으로 부터 전달된!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
||||||
|
#, c-format
|
||||||
|
msgid ""
|
||||||
|
"Unknown pointer %#08x\n"
|
||||||
|
"Continue?"
|
||||||
|
msgstr ""
|
||||||
|
"알려지지 않은 포인터 %#08x\n"
|
||||||
|
"계속합니까?"
|
||||||
|
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
||||||
msgid "Up"
|
msgid "Up"
|
||||||
|
|
@ -5463,7 +5694,11 @@ msgstr "Wii NAND 루트:"
|
||||||
msgid "Wii Save Import"
|
msgid "Wii Save Import"
|
||||||
msgstr "Wii 저장 가져오기"
|
msgstr "Wii 저장 가져오기"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wii save files (*.bin)|*.bin"
|
msgid "Wii save files (*.bin)|*.bin"
|
||||||
msgstr "Wii 저장 파일들 (*.bin)|*.bin"
|
msgstr "Wii 저장 파일들 (*.bin)|*.bin"
|
||||||
|
|
||||||
|
|
@ -5494,7 +5729,11 @@ msgstr ""
|
||||||
"혹은 아마도 아이들 타임 아웃이거나 다른 원인 때문인 것 같습니다.\n"
|
"혹은 아마도 아이들 타임 아웃이거나 다른 원인 때문인 것 같습니다.\n"
|
||||||
"당신은 즉시 재연결 하고 싶습니까?"
|
"당신은 즉시 재연결 하고 싶습니까?"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wiimote Connected"
|
msgid "Wiimote Connected"
|
||||||
msgstr "위모트가 연결됨"
|
msgstr "위모트가 연결됨"
|
||||||
|
|
||||||
|
|
@ -5527,9 +5766,15 @@ msgstr "윈도우즈 오른쪽"
|
||||||
msgid "Word Wrap"
|
msgid "Word Wrap"
|
||||||
msgstr "자동 줄바꿈"
|
msgstr "자동 줄바꿈"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Working..."
|
msgid "Working..."
|
||||||
msgstr "작동중..."
|
msgstr "작동중..."
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,11 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: Dolphin Emu\n"
|
"Project-Id-Version: Dolphin Emu\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
|
=======
|
||||||
|
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
"PO-Revision-Date: 2011-06-06 20:15+0100\n"
|
"PO-Revision-Date: 2011-06-06 20:15+0100\n"
|
||||||
"Last-Translator: Knut <e-k-nut@hotmail.com>\n"
|
"Last-Translator: Knut <e-k-nut@hotmail.com>\n"
|
||||||
"Language-Team: Norwegian <e-k-nut@hotmail.com>\n"
|
"Language-Team: Norwegian <e-k-nut@hotmail.com>\n"
|
||||||
|
|
@ -555,9 +559,15 @@ msgstr "Legg til Patch"
|
||||||
msgid "Add new pane"
|
msgid "Add new pane"
|
||||||
msgstr "Legg til ny rute"
|
msgstr "Legg til ny rute"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Add..."
|
msgid "Add..."
|
||||||
msgstr "Legg til..."
|
msgstr "Legg til..."
|
||||||
|
|
||||||
|
|
@ -625,8 +635,13 @@ msgstr "Alle GC/Wii-bildefiler (gcm, iso, ciso, wad)"
|
||||||
msgid "All Gamecube GCM files (gcm)"
|
msgid "All Gamecube GCM files (gcm)"
|
||||||
msgstr "Alle GameCube GCM-filer (gcm)"
|
msgstr "Alle GameCube GCM-filer (gcm)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "All Save States (sav, s##)"
|
msgid "All Save States (sav, s##)"
|
||||||
msgstr "Alle Save States (sav, s##)"
|
msgstr "Alle Save States (sav, s##)"
|
||||||
|
|
||||||
|
|
@ -718,7 +733,11 @@ msgstr ""
|
||||||
"Er du sikker på at du vil slette denne filen?\n"
|
"Er du sikker på at du vil slette denne filen?\n"
|
||||||
"Den vil bli borte for alltid!"
|
"Den vil bli borte for alltid!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
||||||
msgid "Aspect Ratio:"
|
msgid "Aspect Ratio:"
|
||||||
msgstr "Aspektforhold:"
|
msgstr "Aspektforhold:"
|
||||||
|
|
@ -739,7 +758,11 @@ msgstr "Audio Backend:"
|
||||||
msgid "AudioCommon: Error opening AO device.\n"
|
msgid "AudioCommon: Error opening AO device.\n"
|
||||||
msgstr "AudioCommon: Feil ved åpning av AO-device.\n"
|
msgstr "AudioCommon: Feil ved åpning av AO-device.\n"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
||||||
msgid "Auto"
|
msgid "Auto"
|
||||||
msgstr "Automatisk"
|
msgstr "Automatisk"
|
||||||
|
|
@ -854,7 +877,11 @@ msgid "Blue Right"
|
||||||
msgstr "Blå Høyre"
|
msgstr "Blå Høyre"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Bottom"
|
msgid "Bottom"
|
||||||
msgstr "Bunn"
|
msgstr "Bunn"
|
||||||
|
|
||||||
|
|
@ -887,7 +914,11 @@ msgstr "Bla etter lagringssted"
|
||||||
msgid "Buffer:"
|
msgid "Buffer:"
|
||||||
msgstr "Buffer:"
|
msgstr "Buffer:"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
||||||
msgid "Buttons"
|
msgid "Buttons"
|
||||||
|
|
@ -1130,7 +1161,11 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
||||||
msgid "Close"
|
msgid "Close"
|
||||||
msgstr "Lukk"
|
msgstr "Lukk"
|
||||||
|
|
@ -1239,7 +1274,11 @@ msgstr "Koble til Wiimote 3"
|
||||||
msgid "Connect Wiimote 4"
|
msgid "Connect Wiimote 4"
|
||||||
msgstr "Koble til Wiimote 4"
|
msgstr "Koble til Wiimote 4"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Connecting..."
|
msgid "Connecting..."
|
||||||
msgstr "Kobler til..."
|
msgstr "Kobler til..."
|
||||||
|
|
||||||
|
|
@ -1429,7 +1468,11 @@ msgid "DSP Emulator Engine"
|
||||||
msgstr "CPU Emulatormotor"
|
msgstr "CPU Emulatormotor"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "DSP HLE emulation (fast)"
|
msgid "DSP HLE emulation (fast)"
|
||||||
msgstr "DSP HLE-emulering (raskt)"
|
msgstr "DSP HLE-emulering (raskt)"
|
||||||
|
|
||||||
|
|
@ -1660,7 +1703,11 @@ msgstr ""
|
||||||
msgid "Divide"
|
msgid "Divide"
|
||||||
msgstr "Del"
|
msgstr "Del"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Do you want to stop the current emulation?"
|
msgid "Do you want to stop the current emulation?"
|
||||||
msgstr "Vil du stoppe pågående emulering?"
|
msgstr "Vil du stoppe pågående emulering?"
|
||||||
|
|
||||||
|
|
@ -1689,12 +1736,21 @@ msgstr "Dolphin Emulert Wiimote Konfigurasjon"
|
||||||
msgid "Dolphin FIFO"
|
msgid "Dolphin FIFO"
|
||||||
msgstr "Dolphin FIFO"
|
msgstr "Dolphin FIFO"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
msgid "Dolphin GCPad Configuration"
|
msgid "Dolphin GCPad Configuration"
|
||||||
msgstr "Dolphin GC-kontroll konfigurasjon"
|
msgstr "Dolphin GC-kontroll konfigurasjon"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204
|
||||||
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
msgstr "Dolphin GC-kontroll konfigurasjon"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Dolphin TAS Movies (*.dtm)"
|
msgid "Dolphin TAS Movies (*.dtm)"
|
||||||
msgstr "Dolphin TAS-Filmer (*.dtm)"
|
msgstr "Dolphin TAS-Filmer (*.dtm)"
|
||||||
|
|
||||||
|
|
@ -1790,9 +1846,15 @@ msgstr ""
|
||||||
"\n"
|
"\n"
|
||||||
"Hvis usikker, la stå avslått."
|
"Hvis usikker, la stå avslått."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Dutch"
|
msgid "Dutch"
|
||||||
msgstr "Nederlansk"
|
msgstr "Nederlansk"
|
||||||
|
|
||||||
|
|
@ -1935,15 +1997,22 @@ msgstr "Aktiver BAT"
|
||||||
msgid "Enable Block Merging"
|
msgid "Enable Block Merging"
|
||||||
msgstr "Aktiver Block Merging"
|
msgstr "Aktiver Block Merging"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
||||||
msgid "Enable Bounding Box Calculation"
|
msgid "Enable Bounding Box Calculation"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
||||||
msgid "Enable Cache"
|
msgid "Enable Cache"
|
||||||
msgstr "Aktiver cache"
|
msgstr "Aktiver cache"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Enable Cheats"
|
msgid "Enable Cheats"
|
||||||
msgstr "Aktiver Juksekoder"
|
msgstr "Aktiver Juksekoder"
|
||||||
|
|
||||||
|
|
@ -2098,9 +2167,15 @@ msgstr ""
|
||||||
msgid "End"
|
msgid "End"
|
||||||
msgstr "Slutt"
|
msgstr "Slutt"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "English"
|
msgid "English"
|
||||||
msgstr "Engelsk"
|
msgstr "Engelsk"
|
||||||
|
|
||||||
|
|
@ -2129,6 +2204,7 @@ msgstr "Lik"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
msgid "Error"
|
msgid "Error"
|
||||||
msgstr "Feil"
|
msgstr "Feil"
|
||||||
|
|
@ -2140,6 +2216,12 @@ msgid ""
|
||||||
"Sorry, Wii recording is temporarily broken."
|
"Sorry, Wii recording is temporarily broken."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169
|
||||||
|
msgid "Error"
|
||||||
|
msgstr "Feil"
|
||||||
|
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
||||||
msgid "Error loading selected language. Falling back to system default."
|
msgid "Error loading selected language. Falling back to system default."
|
||||||
msgstr "Feil ved lasting av valgt språk. Faller tilbake til systemstandarden."
|
msgstr "Feil ved lasting av valgt språk. Faller tilbake til systemstandarden."
|
||||||
|
|
@ -2595,9 +2677,15 @@ msgstr "Bilder Til Opptak"
|
||||||
msgid "Free Look"
|
msgid "Free Look"
|
||||||
msgstr "Fri Utkikk"
|
msgstr "Fri Utkikk"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "French"
|
msgid "French"
|
||||||
msgstr "Fransk"
|
msgstr "Fransk"
|
||||||
|
|
||||||
|
|
@ -2664,7 +2752,11 @@ msgid "Gamecube &Pad Settings"
|
||||||
msgstr "Innstillinger for &GameCube-kontroll"
|
msgstr "Innstillinger for &GameCube-kontroll"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
||||||
msgstr "GameCube-minnekort (*.raw,*.gcp)"
|
msgstr "GameCube-minnekort (*.raw,*.gcp)"
|
||||||
|
|
||||||
|
|
@ -2687,8 +2779,12 @@ msgstr ""
|
||||||
"(Enten en dårlig kode, eller så støttes ikke kodeformatet.)"
|
"(Enten en dårlig kode, eller så støttes ikke kodeformatet.)"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
||||||
msgid "General"
|
msgid "General"
|
||||||
msgstr "Generelt"
|
msgstr "Generelt"
|
||||||
|
|
@ -2697,9 +2793,15 @@ msgstr "Generelt"
|
||||||
msgid "General Settings"
|
msgid "General Settings"
|
||||||
msgstr "Generelle Innstillinger"
|
msgstr "Generelle Innstillinger"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "German"
|
msgid "German"
|
||||||
msgstr "Tysk"
|
msgstr "Tysk"
|
||||||
|
|
||||||
|
|
@ -2830,8 +2932,12 @@ msgid "Hotkey Configuration"
|
||||||
msgstr "Konfigurer Snarveistaster"
|
msgstr "Konfigurer Snarveistaster"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Hotkeys"
|
msgid "Hotkeys"
|
||||||
msgstr "Snarveistaster"
|
msgstr "Snarveistaster"
|
||||||
|
|
||||||
|
|
@ -3050,7 +3156,11 @@ msgid ""
|
||||||
"InstallExceptionHandler called, but this platform does not yet support it."
|
"InstallExceptionHandler called, but this platform does not yet support it."
|
||||||
msgstr "InstallExceptionHandler kalt, men denne plattformen støtter den ikke."
|
msgstr "InstallExceptionHandler kalt, men denne plattformen støtter den ikke."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Installing WAD..."
|
msgid "Installing WAD..."
|
||||||
msgstr "Installer WAD..."
|
msgstr "Installer WAD..."
|
||||||
|
|
||||||
|
|
@ -3132,9 +3242,15 @@ msgstr "Ugyldig opptaksfil"
|
||||||
msgid "Invalid state"
|
msgid "Invalid state"
|
||||||
msgstr "Ugyldig save state"
|
msgstr "Ugyldig save state"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Italian"
|
msgid "Italian"
|
||||||
msgstr "Italiensk"
|
msgstr "Italiensk"
|
||||||
|
|
||||||
|
|
@ -3292,11 +3408,19 @@ msgstr "Last Inn Save State Slot 8"
|
||||||
msgid "Load State..."
|
msgid "Load State..."
|
||||||
msgstr "Last Inn Save State..."
|
msgstr "Last Inn Save State..."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
msgid "Load Wii System Menu"
|
msgid "Load Wii System Menu"
|
||||||
msgstr "Last inn Wii System Meny"
|
msgstr "Last inn Wii System Meny"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
|
||||||
|
msgid "Load Wii System Menu"
|
||||||
|
msgstr "Last inn Wii System Meny"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Load Wii System Menu %d%c"
|
msgid "Load Wii System Menu %d%c"
|
||||||
msgstr "Last inn Wii System Meny %d %c"
|
msgstr "Last inn Wii System Meny %d %c"
|
||||||
|
|
@ -3378,7 +3502,11 @@ msgstr "Ytelses-hack for MMU"
|
||||||
msgid "MadCatz Gameshark files(*.gcs)"
|
msgid "MadCatz Gameshark files(*.gcs)"
|
||||||
msgstr "MadCatz Gameshark-filer(*.gcs)"
|
msgstr "MadCatz Gameshark-filer(*.gcs)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
||||||
msgid "Main Stick"
|
msgid "Main Stick"
|
||||||
msgstr "Hoved-joystick"
|
msgstr "Hoved-joystick"
|
||||||
|
|
@ -3409,7 +3537,11 @@ msgid "Memory Byte"
|
||||||
msgstr "Memory Byte"
|
msgstr "Memory Byte"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Memory Card"
|
msgid "Memory Card"
|
||||||
msgstr "Minnekort"
|
msgstr "Minnekort"
|
||||||
|
|
||||||
|
|
@ -3607,7 +3739,11 @@ msgstr "NP Tab"
|
||||||
msgid "NP Up"
|
msgid "NP Up"
|
||||||
msgstr "NP Opp"
|
msgstr "NP Opp"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
||||||
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
||||||
msgid "Name:"
|
msgid "Name:"
|
||||||
|
|
@ -3694,7 +3830,11 @@ msgstr "Ikke Lik"
|
||||||
msgid "Not Set"
|
msgid "Not Set"
|
||||||
msgstr "Ikke Satt"
|
msgstr "Ikke Satt"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Not connected"
|
msgid "Not connected"
|
||||||
msgstr "Ikke tilkoblet"
|
msgstr "Ikke tilkoblet"
|
||||||
|
|
||||||
|
|
@ -3755,7 +3895,10 @@ msgstr "Kun %d blokker tilgjengelig"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Open"
|
msgid "Open"
|
||||||
msgstr "Åpne"
|
msgstr "Åpne"
|
||||||
|
|
||||||
|
|
@ -3886,8 +4029,13 @@ msgstr "Patcher"
|
||||||
msgid "Paths"
|
msgid "Paths"
|
||||||
msgstr "Mappestier"
|
msgstr "Mappestier"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
||||||
msgid "Pause"
|
msgid "Pause"
|
||||||
msgstr "Pause"
|
msgstr "Pause"
|
||||||
|
|
@ -3907,8 +4055,13 @@ msgstr "Perspektiv %d"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Play"
|
msgid "Play"
|
||||||
msgstr "Spill"
|
msgstr "Spill"
|
||||||
|
|
||||||
|
|
@ -3934,7 +4087,11 @@ msgstr "Avspillingsalterntiver"
|
||||||
msgid "Players"
|
msgid "Players"
|
||||||
msgstr "Spillere"
|
msgstr "Spillere"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Please confirm..."
|
msgid "Please confirm..."
|
||||||
msgstr "Vennligst bekreft..."
|
msgstr "Vennligst bekreft..."
|
||||||
|
|
||||||
|
|
@ -4147,10 +4304,17 @@ msgstr "Oppdater liste"
|
||||||
msgid "Refresh game list"
|
msgid "Refresh game list"
|
||||||
msgstr "Oppdater spilliste"
|
msgstr "Oppdater spilliste"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434
|
||||||
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Remove"
|
msgid "Remove"
|
||||||
msgstr "Fjern"
|
msgstr "Fjern"
|
||||||
|
|
||||||
|
|
@ -4169,7 +4333,10 @@ msgid "Render to Main Window"
|
||||||
msgstr "Render til Hovedvindu"
|
msgstr "Render til Hovedvindu"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
||||||
msgid "Reset"
|
msgid "Reset"
|
||||||
msgstr "Restart"
|
msgstr "Restart"
|
||||||
|
|
@ -4212,7 +4379,11 @@ msgstr "Lagre Sa&ve State"
|
||||||
msgid "Safe"
|
msgid "Safe"
|
||||||
msgstr "Sikker"
|
msgstr "Sikker"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Sample Rate:"
|
msgid "Sample Rate:"
|
||||||
msgstr "Samplingsratio:"
|
msgstr "Samplingsratio:"
|
||||||
|
|
||||||
|
|
@ -4296,7 +4467,11 @@ msgstr "Save State-film %s er korrupt, opptak avsluttes..."
|
||||||
msgid "Scaled EFB Copy"
|
msgid "Scaled EFB Copy"
|
||||||
msgstr "Skalert EFB-kopi"
|
msgstr "Skalert EFB-kopi"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Scanning %s"
|
msgid "Scanning %s"
|
||||||
msgstr "Søker i %s"
|
msgstr "Søker i %s"
|
||||||
|
|
@ -4336,12 +4511,21 @@ msgstr "Seksjon %s ikke funnet i SYSCONF"
|
||||||
msgid "Select"
|
msgid "Select"
|
||||||
msgstr "Velg"
|
msgstr "Velg"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
||||||
msgid "Select The Recording File"
|
msgid "Select The Recording File"
|
||||||
msgstr "Velg Opptaksfil"
|
msgstr "Velg Opptaksfil"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:740
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142
|
||||||
|
msgid "Select The Recording File"
|
||||||
|
msgstr "Velg Opptaksfil"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Select a Wii WAD file to install"
|
msgid "Select a Wii WAD file to install"
|
||||||
msgstr "Velg en Wii WAD-fil å innstallere"
|
msgstr "Velg en Wii WAD-fil å innstallere"
|
||||||
|
|
||||||
|
|
@ -4367,6 +4551,7 @@ msgstr "Velg flytvindu"
|
||||||
msgid "Select the file to load"
|
msgid "Select the file to load"
|
||||||
msgstr "Velg fil å laste"
|
msgstr "Velg fil å laste"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
msgstr "Velg lagringsfil"
|
msgstr "Velg lagringsfil"
|
||||||
|
|
@ -4376,6 +4561,17 @@ msgid "Select the state to load"
|
||||||
msgstr "Velg en save state å laste"
|
msgstr "Velg en save state å laste"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
||||||
|
msgid "Select the save file"
|
||||||
|
msgstr "Velg lagringsfil"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457
|
||||||
|
msgid "Select the state to load"
|
||||||
|
msgstr "Velg en save state å laste"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Select the state to save"
|
msgid "Select the state to save"
|
||||||
msgstr "Velg en save state å lagre"
|
msgstr "Velg en save state å lagre"
|
||||||
|
|
||||||
|
|
@ -4752,9 +4948,15 @@ msgstr "Laging av lydbuffer mislyktes: %s"
|
||||||
msgid "Space"
|
msgid "Space"
|
||||||
msgstr "Mellomrom"
|
msgstr "Mellomrom"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Spanish"
|
msgid "Spanish"
|
||||||
msgstr "Spansk"
|
msgstr "Spansk"
|
||||||
|
|
||||||
|
|
@ -4797,7 +4999,11 @@ msgstr "Kvadrat-joystick"
|
||||||
msgid "Standard Controller"
|
msgid "Standard Controller"
|
||||||
msgstr "Standardkontroller"
|
msgstr "Standardkontroller"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
||||||
msgid "Start"
|
msgid "Start"
|
||||||
|
|
@ -4832,7 +5038,10 @@ msgstr "Joystick"
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
||||||
msgid "Stop"
|
msgid "Stop"
|
||||||
msgstr "Stopp"
|
msgstr "Stopp"
|
||||||
|
|
@ -4910,7 +5119,10 @@ msgstr "Tabell Høyre"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Take Screenshot"
|
msgid "Take Screenshot"
|
||||||
msgstr "Ta Skjermbilde"
|
msgstr "Ta Skjermbilde"
|
||||||
|
|
||||||
|
|
@ -5153,12 +5365,19 @@ msgstr "Vipp Alle Loggtyper"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Toggle Fullscreen"
|
msgid "Toggle Fullscreen"
|
||||||
msgstr "Vipp Mellom Vindu/Fullskjerm"
|
msgstr "Vipp Mellom Vindu/Fullskjerm"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Top"
|
msgid "Top"
|
||||||
msgstr "Topp"
|
msgstr "Topp"
|
||||||
|
|
||||||
|
|
@ -5265,6 +5484,18 @@ msgstr "Ukjent melding mottatt med ID: %d"
|
||||||
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
||||||
msgstr "Ukjent melding mottatt med ID: %d fra spiller: %d Sparker spiller!"
|
msgstr "Ukjent melding mottatt med ID: %d fra spiller: %d Sparker spiller!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
||||||
|
#, c-format
|
||||||
|
msgid ""
|
||||||
|
"Unknown pointer %#08x\n"
|
||||||
|
"Continue?"
|
||||||
|
msgstr ""
|
||||||
|
"Ukjent peker %#08x\n"
|
||||||
|
"Fortsett?"
|
||||||
|
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
||||||
msgid "Up"
|
msgid "Up"
|
||||||
|
|
@ -5487,7 +5718,11 @@ msgstr "Wii NAND-rot:"
|
||||||
msgid "Wii Save Import"
|
msgid "Wii Save Import"
|
||||||
msgstr "Importer Wii-lagringsfil"
|
msgstr "Importer Wii-lagringsfil"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wii save files (*.bin)|*.bin"
|
msgid "Wii save files (*.bin)|*.bin"
|
||||||
msgstr "Wii-lagringsfiler (*.bin)|*.bin"
|
msgstr "Wii-lagringsfiler (*.bin)|*.bin"
|
||||||
|
|
||||||
|
|
@ -5518,7 +5753,11 @@ msgstr ""
|
||||||
"eller kanskje den koblet seg fra pga. inaktivitet.\n"
|
"eller kanskje den koblet seg fra pga. inaktivitet.\n"
|
||||||
"Vil du koble til igjen øyeblikkelig?"
|
"Vil du koble til igjen øyeblikkelig?"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wiimote Connected"
|
msgid "Wiimote Connected"
|
||||||
msgstr "Wiimote Tilkoblet"
|
msgstr "Wiimote Tilkoblet"
|
||||||
|
|
||||||
|
|
@ -5551,9 +5790,15 @@ msgstr "Windows Høyre"
|
||||||
msgid "Word Wrap"
|
msgid "Word Wrap"
|
||||||
msgstr "Ordkrumning"
|
msgstr "Ordkrumning"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Working..."
|
msgid "Working..."
|
||||||
msgstr "Arbeider..."
|
msgstr "Arbeider..."
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,11 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: Dolphin Emu\n"
|
"Project-Id-Version: Dolphin Emu\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
|
=======
|
||||||
|
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
"PO-Revision-Date: 2011-08-07 16:43+0100\n"
|
"PO-Revision-Date: 2011-08-07 16:43+0100\n"
|
||||||
"Last-Translator: Goost <dont_bother@mailing.me>\n"
|
"Last-Translator: Goost <dont_bother@mailing.me>\n"
|
||||||
"Language-Team: DevPro Team. <Dpro.madcreations@gmail.com>\n"
|
"Language-Team: DevPro Team. <Dpro.madcreations@gmail.com>\n"
|
||||||
|
|
@ -556,9 +560,15 @@ msgstr "Voeg Patch toe"
|
||||||
msgid "Add new pane"
|
msgid "Add new pane"
|
||||||
msgstr "Voeg een nieuwe paneel toe"
|
msgstr "Voeg een nieuwe paneel toe"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Add..."
|
msgid "Add..."
|
||||||
msgstr "Voeg toe..."
|
msgstr "Voeg toe..."
|
||||||
|
|
||||||
|
|
@ -626,8 +636,13 @@ msgstr "Alle GC/Wii images (gcm, iso, ciso, gcz)"
|
||||||
msgid "All Gamecube GCM files (gcm)"
|
msgid "All Gamecube GCM files (gcm)"
|
||||||
msgstr "Alle Gamecube GCM bestanden (gcm)"
|
msgstr "Alle Gamecube GCM bestanden (gcm)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "All Save States (sav, s##)"
|
msgid "All Save States (sav, s##)"
|
||||||
msgstr "Alle Opgeslagen Staten (sav, s##)"
|
msgstr "Alle Opgeslagen Staten (sav, s##)"
|
||||||
|
|
||||||
|
|
@ -718,7 +733,11 @@ msgstr ""
|
||||||
"Weet je zeker dat je dit bestand wilt verwijderen? Deze gegevens zijn niet "
|
"Weet je zeker dat je dit bestand wilt verwijderen? Deze gegevens zijn niet "
|
||||||
"terug te halen!"
|
"terug te halen!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
||||||
msgid "Aspect Ratio:"
|
msgid "Aspect Ratio:"
|
||||||
msgstr "Beeldverhouding:"
|
msgstr "Beeldverhouding:"
|
||||||
|
|
@ -739,7 +758,11 @@ msgstr "Geluid Backend:"
|
||||||
msgid "AudioCommon: Error opening AO device.\n"
|
msgid "AudioCommon: Error opening AO device.\n"
|
||||||
msgstr "AudioCommon: Fout bij het openen van een AO toestel. \n"
|
msgstr "AudioCommon: Fout bij het openen van een AO toestel. \n"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
||||||
msgid "Auto"
|
msgid "Auto"
|
||||||
msgstr "Auto"
|
msgstr "Auto"
|
||||||
|
|
@ -850,7 +873,11 @@ msgid "Blue Right"
|
||||||
msgstr "Blauw Rechts"
|
msgstr "Blauw Rechts"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Bottom"
|
msgid "Bottom"
|
||||||
msgstr "Onder"
|
msgstr "Onder"
|
||||||
|
|
||||||
|
|
@ -883,7 +910,11 @@ msgstr "Zoek een uitvoer folder"
|
||||||
msgid "Buffer:"
|
msgid "Buffer:"
|
||||||
msgstr "Buffer:"
|
msgstr "Buffer:"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
||||||
msgid "Buttons"
|
msgid "Buttons"
|
||||||
|
|
@ -1128,7 +1159,11 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
||||||
msgid "Close"
|
msgid "Close"
|
||||||
msgstr "Sluit"
|
msgstr "Sluit"
|
||||||
|
|
@ -1238,7 +1273,11 @@ msgstr "Verbind Wiimote 3"
|
||||||
msgid "Connect Wiimote 4"
|
msgid "Connect Wiimote 4"
|
||||||
msgstr "Verbind Wiimote 4"
|
msgstr "Verbind Wiimote 4"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Connecting..."
|
msgid "Connecting..."
|
||||||
msgstr "Verbinden..."
|
msgstr "Verbinden..."
|
||||||
|
|
||||||
|
|
@ -1429,7 +1468,11 @@ msgid "DSP Emulator Engine"
|
||||||
msgstr "DSP Emulator Motor"
|
msgstr "DSP Emulator Motor"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "DSP HLE emulation (fast)"
|
msgid "DSP HLE emulation (fast)"
|
||||||
msgstr "DSP HLE emulatie (snel)"
|
msgstr "DSP HLE emulatie (snel)"
|
||||||
|
|
||||||
|
|
@ -1662,7 +1705,11 @@ msgstr ""
|
||||||
msgid "Divide"
|
msgid "Divide"
|
||||||
msgstr "Verdelen"
|
msgstr "Verdelen"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Do you want to stop the current emulation?"
|
msgid "Do you want to stop the current emulation?"
|
||||||
msgstr "Wil je de emulatie stoppen?"
|
msgstr "Wil je de emulatie stoppen?"
|
||||||
|
|
||||||
|
|
@ -1691,12 +1738,21 @@ msgstr "Dolphin Geëmuleerde Wiimote configuratie"
|
||||||
msgid "Dolphin FIFO"
|
msgid "Dolphin FIFO"
|
||||||
msgstr "Dolphin FIFO"
|
msgstr "Dolphin FIFO"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
msgid "Dolphin GCPad Configuration"
|
msgid "Dolphin GCPad Configuration"
|
||||||
msgstr "Dolphin GCPad Configuratie"
|
msgstr "Dolphin GCPad Configuratie"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204
|
||||||
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
msgstr "Dolphin GCPad Configuratie"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Dolphin TAS Movies (*.dtm)"
|
msgid "Dolphin TAS Movies (*.dtm)"
|
||||||
msgstr "Dolphin TAS Film (*.dtm)"
|
msgstr "Dolphin TAS Film (*.dtm)"
|
||||||
|
|
||||||
|
|
@ -1791,9 +1847,15 @@ msgstr ""
|
||||||
"\n"
|
"\n"
|
||||||
"In geval van twijfel leeg laten."
|
"In geval van twijfel leeg laten."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Dutch"
|
msgid "Dutch"
|
||||||
msgstr "Nederlands"
|
msgstr "Nederlands"
|
||||||
|
|
||||||
|
|
@ -1936,16 +1998,23 @@ msgstr "Activeer BAT"
|
||||||
msgid "Enable Block Merging"
|
msgid "Enable Block Merging"
|
||||||
msgstr "Activeer Block Merging"
|
msgstr "Activeer Block Merging"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
||||||
msgid "Enable Bounding Box Calculation"
|
msgid "Enable Bounding Box Calculation"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Enable Cache"
|
msgid "Enable Cache"
|
||||||
msgstr "Activeer Cache"
|
msgstr "Activeer Cache"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Enable Cheats"
|
msgid "Enable Cheats"
|
||||||
msgstr "Activeer Cheats"
|
msgstr "Activeer Cheats"
|
||||||
|
|
||||||
|
|
@ -2101,9 +2170,15 @@ msgstr ""
|
||||||
msgid "End"
|
msgid "End"
|
||||||
msgstr "Einde"
|
msgstr "Einde"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "English"
|
msgid "English"
|
||||||
msgstr "Engels"
|
msgstr "Engels"
|
||||||
|
|
||||||
|
|
@ -2132,6 +2207,7 @@ msgstr "Gelijk"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
msgid "Error"
|
msgid "Error"
|
||||||
msgstr "Error (Fout)"
|
msgstr "Error (Fout)"
|
||||||
|
|
@ -2143,6 +2219,12 @@ msgid ""
|
||||||
"Sorry, Wii recording is temporarily broken."
|
"Sorry, Wii recording is temporarily broken."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169
|
||||||
|
msgid "Error"
|
||||||
|
msgstr "Error (Fout)"
|
||||||
|
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
||||||
msgid "Error loading selected language. Falling back to system default."
|
msgid "Error loading selected language. Falling back to system default."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2605,9 +2687,15 @@ msgstr "Frames om op te nemen"
|
||||||
msgid "Free Look"
|
msgid "Free Look"
|
||||||
msgstr "Vrije kijk"
|
msgstr "Vrije kijk"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "French"
|
msgid "French"
|
||||||
msgstr "Frans"
|
msgstr "Frans"
|
||||||
|
|
||||||
|
|
@ -2675,7 +2763,11 @@ msgid "Gamecube &Pad Settings"
|
||||||
msgstr "Gamecube &Pad Instellingen"
|
msgstr "Gamecube &Pad Instellingen"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
||||||
msgstr "Gamecube Memory Kaarten (*.raw,*.gcp)"
|
msgstr "Gamecube Memory Kaarten (*.raw,*.gcp)"
|
||||||
|
|
||||||
|
|
@ -2698,8 +2790,12 @@ msgstr ""
|
||||||
"(ofwel een onjuiste code of het type code is nog niet ondersteund.)"
|
"(ofwel een onjuiste code of het type code is nog niet ondersteund.)"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
||||||
msgid "General"
|
msgid "General"
|
||||||
msgstr "Algemeen"
|
msgstr "Algemeen"
|
||||||
|
|
@ -2708,9 +2804,15 @@ msgstr "Algemeen"
|
||||||
msgid "General Settings"
|
msgid "General Settings"
|
||||||
msgstr "Algemene Instellingen"
|
msgstr "Algemene Instellingen"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "German"
|
msgid "German"
|
||||||
msgstr "Duits"
|
msgstr "Duits"
|
||||||
|
|
||||||
|
|
@ -2841,8 +2943,12 @@ msgid "Hotkey Configuration"
|
||||||
msgstr "Sneltoets Configuratie"
|
msgstr "Sneltoets Configuratie"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Hotkeys"
|
msgid "Hotkeys"
|
||||||
msgstr "Hotkeys"
|
msgstr "Hotkeys"
|
||||||
|
|
||||||
|
|
@ -3067,7 +3173,11 @@ msgstr ""
|
||||||
"InstallExceptionHandler opgeroepen, maar dit platform ondersteund dit nog "
|
"InstallExceptionHandler opgeroepen, maar dit platform ondersteund dit nog "
|
||||||
"niet."
|
"niet."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Installing WAD..."
|
msgid "Installing WAD..."
|
||||||
msgstr "WAD aan het installeren..."
|
msgstr "WAD aan het installeren..."
|
||||||
|
|
||||||
|
|
@ -3150,9 +3260,15 @@ msgstr "Onjuist opname bestand"
|
||||||
msgid "Invalid state"
|
msgid "Invalid state"
|
||||||
msgstr "Onjuiste staat"
|
msgstr "Onjuiste staat"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Italian"
|
msgid "Italian"
|
||||||
msgstr "Italië"
|
msgstr "Italië"
|
||||||
|
|
||||||
|
|
@ -3310,12 +3426,20 @@ msgstr "Laad staat 8"
|
||||||
msgid "Load State..."
|
msgid "Load State..."
|
||||||
msgstr "Laad staat..."
|
msgstr "Laad staat..."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Load Wii System Menu"
|
msgid "Load Wii System Menu"
|
||||||
msgstr "Laad Wii System Menu(%d %c)"
|
msgstr "Laad Wii System Menu(%d %c)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, fuzzy, c-format
|
#, fuzzy, c-format
|
||||||
msgid "Load Wii System Menu %d%c"
|
msgid "Load Wii System Menu %d%c"
|
||||||
msgstr "Laad Wii System Menu(%d %c)"
|
msgstr "Laad Wii System Menu(%d %c)"
|
||||||
|
|
@ -3397,7 +3521,11 @@ msgstr "MMU Snelheids Hack"
|
||||||
msgid "MadCatz Gameshark files(*.gcs)"
|
msgid "MadCatz Gameshark files(*.gcs)"
|
||||||
msgstr "MadCatz Gameshark bestanden(*.gcs)"
|
msgstr "MadCatz Gameshark bestanden(*.gcs)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
||||||
msgid "Main Stick"
|
msgid "Main Stick"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3428,7 +3556,11 @@ msgid "Memory Byte"
|
||||||
msgstr "Geheugen Byte"
|
msgstr "Geheugen Byte"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Memory Card"
|
msgid "Memory Card"
|
||||||
msgstr "Geheugen Kaart"
|
msgstr "Geheugen Kaart"
|
||||||
|
|
||||||
|
|
@ -3627,7 +3759,11 @@ msgstr "NP Tab"
|
||||||
msgid "NP Up"
|
msgid "NP Up"
|
||||||
msgstr "NP Omhoog"
|
msgstr "NP Omhoog"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
||||||
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
||||||
msgid "Name:"
|
msgid "Name:"
|
||||||
|
|
@ -3714,7 +3850,11 @@ msgstr "Niet gelijk"
|
||||||
msgid "Not Set"
|
msgid "Not Set"
|
||||||
msgstr "Niet ingesteld"
|
msgstr "Niet ingesteld"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Not connected"
|
msgid "Not connected"
|
||||||
msgstr "Niet verbonden"
|
msgstr "Niet verbonden"
|
||||||
|
|
||||||
|
|
@ -3775,7 +3915,10 @@ msgstr "Er zijn maar %d blocks beschikaarr"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Open"
|
msgid "Open"
|
||||||
msgstr "Open"
|
msgstr "Open"
|
||||||
|
|
||||||
|
|
@ -3907,8 +4050,13 @@ msgstr "Patches"
|
||||||
msgid "Paths"
|
msgid "Paths"
|
||||||
msgstr "Pad"
|
msgstr "Pad"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
||||||
msgid "Pause"
|
msgid "Pause"
|
||||||
msgstr "Pauze"
|
msgstr "Pauze"
|
||||||
|
|
@ -3928,8 +4076,13 @@ msgstr "Perspectief %d"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Play"
|
msgid "Play"
|
||||||
msgstr "Speel"
|
msgstr "Speel"
|
||||||
|
|
||||||
|
|
@ -3955,7 +4108,11 @@ msgstr "Terugspeel Opties"
|
||||||
msgid "Players"
|
msgid "Players"
|
||||||
msgstr "Spelers"
|
msgstr "Spelers"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Please confirm..."
|
msgid "Please confirm..."
|
||||||
msgstr "Bevestig alsjeblieft..."
|
msgstr "Bevestig alsjeblieft..."
|
||||||
|
|
||||||
|
|
@ -4168,10 +4325,17 @@ msgstr "Lijst Verversen"
|
||||||
msgid "Refresh game list"
|
msgid "Refresh game list"
|
||||||
msgstr "Ververs de speellijst"
|
msgstr "Ververs de speellijst"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434
|
||||||
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Remove"
|
msgid "Remove"
|
||||||
msgstr "Verwijder"
|
msgstr "Verwijder"
|
||||||
|
|
||||||
|
|
@ -4191,7 +4355,10 @@ msgid "Render to Main Window"
|
||||||
msgstr "Geef weer op hoofdscherm"
|
msgstr "Geef weer op hoofdscherm"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
||||||
msgid "Reset"
|
msgid "Reset"
|
||||||
msgstr "Opnieuw"
|
msgstr "Opnieuw"
|
||||||
|
|
@ -4234,7 +4401,11 @@ msgstr "S&la Staat Op"
|
||||||
msgid "Safe"
|
msgid "Safe"
|
||||||
msgstr "Opslaan"
|
msgstr "Opslaan"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Sample Rate:"
|
msgid "Sample Rate:"
|
||||||
msgstr "Sample Rate:"
|
msgstr "Sample Rate:"
|
||||||
|
|
||||||
|
|
@ -4319,7 +4490,11 @@ msgstr "Save staat film %s is corrupt, het opnemen van de film is gestopt..."
|
||||||
msgid "Scaled EFB Copy"
|
msgid "Scaled EFB Copy"
|
||||||
msgstr "EFB Verkleinde Kopie"
|
msgstr "EFB Verkleinde Kopie"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Scanning %s"
|
msgid "Scanning %s"
|
||||||
msgstr "Scannen van %s"
|
msgstr "Scannen van %s"
|
||||||
|
|
@ -4359,12 +4534,21 @@ msgstr "Sectie %s niet gevonden in SYSCONF"
|
||||||
msgid "Select"
|
msgid "Select"
|
||||||
msgstr "Selecteer"
|
msgstr "Selecteer"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
||||||
msgid "Select The Recording File"
|
msgid "Select The Recording File"
|
||||||
msgstr "Selecteer de opname Bestand"
|
msgstr "Selecteer de opname Bestand"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:740
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142
|
||||||
|
msgid "Select The Recording File"
|
||||||
|
msgstr "Selecteer de opname Bestand"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Select a Wii WAD file to install"
|
msgid "Select a Wii WAD file to install"
|
||||||
msgstr "Selecteer een Wii WAD bestand om te installeren"
|
msgstr "Selecteer een Wii WAD bestand om te installeren"
|
||||||
|
|
||||||
|
|
@ -4390,6 +4574,7 @@ msgstr "Selecteer zwevende vensters"
|
||||||
msgid "Select the file to load"
|
msgid "Select the file to load"
|
||||||
msgstr "Selecteer het bestand om het te laden"
|
msgstr "Selecteer het bestand om het te laden"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
msgstr "Selecteer het save - bestand"
|
msgstr "Selecteer het save - bestand"
|
||||||
|
|
@ -4399,6 +4584,17 @@ msgid "Select the state to load"
|
||||||
msgstr "Selecteer de Staat om te laden"
|
msgstr "Selecteer de Staat om te laden"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
||||||
|
msgid "Select the save file"
|
||||||
|
msgstr "Selecteer het save - bestand"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457
|
||||||
|
msgid "Select the state to load"
|
||||||
|
msgstr "Selecteer de Staat om te laden"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Select the state to save"
|
msgid "Select the state to save"
|
||||||
msgstr "Selecteer de Staat om op te slaan"
|
msgstr "Selecteer de Staat om op te slaan"
|
||||||
|
|
||||||
|
|
@ -4771,9 +4967,15 @@ msgstr "Het aanmaken van de geluids buffer is mislukt: %s"
|
||||||
msgid "Space"
|
msgid "Space"
|
||||||
msgstr "Ruimte"
|
msgstr "Ruimte"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Spanish"
|
msgid "Spanish"
|
||||||
msgstr "Spaans"
|
msgstr "Spaans"
|
||||||
|
|
||||||
|
|
@ -4817,7 +5019,11 @@ msgstr ""
|
||||||
msgid "Standard Controller"
|
msgid "Standard Controller"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
||||||
msgid "Start"
|
msgid "Start"
|
||||||
|
|
@ -4852,7 +5058,10 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
||||||
msgid "Stop"
|
msgid "Stop"
|
||||||
msgstr "Stop"
|
msgstr "Stop"
|
||||||
|
|
@ -4924,7 +5133,10 @@ msgstr "Rechter Tabel"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Take Screenshot"
|
msgid "Take Screenshot"
|
||||||
msgstr "Neem een Schermafdruk"
|
msgstr "Neem een Schermafdruk"
|
||||||
|
|
||||||
|
|
@ -5170,12 +5382,19 @@ msgstr "Zet Alle Log Types Aan"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Toggle Fullscreen"
|
msgid "Toggle Fullscreen"
|
||||||
msgstr "Volledig Scherm Inschakelen"
|
msgstr "Volledig Scherm Inschakelen"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Top"
|
msgid "Top"
|
||||||
msgstr "Boven"
|
msgstr "Boven"
|
||||||
|
|
||||||
|
|
@ -5285,6 +5504,18 @@ msgstr ""
|
||||||
"Onbekend bericht ontvagen met id : %d ontvangen van speler: %d Speler "
|
"Onbekend bericht ontvagen met id : %d ontvangen van speler: %d Speler "
|
||||||
"eruitgeschopt!"
|
"eruitgeschopt!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
||||||
|
#, c-format
|
||||||
|
msgid ""
|
||||||
|
"Unknown pointer %#08x\n"
|
||||||
|
"Continue?"
|
||||||
|
msgstr ""
|
||||||
|
"Onbekende pointer %#08x\n"
|
||||||
|
"Doorgaan?"
|
||||||
|
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
||||||
msgid "Up"
|
msgid "Up"
|
||||||
|
|
@ -5508,7 +5739,11 @@ msgstr "Wii NAND basismap:"
|
||||||
msgid "Wii Save Import"
|
msgid "Wii Save Import"
|
||||||
msgstr "Wii Save Importeren"
|
msgstr "Wii Save Importeren"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wii save files (*.bin)|*.bin"
|
msgid "Wii save files (*.bin)|*.bin"
|
||||||
msgstr "Wii save bestanden (*.bin)|*.bin"
|
msgstr "Wii save bestanden (*.bin)|*.bin"
|
||||||
|
|
||||||
|
|
@ -5539,7 +5774,11 @@ msgstr ""
|
||||||
"of misschien is het te wijten aan een time-out of een andere reden.\n"
|
"of misschien is het te wijten aan een time-out of een andere reden.\n"
|
||||||
"Wilt u meteen opnieuw verbinden?"
|
"Wilt u meteen opnieuw verbinden?"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wiimote Connected"
|
msgid "Wiimote Connected"
|
||||||
msgstr "Wiimote Connected"
|
msgstr "Wiimote Connected"
|
||||||
|
|
||||||
|
|
@ -5572,9 +5811,15 @@ msgstr "Venster Rechts"
|
||||||
msgid "Word Wrap"
|
msgid "Word Wrap"
|
||||||
msgstr "Regelafbreking"
|
msgstr "Regelafbreking"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Working..."
|
msgid "Working..."
|
||||||
msgstr "Werken..."
|
msgstr "Werken..."
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,11 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: Dolphin Emu\n"
|
"Project-Id-Version: Dolphin Emu\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
|
=======
|
||||||
|
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
"PO-Revision-Date: 2011-08-12 17:04+0100\n"
|
"PO-Revision-Date: 2011-08-12 17:04+0100\n"
|
||||||
"Last-Translator: Krzysztof Baszczok <baszta2@gmail.com>\n"
|
"Last-Translator: Krzysztof Baszczok <baszta2@gmail.com>\n"
|
||||||
"Language-Team: Polish <baszta2@gmail.com>\n"
|
"Language-Team: Polish <baszta2@gmail.com>\n"
|
||||||
|
|
@ -554,9 +558,15 @@ msgstr "Dodaj łatkę"
|
||||||
msgid "Add new pane"
|
msgid "Add new pane"
|
||||||
msgstr "Dodaj nowy panel"
|
msgstr "Dodaj nowy panel"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Add..."
|
msgid "Add..."
|
||||||
msgstr "Dodaj..."
|
msgstr "Dodaj..."
|
||||||
|
|
||||||
|
|
@ -624,8 +634,13 @@ msgstr "Wszystkie obrazy GC/Wii (gcm, iso, ciso, gcz)"
|
||||||
msgid "All Gamecube GCM files (gcm)"
|
msgid "All Gamecube GCM files (gcm)"
|
||||||
msgstr "Pliki GCM"
|
msgstr "Pliki GCM"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "All Save States (sav, s##)"
|
msgid "All Save States (sav, s##)"
|
||||||
msgstr "Stany zapisu (sav, s##)"
|
msgstr "Stany zapisu (sav, s##)"
|
||||||
|
|
||||||
|
|
@ -713,7 +728,11 @@ msgstr ""
|
||||||
msgid "Are you sure you want to delete this file? It will be gone forever!"
|
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!"
|
msgstr "Czy jesteś pewny by usunąc ten plik? Przepadnie na zawsze!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
||||||
msgid "Aspect Ratio:"
|
msgid "Aspect Ratio:"
|
||||||
msgstr "Proporcje ekranu:"
|
msgstr "Proporcje ekranu:"
|
||||||
|
|
@ -734,7 +753,11 @@ msgstr "Audio Backend :"
|
||||||
msgid "AudioCommon: Error opening AO device.\n"
|
msgid "AudioCommon: Error opening AO device.\n"
|
||||||
msgstr "AudioCommon: Błąd otwarcia urządzenia AO.\n"
|
msgstr "AudioCommon: Błąd otwarcia urządzenia AO.\n"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
||||||
msgid "Auto"
|
msgid "Auto"
|
||||||
msgstr "Auto"
|
msgstr "Auto"
|
||||||
|
|
@ -849,7 +872,11 @@ msgid "Blue Right"
|
||||||
msgstr "Niebieski prawo"
|
msgstr "Niebieski prawo"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Bottom"
|
msgid "Bottom"
|
||||||
msgstr "Dół"
|
msgstr "Dół"
|
||||||
|
|
||||||
|
|
@ -882,7 +909,11 @@ msgstr "Szukaj folderu wyjściowego"
|
||||||
msgid "Buffer:"
|
msgid "Buffer:"
|
||||||
msgstr "Bufor:"
|
msgstr "Bufor:"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
||||||
msgid "Buttons"
|
msgid "Buttons"
|
||||||
|
|
@ -1083,7 +1114,11 @@ msgstr "Wybierz plik do otwarcia"
|
||||||
msgid "Choose a memory card:"
|
msgid "Choose a memory card:"
|
||||||
msgstr "Wybierz kartę pamięci:"
|
msgstr "Wybierz kartę pamięci:"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Choose file to use as apploader: (applies to discs constructed from "
|
"Choose file to use as apploader: (applies to discs constructed from "
|
||||||
"directories only)"
|
"directories only)"
|
||||||
|
|
@ -1125,7 +1160,11 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
||||||
msgid "Close"
|
msgid "Close"
|
||||||
msgstr "Zamknij"
|
msgstr "Zamknij"
|
||||||
|
|
@ -1234,7 +1273,11 @@ msgstr "Połącz Wiilot 3"
|
||||||
msgid "Connect Wiimote 4"
|
msgid "Connect Wiimote 4"
|
||||||
msgstr "Połącz Wiilot 4"
|
msgstr "Połącz Wiilot 4"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Connecting..."
|
msgid "Connecting..."
|
||||||
msgstr "Łączę..."
|
msgstr "Łączę..."
|
||||||
|
|
||||||
|
|
@ -1350,7 +1393,11 @@ msgstr "Utwórz nową perspektywę"
|
||||||
msgid "Created by KDE-Look.org"
|
msgid "Created by KDE-Look.org"
|
||||||
msgstr "Utworzone przez KDE-Look.org"
|
msgstr "Utworzone przez KDE-Look.org"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]"
|
"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -1426,7 +1473,11 @@ msgid "DSP Emulator Engine"
|
||||||
msgstr "DSP Emulator Engine"
|
msgstr "DSP Emulator Engine"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "DSP HLE emulation (fast)"
|
msgid "DSP HLE emulation (fast)"
|
||||||
msgstr "DSP HLE emulacja (szybkie)"
|
msgstr "DSP HLE emulacja (szybkie)"
|
||||||
|
|
||||||
|
|
@ -1657,7 +1708,11 @@ msgstr ""
|
||||||
msgid "Divide"
|
msgid "Divide"
|
||||||
msgstr "Podziel"
|
msgstr "Podziel"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Do you want to stop the current emulation?"
|
msgid "Do you want to stop the current emulation?"
|
||||||
msgstr "Zatrzymać aktualną emulację?"
|
msgstr "Zatrzymać aktualną emulację?"
|
||||||
|
|
||||||
|
|
@ -1686,12 +1741,21 @@ msgstr "Konfiguracja emulowanego Wiilota"
|
||||||
msgid "Dolphin FIFO"
|
msgid "Dolphin FIFO"
|
||||||
msgstr "Dolphin FIFO"
|
msgstr "Dolphin FIFO"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
msgid "Dolphin GCPad Configuration"
|
msgid "Dolphin GCPad Configuration"
|
||||||
msgstr "Konfiguracja GCPad'a"
|
msgstr "Konfiguracja GCPad'a"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204
|
||||||
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
msgstr "Konfiguracja GCPad'a"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Dolphin TAS Movies (*.dtm)"
|
msgid "Dolphin TAS Movies (*.dtm)"
|
||||||
msgstr "Filmy TAS (*.dtm)"
|
msgstr "Filmy TAS (*.dtm)"
|
||||||
|
|
||||||
|
|
@ -1703,7 +1767,11 @@ msgstr "Konfiguracja Wiilot'a"
|
||||||
msgid "Dolphin at &Google Code"
|
msgid "Dolphin at &Google Code"
|
||||||
msgstr "Dolphin na &Google Code"
|
msgstr "Dolphin na &Google Code"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for "
|
"Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for "
|
||||||
"files..."
|
"files..."
|
||||||
|
|
@ -1711,7 +1779,11 @@ msgstr ""
|
||||||
"Program nie mógł znaleść żadnych obrazów GC/Wii ISO. Kliknij tutaj by "
|
"Program nie mógł znaleść żadnych obrazów GC/Wii ISO. Kliknij tutaj by "
|
||||||
"przeglądać pliki..."
|
"przeglądać pliki..."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Dolphin is currently set to hide all games. Doubleclick here to show all "
|
"Dolphin is currently set to hide all games. Doubleclick here to show all "
|
||||||
"games..."
|
"games..."
|
||||||
|
|
@ -1787,9 +1859,15 @@ msgstr ""
|
||||||
"\n"
|
"\n"
|
||||||
"W razie wątpliwości, pozostaw wyłączone."
|
"W razie wątpliwości, pozostaw wyłączone."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Dutch"
|
msgid "Dutch"
|
||||||
msgstr "Holenderski"
|
msgstr "Holenderski"
|
||||||
|
|
||||||
|
|
@ -1933,15 +2011,22 @@ msgstr "Włącz BAT"
|
||||||
msgid "Enable Block Merging"
|
msgid "Enable Block Merging"
|
||||||
msgstr "Włącz łączenie bloków"
|
msgstr "Włącz łączenie bloków"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
||||||
msgid "Enable Bounding Box Calculation"
|
msgid "Enable Bounding Box Calculation"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
||||||
msgid "Enable Cache"
|
msgid "Enable Cache"
|
||||||
msgstr "Włącz cache"
|
msgstr "Włącz cache"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Enable Cheats"
|
msgid "Enable Cheats"
|
||||||
msgstr "Włącz kody"
|
msgstr "Włącz kody"
|
||||||
|
|
||||||
|
|
@ -2040,7 +2125,11 @@ msgstr ""
|
||||||
"\n"
|
"\n"
|
||||||
"W razie wątpliwości, pozostaw wyłączone."
|
"W razie wątpliwości, pozostaw wyłączone."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
|
"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
|
||||||
"ANY other game."
|
"ANY other game."
|
||||||
|
|
@ -2096,9 +2185,15 @@ msgstr ""
|
||||||
msgid "End"
|
msgid "End"
|
||||||
msgstr "Koniec"
|
msgstr "Koniec"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "English"
|
msgid "English"
|
||||||
msgstr "Angielski"
|
msgstr "Angielski"
|
||||||
|
|
||||||
|
|
@ -2127,6 +2222,7 @@ msgstr "Równy"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
msgid "Error"
|
msgid "Error"
|
||||||
msgstr "Błąd"
|
msgstr "Błąd"
|
||||||
|
|
@ -2138,6 +2234,12 @@ msgid ""
|
||||||
"Sorry, Wii recording is temporarily broken."
|
"Sorry, Wii recording is temporarily broken."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169
|
||||||
|
msgid "Error"
|
||||||
|
msgstr "Błąd"
|
||||||
|
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
||||||
msgid "Error loading selected language. Falling back to system default."
|
msgid "Error loading selected language. Falling back to system default."
|
||||||
msgstr "Błąd wczytywania wybranego języka. Ustawienia domyślne."
|
msgstr "Błąd wczytywania wybranego języka. Ustawienia domyślne."
|
||||||
|
|
@ -2145,6 +2247,7 @@ msgstr "Błąd wczytywania wybranego języka. Ustawienia domyślne."
|
||||||
#: Source/Core/Common/Src/ChunkFile.h:180
|
#: Source/Core/Common/Src/ChunkFile.h:180
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid ""
|
msgid ""
|
||||||
|
<<<<<<< HEAD
|
||||||
"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
|
"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
|
||||||
"Aborting savestate load..."
|
"Aborting savestate load..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2152,6 +2255,8 @@ msgstr ""
|
||||||
#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279
|
#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid ""
|
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 "
|
"Error: Trying to access %s fonts but they are not loaded. Games may not show "
|
||||||
"fonts correctly, or crash."
|
"fonts correctly, or crash."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2592,9 +2697,15 @@ msgstr "Ramki do nagrania"
|
||||||
msgid "Free Look"
|
msgid "Free Look"
|
||||||
msgstr "Free Look"
|
msgstr "Free Look"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "French"
|
msgid "French"
|
||||||
msgstr "Francuski"
|
msgstr "Francuski"
|
||||||
|
|
||||||
|
|
@ -2661,7 +2772,11 @@ msgid "Gamecube &Pad Settings"
|
||||||
msgstr "Ustawienia &pada GC"
|
msgstr "Ustawienia &pada GC"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
||||||
msgstr "Karty pamięci GC (*.raw,*.gcp)"
|
msgstr "Karty pamięci GC (*.raw,*.gcp)"
|
||||||
|
|
||||||
|
|
@ -2684,8 +2799,12 @@ msgstr ""
|
||||||
"(zły kod albo typ kodu nie jest jeszcze wspierany)"
|
"(zły kod albo typ kodu nie jest jeszcze wspierany)"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
||||||
msgid "General"
|
msgid "General"
|
||||||
msgstr "Główne"
|
msgstr "Główne"
|
||||||
|
|
@ -2694,9 +2813,15 @@ msgstr "Główne"
|
||||||
msgid "General Settings"
|
msgid "General Settings"
|
||||||
msgstr "Ustawienia ogólne"
|
msgstr "Ustawienia ogólne"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "German"
|
msgid "German"
|
||||||
msgstr "Niemiecki"
|
msgstr "Niemiecki"
|
||||||
|
|
||||||
|
|
@ -2825,8 +2950,12 @@ msgid "Hotkey Configuration"
|
||||||
msgstr "Konfiguracja skrótów klawiszowych"
|
msgstr "Konfiguracja skrótów klawiszowych"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Hotkeys"
|
msgid "Hotkeys"
|
||||||
msgstr "Skróty klawiszowe"
|
msgstr "Skróty klawiszowe"
|
||||||
|
|
||||||
|
|
@ -2906,7 +3035,11 @@ msgstr ""
|
||||||
"Jeśli FPS jest niezrównoważony, ta opcja może pomóc. (ON = kompatybilny, OFF "
|
"Jeśli FPS jest niezrównoważony, ta opcja może pomóc. (ON = kompatybilny, OFF "
|
||||||
"= szybko)"
|
"= szybko)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you "
|
"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."
|
"also have to disable Audio Throttle in DSP to make it effective."
|
||||||
|
|
@ -3047,7 +3180,11 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"InstallExceptionHandler wywołany, ale ta platforma nie wspiera go jeszcze."
|
"InstallExceptionHandler wywołany, ale ta platforma nie wspiera go jeszcze."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Installing WAD..."
|
msgid "Installing WAD..."
|
||||||
msgstr "Instalacja WAD..."
|
msgstr "Instalacja WAD..."
|
||||||
|
|
||||||
|
|
@ -3129,9 +3266,15 @@ msgstr "Newłaściwy plik nagrania"
|
||||||
msgid "Invalid state"
|
msgid "Invalid state"
|
||||||
msgstr "Niewłaściwy stan"
|
msgstr "Niewłaściwy stan"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Italian"
|
msgid "Italian"
|
||||||
msgstr "Włoski"
|
msgstr "Włoski"
|
||||||
|
|
||||||
|
|
@ -3289,11 +3432,19 @@ msgstr "Wczytaj stan Slot 8"
|
||||||
msgid "Load State..."
|
msgid "Load State..."
|
||||||
msgstr "Wczytaj stan..."
|
msgstr "Wczytaj stan..."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
msgid "Load Wii System Menu"
|
msgid "Load Wii System Menu"
|
||||||
msgstr "Wczytaj Wii System Menu"
|
msgstr "Wczytaj Wii System Menu"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
|
||||||
|
msgid "Load Wii System Menu"
|
||||||
|
msgstr "Wczytaj Wii System Menu"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Load Wii System Menu %d%c"
|
msgid "Load Wii System Menu %d%c"
|
||||||
msgstr "Wczytaj Wii System Menu %d %c"
|
msgstr "Wczytaj Wii System Menu %d %c"
|
||||||
|
|
@ -3375,7 +3526,11 @@ msgstr "MMU Speed Hack"
|
||||||
msgid "MadCatz Gameshark files(*.gcs)"
|
msgid "MadCatz Gameshark files(*.gcs)"
|
||||||
msgstr "Pliki MadCatz Gameshark(*.gcs)"
|
msgstr "Pliki MadCatz Gameshark(*.gcs)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
||||||
msgid "Main Stick"
|
msgid "Main Stick"
|
||||||
msgstr "Główna gałka"
|
msgstr "Główna gałka"
|
||||||
|
|
@ -3406,7 +3561,11 @@ msgid "Memory Byte"
|
||||||
msgstr "Bajt pamięci"
|
msgstr "Bajt pamięci"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Memory Card"
|
msgid "Memory Card"
|
||||||
msgstr "Karta pamięci"
|
msgstr "Karta pamięci"
|
||||||
|
|
||||||
|
|
@ -3604,7 +3763,11 @@ msgstr "NP Tab"
|
||||||
msgid "NP Up"
|
msgid "NP Up"
|
||||||
msgstr "NP Up"
|
msgstr "NP Up"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
||||||
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
||||||
msgid "Name:"
|
msgid "Name:"
|
||||||
|
|
@ -3691,7 +3854,11 @@ msgstr "Nie równe"
|
||||||
msgid "Not Set"
|
msgid "Not Set"
|
||||||
msgstr "Nie ustawiono"
|
msgstr "Nie ustawiono"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Not connected"
|
msgid "Not connected"
|
||||||
msgstr "Nie połączono"
|
msgstr "Nie połączono"
|
||||||
|
|
||||||
|
|
@ -3752,7 +3919,10 @@ msgstr "Dostępnych tylko %d bloków"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Open"
|
msgid "Open"
|
||||||
msgstr "Otwórz"
|
msgstr "Otwórz"
|
||||||
|
|
||||||
|
|
@ -3883,8 +4053,13 @@ msgstr "Patche"
|
||||||
msgid "Paths"
|
msgid "Paths"
|
||||||
msgstr "Ścieżki"
|
msgstr "Ścieżki"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
||||||
msgid "Pause"
|
msgid "Pause"
|
||||||
msgstr "Pause"
|
msgstr "Pause"
|
||||||
|
|
@ -3904,8 +4079,13 @@ msgstr "Perspekrtywa %d"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Play"
|
msgid "Play"
|
||||||
msgstr "Play"
|
msgstr "Play"
|
||||||
|
|
||||||
|
|
@ -3931,7 +4111,11 @@ msgstr "Opcje playback'u"
|
||||||
msgid "Players"
|
msgid "Players"
|
||||||
msgstr "Gracze"
|
msgstr "Gracze"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Please confirm..."
|
msgid "Please confirm..."
|
||||||
msgstr "Potwierdź..."
|
msgstr "Potwierdź..."
|
||||||
|
|
||||||
|
|
@ -4142,10 +4326,17 @@ msgstr "Odśwież listę"
|
||||||
msgid "Refresh game list"
|
msgid "Refresh game list"
|
||||||
msgstr "Odśwież listę gier"
|
msgstr "Odśwież listę gier"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434
|
||||||
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Remove"
|
msgid "Remove"
|
||||||
msgstr "Usuń"
|
msgstr "Usuń"
|
||||||
|
|
||||||
|
|
@ -4164,7 +4355,10 @@ msgid "Render to Main Window"
|
||||||
msgstr "Generuj w oknie głównym"
|
msgstr "Generuj w oknie głównym"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
||||||
msgid "Reset"
|
msgid "Reset"
|
||||||
msgstr "Reset"
|
msgstr "Reset"
|
||||||
|
|
@ -4207,7 +4401,11 @@ msgstr "Zapisz &stan"
|
||||||
msgid "Safe"
|
msgid "Safe"
|
||||||
msgstr "Bezpieczny"
|
msgstr "Bezpieczny"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Sample Rate:"
|
msgid "Sample Rate:"
|
||||||
msgstr "Wskaźnik próbkowania:"
|
msgstr "Wskaźnik próbkowania:"
|
||||||
|
|
||||||
|
|
@ -4291,7 +4489,11 @@ msgstr "Stan zapisu filmu %s jest uszkodzony, nagrywanie zatrzymane..."
|
||||||
msgid "Scaled EFB Copy"
|
msgid "Scaled EFB Copy"
|
||||||
msgstr "Scaled EFB Copy"
|
msgstr "Scaled EFB Copy"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Scanning %s"
|
msgid "Scanning %s"
|
||||||
msgstr "Sknauję %s"
|
msgstr "Sknauję %s"
|
||||||
|
|
@ -4331,12 +4533,21 @@ msgstr "Nie odnaleziono sekcji %s w SYSCONF"
|
||||||
msgid "Select"
|
msgid "Select"
|
||||||
msgstr "Select"
|
msgstr "Select"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
||||||
msgid "Select The Recording File"
|
msgid "Select The Recording File"
|
||||||
msgstr "Wybierz plik nagrania"
|
msgstr "Wybierz plik nagrania"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:740
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142
|
||||||
|
msgid "Select The Recording File"
|
||||||
|
msgstr "Wybierz plik nagrania"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Select a Wii WAD file to install"
|
msgid "Select a Wii WAD file to install"
|
||||||
msgstr "Wybierz plik Wii WAD do zainstalowania"
|
msgstr "Wybierz plik Wii WAD do zainstalowania"
|
||||||
|
|
||||||
|
|
@ -4362,6 +4573,7 @@ msgstr "Select floating windows"
|
||||||
msgid "Select the file to load"
|
msgid "Select the file to load"
|
||||||
msgstr "Wybierz plik do wczytania"
|
msgstr "Wybierz plik do wczytania"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
msgstr "Wybierz plik do zapisu"
|
msgstr "Wybierz plik do zapisu"
|
||||||
|
|
@ -4371,6 +4583,17 @@ msgid "Select the state to load"
|
||||||
msgstr "Wybierz stan do wczytania"
|
msgstr "Wybierz stan do wczytania"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
||||||
|
msgid "Select the save file"
|
||||||
|
msgstr "Wybierz plik do zapisu"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457
|
||||||
|
msgid "Select the state to load"
|
||||||
|
msgstr "Wybierz stan do wczytania"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Select the state to save"
|
msgid "Select the state to save"
|
||||||
msgstr "Wybierz stan do zapisu"
|
msgstr "Wybierz stan do zapisu"
|
||||||
|
|
||||||
|
|
@ -4443,7 +4666,11 @@ msgstr "Separator"
|
||||||
msgid "Serbian"
|
msgid "Serbian"
|
||||||
msgstr "Serbski"
|
msgstr "Serbski"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Serial Port 1 - This is the port which devices such as the net adapter use"
|
"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"
|
msgstr "Serial Port 1 - Port używany przez urządzenia takie jak net adapter"
|
||||||
|
|
@ -4745,9 +4972,15 @@ msgstr "Utworzenie bufora dźwięku nie powiodło się: %s"
|
||||||
msgid "Space"
|
msgid "Space"
|
||||||
msgstr "Space"
|
msgstr "Space"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Spanish"
|
msgid "Spanish"
|
||||||
msgstr "Hiszpański"
|
msgstr "Hiszpański"
|
||||||
|
|
||||||
|
|
@ -4791,7 +5024,11 @@ msgstr "Square Stick"
|
||||||
msgid "Standard Controller"
|
msgid "Standard Controller"
|
||||||
msgstr "Standard Controller"
|
msgstr "Standard Controller"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
||||||
msgid "Start"
|
msgid "Start"
|
||||||
|
|
@ -4826,7 +5063,10 @@ msgstr "Gałka"
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
||||||
msgid "Stop"
|
msgid "Stop"
|
||||||
msgstr "Stop"
|
msgstr "Stop"
|
||||||
|
|
@ -4903,7 +5143,10 @@ msgstr "Talerz prawo"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Take Screenshot"
|
msgid "Take Screenshot"
|
||||||
msgstr "Zrób zdjęcie"
|
msgstr "Zrób zdjęcie"
|
||||||
|
|
||||||
|
|
@ -5148,12 +5391,19 @@ msgstr "Przełącz wszystkie typy logów"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Toggle Fullscreen"
|
msgid "Toggle Fullscreen"
|
||||||
msgstr "Przełącz na pełny ekran"
|
msgstr "Przełącz na pełny ekran"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Top"
|
msgid "Top"
|
||||||
msgstr "Góra"
|
msgstr "Góra"
|
||||||
|
|
||||||
|
|
@ -5262,6 +5512,18 @@ msgstr "Nieznana wiadomość o ID: %d"
|
||||||
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
||||||
msgstr "Nieznana wiadomość o ID: %d od gracza: %d Gracz wylatuje!"
|
msgstr "Nieznana wiadomość o ID: %d od gracza: %d Gracz wylatuje!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
||||||
|
#, c-format
|
||||||
|
msgid ""
|
||||||
|
"Unknown pointer %#08x\n"
|
||||||
|
"Continue?"
|
||||||
|
msgstr ""
|
||||||
|
"Nieznany wskaźnik %#08x\n"
|
||||||
|
"Kontynuować?"
|
||||||
|
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
||||||
msgid "Up"
|
msgid "Up"
|
||||||
|
|
@ -5484,7 +5746,11 @@ msgstr "Źródło Wii NAND:"
|
||||||
msgid "Wii Save Import"
|
msgid "Wii Save Import"
|
||||||
msgstr "Import zapisów Wii"
|
msgstr "Import zapisów Wii"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wii save files (*.bin)|*.bin"
|
msgid "Wii save files (*.bin)|*.bin"
|
||||||
msgstr "Pliki zapisu Wii (*.bin)|*.bin"
|
msgstr "Pliki zapisu Wii (*.bin)|*.bin"
|
||||||
|
|
||||||
|
|
@ -5515,7 +5781,11 @@ msgstr ""
|
||||||
"lub zbyt długi czas nieobecności lub coś innego.\n"
|
"lub zbyt długi czas nieobecności lub coś innego.\n"
|
||||||
"Połączyć ponownie?"
|
"Połączyć ponownie?"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wiimote Connected"
|
msgid "Wiimote Connected"
|
||||||
msgstr "Wiilot połączony"
|
msgstr "Wiilot połączony"
|
||||||
|
|
||||||
|
|
@ -5547,9 +5817,15 @@ msgstr "Windows Right"
|
||||||
msgid "Word Wrap"
|
msgid "Word Wrap"
|
||||||
msgstr "Zawijanie wierszy"
|
msgstr "Zawijanie wierszy"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Working..."
|
msgid "Working..."
|
||||||
msgstr "Pracuję..."
|
msgstr "Pracuję..."
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,11 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: Dolphin Emu\n"
|
"Project-Id-Version: Dolphin Emu\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
|
=======
|
||||||
|
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
"PO-Revision-Date: 2011-07-23 15:53-0000\n"
|
"PO-Revision-Date: 2011-07-23 15:53-0000\n"
|
||||||
"Last-Translator: Zilaan <nunogomesrebelo@hotmail.com>\n"
|
"Last-Translator: Zilaan <nunogomesrebelo@hotmail.com>\n"
|
||||||
"Language-Team: Zilaan <nunogomesrebelo@hotmail.com>\n"
|
"Language-Team: Zilaan <nunogomesrebelo@hotmail.com>\n"
|
||||||
|
|
@ -556,9 +560,15 @@ msgstr "Adicionar Patch"
|
||||||
msgid "Add new pane"
|
msgid "Add new pane"
|
||||||
msgstr "Adicionar novo painel"
|
msgstr "Adicionar novo painel"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Add..."
|
msgid "Add..."
|
||||||
msgstr "Adicionar..."
|
msgstr "Adicionar..."
|
||||||
|
|
||||||
|
|
@ -627,8 +637,13 @@ msgstr "Todas as imagens GC/Wii (gcm, iso, ciso, gcz)"
|
||||||
msgid "All Gamecube GCM files (gcm)"
|
msgid "All Gamecube GCM files (gcm)"
|
||||||
msgstr "Todos os ficheiros Gamecube GCM (gcm)"
|
msgstr "Todos os ficheiros Gamecube GCM (gcm)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "All Save States (sav, s##)"
|
msgid "All Save States (sav, s##)"
|
||||||
msgstr "Todos os Estados Guardados (sav, s##)"
|
msgstr "Todos os Estados Guardados (sav, s##)"
|
||||||
|
|
||||||
|
|
@ -718,7 +733,11 @@ msgstr ""
|
||||||
"Tem a certeza que quer eliminar este ficheiro? Será eliminado "
|
"Tem a certeza que quer eliminar este ficheiro? Será eliminado "
|
||||||
"permanentemente!"
|
"permanentemente!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
||||||
msgid "Aspect Ratio:"
|
msgid "Aspect Ratio:"
|
||||||
msgstr "Proporção de ecrã:"
|
msgstr "Proporção de ecrã:"
|
||||||
|
|
@ -739,7 +758,11 @@ msgstr "Áudio Backend :"
|
||||||
msgid "AudioCommon: Error opening AO device.\n"
|
msgid "AudioCommon: Error opening AO device.\n"
|
||||||
msgstr "AudioCommon: Erro ao abrir dispositivo AO.\n"
|
msgstr "AudioCommon: Erro ao abrir dispositivo AO.\n"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
||||||
msgid "Auto"
|
msgid "Auto"
|
||||||
msgstr "Automático"
|
msgstr "Automático"
|
||||||
|
|
@ -855,7 +878,11 @@ msgid "Blue Right"
|
||||||
msgstr "Azul Direita"
|
msgstr "Azul Direita"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Bottom"
|
msgid "Bottom"
|
||||||
msgstr "Inferior"
|
msgstr "Inferior"
|
||||||
|
|
||||||
|
|
@ -888,7 +915,11 @@ msgstr "Procurar por pasta de destino"
|
||||||
msgid "Buffer:"
|
msgid "Buffer:"
|
||||||
msgstr "Buffer:"
|
msgstr "Buffer:"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
||||||
msgid "Buttons"
|
msgid "Buttons"
|
||||||
|
|
@ -1136,7 +1167,11 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
||||||
msgid "Close"
|
msgid "Close"
|
||||||
msgstr "Fechar"
|
msgstr "Fechar"
|
||||||
|
|
@ -1245,7 +1280,11 @@ msgstr "Conectar Wiimote 3"
|
||||||
msgid "Connect Wiimote 4"
|
msgid "Connect Wiimote 4"
|
||||||
msgstr "Conectar Wiimote 4"
|
msgstr "Conectar Wiimote 4"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Connecting..."
|
msgid "Connecting..."
|
||||||
msgstr "A conectar..."
|
msgstr "A conectar..."
|
||||||
|
|
||||||
|
|
@ -1436,7 +1475,11 @@ msgid "DSP Emulator Engine"
|
||||||
msgstr "Motor de Emulador DSP"
|
msgstr "Motor de Emulador DSP"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "DSP HLE emulation (fast)"
|
msgid "DSP HLE emulation (fast)"
|
||||||
msgstr "Emulação de DSP HLE (rápido)"
|
msgstr "Emulação de DSP HLE (rápido)"
|
||||||
|
|
||||||
|
|
@ -1667,7 +1710,11 @@ msgstr ""
|
||||||
msgid "Divide"
|
msgid "Divide"
|
||||||
msgstr "Dividir"
|
msgstr "Dividir"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Do you want to stop the current emulation?"
|
msgid "Do you want to stop the current emulation?"
|
||||||
msgstr "Deseja parar a emulação actual?"
|
msgstr "Deseja parar a emulação actual?"
|
||||||
|
|
||||||
|
|
@ -1696,12 +1743,21 @@ msgstr "Configuração da emulação de Wiimote"
|
||||||
msgid "Dolphin FIFO"
|
msgid "Dolphin FIFO"
|
||||||
msgstr "Dolphin FIFO"
|
msgstr "Dolphin FIFO"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
msgid "Dolphin GCPad Configuration"
|
msgid "Dolphin GCPad Configuration"
|
||||||
msgstr "Configuração de GCPad "
|
msgstr "Configuração de GCPad "
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204
|
||||||
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
msgstr "Configuração de GCPad "
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Dolphin TAS Movies (*.dtm)"
|
msgid "Dolphin TAS Movies (*.dtm)"
|
||||||
msgstr "Dolphin TAS filmes (*.dtm)"
|
msgstr "Dolphin TAS filmes (*.dtm)"
|
||||||
|
|
||||||
|
|
@ -1798,9 +1854,15 @@ msgstr ""
|
||||||
"\n"
|
"\n"
|
||||||
"Em caso de dúvida, mantenha esta opção desactivada."
|
"Em caso de dúvida, mantenha esta opção desactivada."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Dutch"
|
msgid "Dutch"
|
||||||
msgstr "Holandês"
|
msgstr "Holandês"
|
||||||
|
|
||||||
|
|
@ -1944,15 +2006,22 @@ msgstr "Activar BAT"
|
||||||
msgid "Enable Block Merging"
|
msgid "Enable Block Merging"
|
||||||
msgstr "Activar Fusão de blocos"
|
msgstr "Activar Fusão de blocos"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
||||||
msgid "Enable Bounding Box Calculation"
|
msgid "Enable Bounding Box Calculation"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
||||||
msgid "Enable Cache"
|
msgid "Enable Cache"
|
||||||
msgstr "Activar Cache"
|
msgstr "Activar Cache"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Enable Cheats"
|
msgid "Enable Cheats"
|
||||||
msgstr "Activar Cheats"
|
msgstr "Activar Cheats"
|
||||||
|
|
||||||
|
|
@ -2108,9 +2177,15 @@ msgstr ""
|
||||||
msgid "End"
|
msgid "End"
|
||||||
msgstr "Fim"
|
msgstr "Fim"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "English"
|
msgid "English"
|
||||||
msgstr "Inglês"
|
msgstr "Inglês"
|
||||||
|
|
||||||
|
|
@ -2139,6 +2214,7 @@ msgstr "Igual"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
msgid "Error"
|
msgid "Error"
|
||||||
msgstr "Erro"
|
msgstr "Erro"
|
||||||
|
|
@ -2150,6 +2226,12 @@ msgid ""
|
||||||
"Sorry, Wii recording is temporarily broken."
|
"Sorry, Wii recording is temporarily broken."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169
|
||||||
|
msgid "Error"
|
||||||
|
msgstr "Erro"
|
||||||
|
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
||||||
msgid "Error loading selected language. Falling back to system default."
|
msgid "Error loading selected language. Falling back to system default."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2610,9 +2692,15 @@ msgstr "Quadros para Gravar"
|
||||||
msgid "Free Look"
|
msgid "Free Look"
|
||||||
msgstr "Vista Livre"
|
msgstr "Vista Livre"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "French"
|
msgid "French"
|
||||||
msgstr "Francês"
|
msgstr "Francês"
|
||||||
|
|
||||||
|
|
@ -2679,7 +2767,11 @@ msgid "Gamecube &Pad Settings"
|
||||||
msgstr "Definições de Comando &Gamecube"
|
msgstr "Definições de Comando &Gamecube"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
||||||
msgstr "Cartões de memória Gamecube (*.raw,*.gcp)"
|
msgstr "Cartões de memória Gamecube (*.raw,*.gcp)"
|
||||||
|
|
||||||
|
|
@ -2702,8 +2794,12 @@ msgstr ""
|
||||||
"(Ou é um código com erros ou o tipo de código não é suportado.)"
|
"(Ou é um código com erros ou o tipo de código não é suportado.)"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
||||||
msgid "General"
|
msgid "General"
|
||||||
msgstr "Geral"
|
msgstr "Geral"
|
||||||
|
|
@ -2712,9 +2808,15 @@ msgstr "Geral"
|
||||||
msgid "General Settings"
|
msgid "General Settings"
|
||||||
msgstr "Definições Gerais"
|
msgstr "Definições Gerais"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "German"
|
msgid "German"
|
||||||
msgstr "Alemão"
|
msgstr "Alemão"
|
||||||
|
|
||||||
|
|
@ -2844,8 +2946,12 @@ msgid "Hotkey Configuration"
|
||||||
msgstr "Configuração de Teclas de atalho"
|
msgstr "Configuração de Teclas de atalho"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Hotkeys"
|
msgid "Hotkeys"
|
||||||
msgstr "Teclas de Atalho"
|
msgstr "Teclas de Atalho"
|
||||||
|
|
||||||
|
|
@ -3069,7 +3175,11 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"InstallExceptionHandler chamado, mas esta plataforma ainda não a suporta."
|
"InstallExceptionHandler chamado, mas esta plataforma ainda não a suporta."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Installing WAD..."
|
msgid "Installing WAD..."
|
||||||
msgstr "A Instalar WAD..."
|
msgstr "A Instalar WAD..."
|
||||||
|
|
||||||
|
|
@ -3151,9 +3261,15 @@ msgstr "Ficheiro de Gravação inválido"
|
||||||
msgid "Invalid state"
|
msgid "Invalid state"
|
||||||
msgstr "Estado Inválido"
|
msgstr "Estado Inválido"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Italian"
|
msgid "Italian"
|
||||||
msgstr "Italiano"
|
msgstr "Italiano"
|
||||||
|
|
||||||
|
|
@ -3311,11 +3427,19 @@ msgstr "Carregar Estado Slot 8"
|
||||||
msgid "Load State..."
|
msgid "Load State..."
|
||||||
msgstr "Carregar Estado..."
|
msgstr "Carregar Estado..."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
msgid "Load Wii System Menu"
|
msgid "Load Wii System Menu"
|
||||||
msgstr "Carregar Sistema de Menu Wii"
|
msgstr "Carregar Sistema de Menu Wii"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
|
||||||
|
msgid "Load Wii System Menu"
|
||||||
|
msgstr "Carregar Sistema de Menu Wii"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Load Wii System Menu %d%c"
|
msgid "Load Wii System Menu %d%c"
|
||||||
msgstr "Carregar Sistema de Menu Wii %d%c"
|
msgstr "Carregar Sistema de Menu Wii %d%c"
|
||||||
|
|
@ -3397,7 +3521,11 @@ msgstr "MMU Hack de velocidade"
|
||||||
msgid "MadCatz Gameshark files(*.gcs)"
|
msgid "MadCatz Gameshark files(*.gcs)"
|
||||||
msgstr "ficheiros MadCatz Gameshark(*.gcs)"
|
msgstr "ficheiros MadCatz Gameshark(*.gcs)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
||||||
msgid "Main Stick"
|
msgid "Main Stick"
|
||||||
msgstr "Stick Principal"
|
msgstr "Stick Principal"
|
||||||
|
|
@ -3428,7 +3556,11 @@ msgid "Memory Byte"
|
||||||
msgstr "Byte de Memória"
|
msgstr "Byte de Memória"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Memory Card"
|
msgid "Memory Card"
|
||||||
msgstr "Cartão de memória"
|
msgstr "Cartão de memória"
|
||||||
|
|
||||||
|
|
@ -3627,7 +3759,11 @@ msgstr "NP Tab"
|
||||||
msgid "NP Up"
|
msgid "NP Up"
|
||||||
msgstr "NP Cima"
|
msgstr "NP Cima"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
||||||
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
||||||
msgid "Name:"
|
msgid "Name:"
|
||||||
|
|
@ -3714,7 +3850,11 @@ msgstr "Não igual"
|
||||||
msgid "Not Set"
|
msgid "Not Set"
|
||||||
msgstr "Não definido"
|
msgstr "Não definido"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Not connected"
|
msgid "Not connected"
|
||||||
msgstr "Não conectado"
|
msgstr "Não conectado"
|
||||||
|
|
||||||
|
|
@ -3775,7 +3915,10 @@ msgstr "Apenas %d blocos disponíveis"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Open"
|
msgid "Open"
|
||||||
msgstr "Abrir"
|
msgstr "Abrir"
|
||||||
|
|
||||||
|
|
@ -3906,8 +4049,13 @@ msgstr "Patches"
|
||||||
msgid "Paths"
|
msgid "Paths"
|
||||||
msgstr "Caminhos"
|
msgstr "Caminhos"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
||||||
msgid "Pause"
|
msgid "Pause"
|
||||||
msgstr "Pausa"
|
msgstr "Pausa"
|
||||||
|
|
@ -3927,8 +4075,13 @@ msgstr "Perspectiva %d"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Play"
|
msgid "Play"
|
||||||
msgstr "Começar"
|
msgstr "Começar"
|
||||||
|
|
||||||
|
|
@ -3954,7 +4107,11 @@ msgstr "Opções de Reprodução"
|
||||||
msgid "Players"
|
msgid "Players"
|
||||||
msgstr "Jogadores"
|
msgstr "Jogadores"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Please confirm..."
|
msgid "Please confirm..."
|
||||||
msgstr "Por favor confirme..."
|
msgstr "Por favor confirme..."
|
||||||
|
|
||||||
|
|
@ -4167,10 +4324,17 @@ msgstr "Actualizar Lista"
|
||||||
msgid "Refresh game list"
|
msgid "Refresh game list"
|
||||||
msgstr "Actualizar lista de Jogos"
|
msgstr "Actualizar lista de Jogos"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434
|
||||||
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Remove"
|
msgid "Remove"
|
||||||
msgstr "Remover"
|
msgstr "Remover"
|
||||||
|
|
||||||
|
|
@ -4189,7 +4353,10 @@ msgid "Render to Main Window"
|
||||||
msgstr "Renderizar para a Janela Principal"
|
msgstr "Renderizar para a Janela Principal"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
||||||
msgid "Reset"
|
msgid "Reset"
|
||||||
msgstr "Reset"
|
msgstr "Reset"
|
||||||
|
|
@ -4232,7 +4399,11 @@ msgstr "Gua&rdar Estado"
|
||||||
msgid "Safe"
|
msgid "Safe"
|
||||||
msgstr "Seguro"
|
msgstr "Seguro"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Sample Rate:"
|
msgid "Sample Rate:"
|
||||||
msgstr "Taxa de Amostragem:"
|
msgstr "Taxa de Amostragem:"
|
||||||
|
|
||||||
|
|
@ -4316,7 +4487,11 @@ msgstr "O filme de Savestate %s está corrupto, gravação de filme a parar..."
|
||||||
msgid "Scaled EFB Copy"
|
msgid "Scaled EFB Copy"
|
||||||
msgstr "Cópia EFB Escalada"
|
msgstr "Cópia EFB Escalada"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Scanning %s"
|
msgid "Scanning %s"
|
||||||
msgstr "A procurar %s"
|
msgstr "A procurar %s"
|
||||||
|
|
@ -4356,12 +4531,21 @@ msgstr "Selecção %s não encontrada em SYSCONF"
|
||||||
msgid "Select"
|
msgid "Select"
|
||||||
msgstr "Seleccionar"
|
msgstr "Seleccionar"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
||||||
msgid "Select The Recording File"
|
msgid "Select The Recording File"
|
||||||
msgstr "Seleccione o Ficheiro de Gravação"
|
msgstr "Seleccione o Ficheiro de Gravação"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:740
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142
|
||||||
|
msgid "Select The Recording File"
|
||||||
|
msgstr "Seleccione o Ficheiro de Gravação"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Select a Wii WAD file to install"
|
msgid "Select a Wii WAD file to install"
|
||||||
msgstr "Seleccione um ficheiro Wii WAD para instalar"
|
msgstr "Seleccione um ficheiro Wii WAD para instalar"
|
||||||
|
|
||||||
|
|
@ -4387,6 +4571,7 @@ msgstr "Seleccionar janelas flutuantes"
|
||||||
msgid "Select the file to load"
|
msgid "Select the file to load"
|
||||||
msgstr "Seleccione o ficheiro para carregar"
|
msgstr "Seleccione o ficheiro para carregar"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
msgstr "Seleccione o ficheiro de jogo guardado"
|
msgstr "Seleccione o ficheiro de jogo guardado"
|
||||||
|
|
@ -4396,6 +4581,17 @@ msgid "Select the state to load"
|
||||||
msgstr "Seleccione o estado para carregar"
|
msgstr "Seleccione o estado para carregar"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
||||||
|
msgid "Select the save file"
|
||||||
|
msgstr "Seleccione o ficheiro de jogo guardado"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457
|
||||||
|
msgid "Select the state to load"
|
||||||
|
msgstr "Seleccione o estado para carregar"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Select the state to save"
|
msgid "Select the state to save"
|
||||||
msgstr "Seleccione o estado para gravar"
|
msgstr "Seleccione o estado para gravar"
|
||||||
|
|
||||||
|
|
@ -4776,9 +4972,15 @@ msgstr "Criação do buffer de som falhou: %s"
|
||||||
msgid "Space"
|
msgid "Space"
|
||||||
msgstr "Espaço"
|
msgstr "Espaço"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Spanish"
|
msgid "Spanish"
|
||||||
msgstr "Espanhol"
|
msgstr "Espanhol"
|
||||||
|
|
||||||
|
|
@ -4822,7 +5024,11 @@ msgstr "Stick quadrado"
|
||||||
msgid "Standard Controller"
|
msgid "Standard Controller"
|
||||||
msgstr "Comando padrão"
|
msgstr "Comando padrão"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
||||||
msgid "Start"
|
msgid "Start"
|
||||||
|
|
@ -4857,7 +5063,10 @@ msgstr "Stick"
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
||||||
msgid "Stop"
|
msgid "Stop"
|
||||||
msgstr "Parar"
|
msgstr "Parar"
|
||||||
|
|
@ -4934,7 +5143,10 @@ msgstr "Table Direita"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Take Screenshot"
|
msgid "Take Screenshot"
|
||||||
msgstr "Tirar Screenshot"
|
msgstr "Tirar Screenshot"
|
||||||
|
|
||||||
|
|
@ -5185,12 +5397,19 @@ msgstr "Alternar Todos os Tipos de Relatório"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Toggle Fullscreen"
|
msgid "Toggle Fullscreen"
|
||||||
msgstr "Alternar Ecrã Inteiro"
|
msgstr "Alternar Ecrã Inteiro"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Top"
|
msgid "Top"
|
||||||
msgstr "Topo"
|
msgstr "Topo"
|
||||||
|
|
||||||
|
|
@ -5299,6 +5518,18 @@ msgstr ""
|
||||||
"Mensagem desconhecida com a id:%d recebida pelo jogador:%d Excluindo o "
|
"Mensagem desconhecida com a id:%d recebida pelo jogador:%d Excluindo o "
|
||||||
"jogador!"
|
"jogador!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
||||||
|
#, c-format
|
||||||
|
msgid ""
|
||||||
|
"Unknown pointer %#08x\n"
|
||||||
|
"Continue?"
|
||||||
|
msgstr ""
|
||||||
|
"Apontador desconhecido %#08x\n"
|
||||||
|
"Continuar?"
|
||||||
|
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
||||||
msgid "Up"
|
msgid "Up"
|
||||||
|
|
@ -5524,7 +5755,11 @@ msgstr "Raiz de NAND Wii:"
|
||||||
msgid "Wii Save Import"
|
msgid "Wii Save Import"
|
||||||
msgstr "Importação de Jogo Guardado Wii"
|
msgstr "Importação de Jogo Guardado Wii"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wii save files (*.bin)|*.bin"
|
msgid "Wii save files (*.bin)|*.bin"
|
||||||
msgstr "Ficheiros de jogo guardado Wii (*.bin)|*.bin"
|
msgstr "Ficheiros de jogo guardado Wii (*.bin)|*.bin"
|
||||||
|
|
||||||
|
|
@ -5556,7 +5791,11 @@ msgstr ""
|
||||||
"razão.\n"
|
"razão.\n"
|
||||||
"Quer reconectar imediatamente?"
|
"Quer reconectar imediatamente?"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wiimote Connected"
|
msgid "Wiimote Connected"
|
||||||
msgstr "Wiimote Conectado"
|
msgstr "Wiimote Conectado"
|
||||||
|
|
||||||
|
|
@ -5589,9 +5828,15 @@ msgstr "Janelas Direita"
|
||||||
msgid "Word Wrap"
|
msgid "Word Wrap"
|
||||||
msgstr "Moldar o texto"
|
msgstr "Moldar o texto"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Working..."
|
msgid "Working..."
|
||||||
msgstr "A trabalhar..."
|
msgstr "A trabalhar..."
|
||||||
|
|
||||||
|
|
@ -6204,6 +6449,7 @@ msgstr "| OU"
|
||||||
#~ msgid "Start the rendering window in fullscreen mode."
|
#~ msgid "Start the rendering window in fullscreen mode."
|
||||||
#~ msgstr "Começar a janela renderizada em ecrã inteiro"
|
#~ msgstr "Começar a janela renderizada em ecrã inteiro"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#~ msgid ""
|
#~ msgid ""
|
||||||
#~ "Unknown pointer %#08x\n"
|
#~ "Unknown pointer %#08x\n"
|
||||||
#~ "Continue?"
|
#~ "Continue?"
|
||||||
|
|
@ -6211,6 +6457,8 @@ msgstr "| OU"
|
||||||
#~ "Apontador desconhecido %#08x\n"
|
#~ "Apontador desconhecido %#08x\n"
|
||||||
#~ "Continuar?"
|
#~ "Continuar?"
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#~ msgid "Use FPS For Limiting"
|
#~ msgid "Use FPS For Limiting"
|
||||||
#~ msgstr "Usar FPS como limitador"
|
#~ msgstr "Usar FPS como limitador"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,8 +7,13 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: Dolphin Emu\n"
|
"Project-Id-Version: Dolphin Emu\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
"PO-Revision-Date: 2011-12-18 13:38-0600\n"
|
"PO-Revision-Date: 2011-12-18 13:38-0600\n"
|
||||||
|
=======
|
||||||
|
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
||||||
|
"PO-Revision-Date: 2011-09-11 23:35-0300\n"
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
"Last-Translator: Runo <i.am.runo@hotmail.com>\n"
|
"Last-Translator: Runo <i.am.runo@hotmail.com>\n"
|
||||||
"Language-Team: Portuguese (BR) <dolphinbrtrans@gmail.com>\n"
|
"Language-Team: Portuguese (BR) <dolphinbrtrans@gmail.com>\n"
|
||||||
"Language: \n"
|
"Language: \n"
|
||||||
|
|
@ -558,9 +563,15 @@ msgstr "Adicionar Patch"
|
||||||
msgid "Add new pane"
|
msgid "Add new pane"
|
||||||
msgstr "Adicionar novo painél"
|
msgstr "Adicionar novo painél"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Add..."
|
msgid "Add..."
|
||||||
msgstr "Adicionar..."
|
msgstr "Adicionar..."
|
||||||
|
|
||||||
|
|
@ -628,8 +639,13 @@ msgstr "Todas as imagens CG/Wii (gcm, iso, ciso, gcz)"
|
||||||
msgid "All Gamecube GCM files (gcm)"
|
msgid "All Gamecube GCM files (gcm)"
|
||||||
msgstr "Todos os arquivos Gamecube CGM (gcm)"
|
msgstr "Todos os arquivos Gamecube CGM (gcm)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "All Save States (sav, s##)"
|
msgid "All Save States (sav, s##)"
|
||||||
msgstr "Todos os Pontos de Jogo Salvos (sav, s##)"
|
msgstr "Todos os Pontos de Jogo Salvos (sav, s##)"
|
||||||
|
|
||||||
|
|
@ -719,7 +735,11 @@ msgstr ""
|
||||||
"Você tem certeza que quer deletar este arquivo? Ele ficará perdido para "
|
"Você tem certeza que quer deletar este arquivo? Ele ficará perdido para "
|
||||||
"sempre!"
|
"sempre!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
||||||
msgid "Aspect Ratio:"
|
msgid "Aspect Ratio:"
|
||||||
msgstr "Proporção:"
|
msgstr "Proporção:"
|
||||||
|
|
@ -740,7 +760,11 @@ msgstr "Backend de Audio"
|
||||||
msgid "AudioCommon: Error opening AO device.\n"
|
msgid "AudioCommon: Error opening AO device.\n"
|
||||||
msgstr "AudioCommon: Erro ao abrir o dispositivo AO.\n"
|
msgstr "AudioCommon: Erro ao abrir o dispositivo AO.\n"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
||||||
msgid "Auto"
|
msgid "Auto"
|
||||||
msgstr "Automático"
|
msgstr "Automático"
|
||||||
|
|
@ -856,7 +880,11 @@ msgid "Blue Right"
|
||||||
msgstr "Azul Direito"
|
msgstr "Azul Direito"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Bottom"
|
msgid "Bottom"
|
||||||
msgstr "Embaixo"
|
msgstr "Embaixo"
|
||||||
|
|
||||||
|
|
@ -889,7 +917,11 @@ msgstr "Procurar por um diretório de saída"
|
||||||
msgid "Buffer:"
|
msgid "Buffer:"
|
||||||
msgstr "Buffer:"
|
msgstr "Buffer:"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
||||||
msgid "Buttons"
|
msgid "Buttons"
|
||||||
|
|
@ -1094,7 +1126,11 @@ msgstr "Escolher um arquivo para abrir"
|
||||||
msgid "Choose a memory card:"
|
msgid "Choose a memory card:"
|
||||||
msgstr "Escolher um cartão de memória:"
|
msgstr "Escolher um cartão de memória:"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Choose file to use as apploader: (applies to discs constructed from "
|
"Choose file to use as apploader: (applies to discs constructed from "
|
||||||
"directories only)"
|
"directories only)"
|
||||||
|
|
@ -1136,7 +1172,11 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
||||||
msgid "Close"
|
msgid "Close"
|
||||||
msgstr "Fechar"
|
msgstr "Fechar"
|
||||||
|
|
@ -1245,7 +1285,11 @@ msgstr "Conectar Wiimote 3"
|
||||||
msgid "Connect Wiimote 4"
|
msgid "Connect Wiimote 4"
|
||||||
msgstr "Conectar Wiimote 4"
|
msgstr "Conectar Wiimote 4"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Connecting..."
|
msgid "Connecting..."
|
||||||
msgstr "Conectando..."
|
msgstr "Conectando..."
|
||||||
|
|
||||||
|
|
@ -1362,7 +1406,11 @@ msgstr "Criar nova perspectiva"
|
||||||
msgid "Created by KDE-Look.org"
|
msgid "Created by KDE-Look.org"
|
||||||
msgstr "Criado por KDE-Look.org"
|
msgstr "Criado por KDE-Look.org"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]"
|
"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -1436,7 +1484,11 @@ msgid "DSP Emulator Engine"
|
||||||
msgstr "Engine de Emulação do DSP"
|
msgstr "Engine de Emulação do DSP"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "DSP HLE emulation (fast)"
|
msgid "DSP HLE emulation (fast)"
|
||||||
msgstr "Emulação HLE do DSP (rápido)"
|
msgstr "Emulação HLE do DSP (rápido)"
|
||||||
|
|
||||||
|
|
@ -1667,7 +1719,11 @@ msgstr ""
|
||||||
msgid "Divide"
|
msgid "Divide"
|
||||||
msgstr "Dividir"
|
msgstr "Dividir"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Do you want to stop the current emulation?"
|
msgid "Do you want to stop the current emulation?"
|
||||||
msgstr "Você quer parar a emulação atual?"
|
msgstr "Você quer parar a emulação atual?"
|
||||||
|
|
||||||
|
|
@ -1696,12 +1752,21 @@ msgstr "Configuração de Wiimote Emulado do Dolphin"
|
||||||
msgid "Dolphin FIFO"
|
msgid "Dolphin FIFO"
|
||||||
msgstr "Dolphin FIFO"
|
msgstr "Dolphin FIFO"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
msgid "Dolphin GCPad Configuration"
|
msgid "Dolphin GCPad Configuration"
|
||||||
msgstr "Configuração do GCPad do Dolphin"
|
msgstr "Configuração do GCPad do Dolphin"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204
|
||||||
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
msgstr "Configuração do GCPad do Dolphin"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Dolphin TAS Movies (*.dtm)"
|
msgid "Dolphin TAS Movies (*.dtm)"
|
||||||
msgstr "Filmes TAS Dolphin (*.dtm)"
|
msgstr "Filmes TAS Dolphin (*.dtm)"
|
||||||
|
|
||||||
|
|
@ -1713,7 +1778,11 @@ msgstr "Configuração de Wiimote Dolphin"
|
||||||
msgid "Dolphin at &Google Code"
|
msgid "Dolphin at &Google Code"
|
||||||
msgstr "Dolphin no &Google Code"
|
msgstr "Dolphin no &Google Code"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for "
|
"Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for "
|
||||||
"files..."
|
"files..."
|
||||||
|
|
@ -1721,7 +1790,11 @@ msgstr ""
|
||||||
"Dolphin não pôde encontrar ISOs GC/Wii. Duplo-clique aqui para procurar por "
|
"Dolphin não pôde encontrar ISOs GC/Wii. Duplo-clique aqui para procurar por "
|
||||||
"arquivos..."
|
"arquivos..."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Dolphin is currently set to hide all games. Doubleclick here to show all "
|
"Dolphin is currently set to hide all games. Doubleclick here to show all "
|
||||||
"games..."
|
"games..."
|
||||||
|
|
@ -1797,9 +1870,15 @@ msgstr ""
|
||||||
"\n"
|
"\n"
|
||||||
"Se estiver em dúvida, deixe isto desativado."
|
"Se estiver em dúvida, deixe isto desativado."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Dutch"
|
msgid "Dutch"
|
||||||
msgstr "Holandês"
|
msgstr "Holandês"
|
||||||
|
|
||||||
|
|
@ -1943,15 +2022,22 @@ msgstr "Ativar BAT"
|
||||||
msgid "Enable Block Merging"
|
msgid "Enable Block Merging"
|
||||||
msgstr "Ativar Block Merging"
|
msgstr "Ativar Block Merging"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
||||||
msgid "Enable Bounding Box Calculation"
|
msgid "Enable Bounding Box Calculation"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
||||||
msgid "Enable Cache"
|
msgid "Enable Cache"
|
||||||
msgstr "Ativar Cache"
|
msgstr "Ativar Cache"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Enable Cheats"
|
msgid "Enable Cheats"
|
||||||
msgstr "Ativar Cheats"
|
msgstr "Ativar Cheats"
|
||||||
|
|
||||||
|
|
@ -2051,7 +2137,11 @@ msgstr ""
|
||||||
"\n"
|
"\n"
|
||||||
"Se estiver em dúvida, deixe isto desativado."
|
"Se estiver em dúvida, deixe isto desativado."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
|
"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
|
||||||
"ANY other game."
|
"ANY other game."
|
||||||
|
|
@ -2107,9 +2197,15 @@ msgstr ""
|
||||||
msgid "End"
|
msgid "End"
|
||||||
msgstr "Fim"
|
msgstr "Fim"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "English"
|
msgid "English"
|
||||||
msgstr "Inglês"
|
msgstr "Inglês"
|
||||||
|
|
||||||
|
|
@ -2138,6 +2234,7 @@ msgstr "Igual"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
msgid "Error"
|
msgid "Error"
|
||||||
msgstr "Erro"
|
msgstr "Erro"
|
||||||
|
|
@ -2149,6 +2246,12 @@ msgid ""
|
||||||
"Sorry, Wii recording is temporarily broken."
|
"Sorry, Wii recording is temporarily broken."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169
|
||||||
|
msgid "Error"
|
||||||
|
msgstr "Erro"
|
||||||
|
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
||||||
msgid "Error loading selected language. Falling back to system default."
|
msgid "Error loading selected language. Falling back to system default."
|
||||||
msgstr "Erro ao carregar o idioma selecionado. Voltando ao padrão do sistema."
|
msgstr "Erro ao carregar o idioma selecionado. Voltando ao padrão do sistema."
|
||||||
|
|
@ -2156,6 +2259,7 @@ msgstr "Erro ao carregar o idioma selecionado. Voltando ao padrão do sistema."
|
||||||
#: Source/Core/Common/Src/ChunkFile.h:180
|
#: Source/Core/Common/Src/ChunkFile.h:180
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid ""
|
msgid ""
|
||||||
|
<<<<<<< HEAD
|
||||||
"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
|
"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
|
||||||
"Aborting savestate load..."
|
"Aborting savestate load..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2163,6 +2267,8 @@ msgstr ""
|
||||||
#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279
|
#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid ""
|
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 "
|
"Error: Trying to access %s fonts but they are not loaded. Games may not show "
|
||||||
"fonts correctly, or crash."
|
"fonts correctly, or crash."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2605,9 +2711,15 @@ msgstr "QUadros para Capturar"
|
||||||
msgid "Free Look"
|
msgid "Free Look"
|
||||||
msgstr "Olhar Livre"
|
msgstr "Olhar Livre"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "French"
|
msgid "French"
|
||||||
msgstr "Francês"
|
msgstr "Francês"
|
||||||
|
|
||||||
|
|
@ -2674,7 +2786,11 @@ msgid "Gamecube &Pad Settings"
|
||||||
msgstr "Configurações de &Controle de Gamecube"
|
msgstr "Configurações de &Controle de Gamecube"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
||||||
msgstr "Memory Cards do Gamecube (*.raw,*.gcp)"
|
msgstr "Memory Cards do Gamecube (*.raw,*.gcp)"
|
||||||
|
|
||||||
|
|
@ -2697,8 +2813,12 @@ msgstr ""
|
||||||
"(É um código ruim ou um tipo de código não suportado.)"
|
"(É um código ruim ou um tipo de código não suportado.)"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
||||||
msgid "General"
|
msgid "General"
|
||||||
msgstr "Geral"
|
msgstr "Geral"
|
||||||
|
|
@ -2707,9 +2827,15 @@ msgstr "Geral"
|
||||||
msgid "General Settings"
|
msgid "General Settings"
|
||||||
msgstr "Configurações Gerais"
|
msgstr "Configurações Gerais"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "German"
|
msgid "German"
|
||||||
msgstr "Alemão"
|
msgstr "Alemão"
|
||||||
|
|
||||||
|
|
@ -2840,8 +2966,12 @@ msgid "Hotkey Configuration"
|
||||||
msgstr "Configuração de hotkey"
|
msgstr "Configuração de hotkey"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Hotkeys"
|
msgid "Hotkeys"
|
||||||
msgstr "Hotkeys"
|
msgstr "Hotkeys"
|
||||||
|
|
||||||
|
|
@ -2921,7 +3051,11 @@ msgstr ""
|
||||||
"Se a taxa de FPS estiver instável, esta opção pode ajudar. (ON = Compatível, "
|
"Se a taxa de FPS estiver instável, esta opção pode ajudar. (ON = Compatível, "
|
||||||
"OFF = Rápido)"
|
"OFF = Rápido)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you "
|
"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."
|
"also have to disable Audio Throttle in DSP to make it effective."
|
||||||
|
|
@ -3065,7 +3199,11 @@ msgstr ""
|
||||||
"InstallExceptionHandler foi chamado, mas esta plataforma ainda não tem "
|
"InstallExceptionHandler foi chamado, mas esta plataforma ainda não tem "
|
||||||
"suporte a ele."
|
"suporte a ele."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Installing WAD..."
|
msgid "Installing WAD..."
|
||||||
msgstr "Instalando WAD..."
|
msgstr "Instalando WAD..."
|
||||||
|
|
||||||
|
|
@ -3147,9 +3285,15 @@ msgstr "Arquivo de gravação inválido"
|
||||||
msgid "Invalid state"
|
msgid "Invalid state"
|
||||||
msgstr "Estado Salvo Inválido"
|
msgstr "Estado Salvo Inválido"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Italian"
|
msgid "Italian"
|
||||||
msgstr "Italiano"
|
msgstr "Italiano"
|
||||||
|
|
||||||
|
|
@ -3307,11 +3451,19 @@ msgstr "Carregar Estado do Slot 8"
|
||||||
msgid "Load State..."
|
msgid "Load State..."
|
||||||
msgstr "Carregar State..."
|
msgstr "Carregar State..."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
msgid "Load Wii System Menu"
|
msgid "Load Wii System Menu"
|
||||||
msgstr "Carregar Menu de Sistema do Wii"
|
msgstr "Carregar Menu de Sistema do Wii"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
|
||||||
|
msgid "Load Wii System Menu"
|
||||||
|
msgstr "Carregar Menu de Sistema do Wii"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Load Wii System Menu %d%c"
|
msgid "Load Wii System Menu %d%c"
|
||||||
msgstr "Carregar Menu de Sistema do Wii %d %c"
|
msgstr "Carregar Menu de Sistema do Wii %d %c"
|
||||||
|
|
@ -3394,7 +3546,11 @@ msgstr "Hack de velocidade MMU"
|
||||||
msgid "MadCatz Gameshark files(*.gcs)"
|
msgid "MadCatz Gameshark files(*.gcs)"
|
||||||
msgstr "Arquivos de Gameshark MadCatz(*.gcs)"
|
msgstr "Arquivos de Gameshark MadCatz(*.gcs)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
||||||
msgid "Main Stick"
|
msgid "Main Stick"
|
||||||
msgstr "Analógico Principal"
|
msgstr "Analógico Principal"
|
||||||
|
|
@ -3425,7 +3581,11 @@ msgid "Memory Byte"
|
||||||
msgstr "Byte de Memória"
|
msgstr "Byte de Memória"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Memory Card"
|
msgid "Memory Card"
|
||||||
msgstr "Cartão de memoria"
|
msgstr "Cartão de memoria"
|
||||||
|
|
||||||
|
|
@ -3624,7 +3784,11 @@ msgstr "NP Tab"
|
||||||
msgid "NP Up"
|
msgid "NP Up"
|
||||||
msgstr "NP Cima"
|
msgstr "NP Cima"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
||||||
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
||||||
msgid "Name:"
|
msgid "Name:"
|
||||||
|
|
@ -3711,7 +3875,11 @@ msgstr "Não igual"
|
||||||
msgid "Not Set"
|
msgid "Not Set"
|
||||||
msgstr "Indefinido"
|
msgstr "Indefinido"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Not connected"
|
msgid "Not connected"
|
||||||
msgstr "Não conectado"
|
msgstr "Não conectado"
|
||||||
|
|
||||||
|
|
@ -3772,7 +3940,10 @@ msgstr "Apenas %d blocos disponíveis"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Open"
|
msgid "Open"
|
||||||
msgstr "Abrir"
|
msgstr "Abrir"
|
||||||
|
|
||||||
|
|
@ -3903,8 +4074,13 @@ msgstr "Patches"
|
||||||
msgid "Paths"
|
msgid "Paths"
|
||||||
msgstr "Diretórios"
|
msgstr "Diretórios"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
||||||
msgid "Pause"
|
msgid "Pause"
|
||||||
msgstr "Pausar"
|
msgstr "Pausar"
|
||||||
|
|
@ -3924,8 +4100,13 @@ msgstr "Perspectiva %d"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Play"
|
msgid "Play"
|
||||||
msgstr "Executar"
|
msgstr "Executar"
|
||||||
|
|
||||||
|
|
@ -3951,7 +4132,11 @@ msgstr "Opções de Reprodução"
|
||||||
msgid "Players"
|
msgid "Players"
|
||||||
msgstr "Jogadores"
|
msgstr "Jogadores"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Please confirm..."
|
msgid "Please confirm..."
|
||||||
msgstr "Favor confirmar..."
|
msgstr "Favor confirmar..."
|
||||||
|
|
||||||
|
|
@ -4162,10 +4347,17 @@ msgstr "Atualizar Lista"
|
||||||
msgid "Refresh game list"
|
msgid "Refresh game list"
|
||||||
msgstr "Atualizar a lista de jogos"
|
msgstr "Atualizar a lista de jogos"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434
|
||||||
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Remove"
|
msgid "Remove"
|
||||||
msgstr "Remover"
|
msgstr "Remover"
|
||||||
|
|
||||||
|
|
@ -4184,7 +4376,10 @@ msgid "Render to Main Window"
|
||||||
msgstr "Renderizar na Janela Principal"
|
msgstr "Renderizar na Janela Principal"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
||||||
msgid "Reset"
|
msgid "Reset"
|
||||||
msgstr "Reiniciar"
|
msgstr "Reiniciar"
|
||||||
|
|
@ -4227,7 +4422,11 @@ msgstr "Sal&var estado atual"
|
||||||
msgid "Safe"
|
msgid "Safe"
|
||||||
msgstr "Seguro"
|
msgstr "Seguro"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Sample Rate:"
|
msgid "Sample Rate:"
|
||||||
msgstr "Taxa de Amostragem:"
|
msgstr "Taxa de Amostragem:"
|
||||||
|
|
||||||
|
|
@ -4311,7 +4510,11 @@ msgstr "O Estado Salvo capturado %s está corrompido, parando captura..."
|
||||||
msgid "Scaled EFB Copy"
|
msgid "Scaled EFB Copy"
|
||||||
msgstr "Cópia Escalada do EFB"
|
msgstr "Cópia Escalada do EFB"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Scanning %s"
|
msgid "Scanning %s"
|
||||||
msgstr "Escaneando %s"
|
msgstr "Escaneando %s"
|
||||||
|
|
@ -4351,12 +4554,21 @@ msgstr "A seção %s não foi encontrada no SYSCONF"
|
||||||
msgid "Select"
|
msgid "Select"
|
||||||
msgstr "Selecionar"
|
msgstr "Selecionar"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
||||||
msgid "Select The Recording File"
|
msgid "Select The Recording File"
|
||||||
msgstr "Selecione o arquivo de Gravação"
|
msgstr "Selecione o arquivo de Gravação"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:740
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142
|
||||||
|
msgid "Select The Recording File"
|
||||||
|
msgstr "Selecione o arquivo de Gravação"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Select a Wii WAD file to install"
|
msgid "Select a Wii WAD file to install"
|
||||||
msgstr "Selecione um arquivo WAD de Wii para instalar"
|
msgstr "Selecione um arquivo WAD de Wii para instalar"
|
||||||
|
|
||||||
|
|
@ -4381,6 +4593,7 @@ msgstr "Selecionar Janelas flutuantes"
|
||||||
msgid "Select the file to load"
|
msgid "Select the file to load"
|
||||||
msgstr "Selecione um arquivo para carregar"
|
msgstr "Selecione um arquivo para carregar"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
msgstr "Selecione o arquivo de salva"
|
msgstr "Selecione o arquivo de salva"
|
||||||
|
|
@ -4390,6 +4603,17 @@ msgid "Select the state to load"
|
||||||
msgstr "Selecione um estado para carregar"
|
msgstr "Selecione um estado para carregar"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
||||||
|
msgid "Select the save file"
|
||||||
|
msgstr "Selecione o arquivo de salva"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457
|
||||||
|
msgid "Select the state to load"
|
||||||
|
msgstr "Selecione um estado para carregar"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Select the state to save"
|
msgid "Select the state to save"
|
||||||
msgstr "Selecione um estado para salvar"
|
msgstr "Selecione um estado para salvar"
|
||||||
|
|
||||||
|
|
@ -4463,7 +4687,11 @@ msgstr "Separador"
|
||||||
msgid "Serbian"
|
msgid "Serbian"
|
||||||
msgstr "Sérvio"
|
msgstr "Sérvio"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Serial Port 1 - This is the port which devices such as the net adapter use"
|
"Serial Port 1 - This is the port which devices such as the net adapter use"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -4770,9 +4998,15 @@ msgstr "Falha na criação do buffer de som: %s"
|
||||||
msgid "Space"
|
msgid "Space"
|
||||||
msgstr "Barra de Espaço"
|
msgstr "Barra de Espaço"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Spanish"
|
msgid "Spanish"
|
||||||
msgstr "Espanhol"
|
msgstr "Espanhol"
|
||||||
|
|
||||||
|
|
@ -4816,7 +5050,11 @@ msgstr "Analógico Quadrado"
|
||||||
msgid "Standard Controller"
|
msgid "Standard Controller"
|
||||||
msgstr "Controle Padrão"
|
msgstr "Controle Padrão"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
||||||
msgid "Start"
|
msgid "Start"
|
||||||
|
|
@ -4851,7 +5089,10 @@ msgstr "Analógico"
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
||||||
msgid "Stop"
|
msgid "Stop"
|
||||||
msgstr "Parar"
|
msgstr "Parar"
|
||||||
|
|
@ -4928,7 +5169,10 @@ msgstr "Direita da Mesa"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Take Screenshot"
|
msgid "Take Screenshot"
|
||||||
msgstr "Capturar Tela"
|
msgstr "Capturar Tela"
|
||||||
|
|
||||||
|
|
@ -5176,12 +5420,19 @@ msgstr "Ligar/Desligar Todos os Logs"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Toggle Fullscreen"
|
msgid "Toggle Fullscreen"
|
||||||
msgstr "Ir para Tela Cheia"
|
msgstr "Ir para Tela Cheia"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Top"
|
msgid "Top"
|
||||||
msgstr "Topo"
|
msgstr "Topo"
|
||||||
|
|
||||||
|
|
@ -5289,6 +5540,17 @@ msgstr "Menssagem desconhecida recebida com identificação: %d"
|
||||||
#: Source/Core/Core/Src/NetPlayServer.cpp:504
|
#: Source/Core/Core/Src/NetPlayServer.cpp:504
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
msgstr ""
|
||||||
|
"Menssagem desconhecida com ID:%d recebida do jogador:%d Expulsando jogador!"
|
||||||
|
|
||||||
|
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
||||||
|
#, c-format
|
||||||
|
msgid ""
|
||||||
|
"Unknown pointer %#08x\n"
|
||||||
|
"Continue?"
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Menssagem desconhecida com ID:%d recebida do jogador:%d Expulsando jogador!"
|
"Menssagem desconhecida com ID:%d recebida do jogador:%d Expulsando jogador!"
|
||||||
|
|
||||||
|
|
@ -5517,7 +5779,11 @@ msgstr "Raiz do Wii NAND"
|
||||||
msgid "Wii Save Import"
|
msgid "Wii Save Import"
|
||||||
msgstr "Importar Save de Wii"
|
msgstr "Importar Save de Wii"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wii save files (*.bin)|*.bin"
|
msgid "Wii save files (*.bin)|*.bin"
|
||||||
msgstr "Arquivos de Salva do Wii (*.bin)|*.bin"
|
msgstr "Arquivos de Salva do Wii (*.bin)|*.bin"
|
||||||
|
|
||||||
|
|
@ -5548,7 +5814,11 @@ msgstr ""
|
||||||
"ou talvez tenha sido pelo tempo parado ou por outra razão.\n"
|
"ou talvez tenha sido pelo tempo parado ou por outra razão.\n"
|
||||||
"Você quer reconectar imediatamente?"
|
"Você quer reconectar imediatamente?"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wiimote Connected"
|
msgid "Wiimote Connected"
|
||||||
msgstr "Wiimote Conectado"
|
msgstr "Wiimote Conectado"
|
||||||
|
|
||||||
|
|
@ -5580,9 +5850,15 @@ msgstr "Janelas da Direita"
|
||||||
msgid "Word Wrap"
|
msgid "Word Wrap"
|
||||||
msgstr "Word Wrap"
|
msgstr "Word Wrap"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Working..."
|
msgid "Working..."
|
||||||
msgstr "Funcionando..."
|
msgstr "Funcionando..."
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,11 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: Dolphin Emu\n"
|
"Project-Id-Version: Dolphin Emu\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
|
=======
|
||||||
|
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
"PO-Revision-Date: 2011-01-20 14:40+0300\n"
|
"PO-Revision-Date: 2011-01-20 14:40+0300\n"
|
||||||
"Last-Translator: firnis <firnis@ya.ru>\n"
|
"Last-Translator: firnis <firnis@ya.ru>\n"
|
||||||
"Language-Team: Russian <>\n"
|
"Language-Team: Russian <>\n"
|
||||||
|
|
@ -539,9 +543,15 @@ msgstr "Добавление патча"
|
||||||
msgid "Add new pane"
|
msgid "Add new pane"
|
||||||
msgstr "Добавить панель"
|
msgstr "Добавить панель"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Add..."
|
msgid "Add..."
|
||||||
msgstr "Добавить..."
|
msgstr "Добавить..."
|
||||||
|
|
||||||
|
|
@ -596,8 +606,13 @@ msgstr "Все образа от GC/Wii (gcm, iso, ciso, gcz)"
|
||||||
msgid "All Gamecube GCM files (gcm)"
|
msgid "All Gamecube GCM files (gcm)"
|
||||||
msgstr "Все GCM-файлы Gamecube (gcm)"
|
msgstr "Все GCM-файлы Gamecube (gcm)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "All Save States (sav, s##)"
|
msgid "All Save States (sav, s##)"
|
||||||
msgstr "Файлы быстрых сохранений (sav, s##)"
|
msgstr "Файлы быстрых сохранений (sav, s##)"
|
||||||
|
|
||||||
|
|
@ -678,7 +693,11 @@ msgstr ""
|
||||||
msgid "Are you sure you want to delete this file? It will be gone forever!"
|
msgid "Are you sure you want to delete this file? It will be gone forever!"
|
||||||
msgstr "Вы уверены, что хотите удалить этот файл? Он исчезнет навсегда!"
|
msgstr "Вы уверены, что хотите удалить этот файл? Он исчезнет навсегда!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
||||||
msgid "Aspect Ratio:"
|
msgid "Aspect Ratio:"
|
||||||
msgstr "Соотношение сторон:"
|
msgstr "Соотношение сторон:"
|
||||||
|
|
@ -700,7 +719,11 @@ msgstr "Система вывода"
|
||||||
msgid "AudioCommon: Error opening AO device.\n"
|
msgid "AudioCommon: Error opening AO device.\n"
|
||||||
msgstr "AudioCommon: Ошибка открытия устройства вывода звука.\n"
|
msgstr "AudioCommon: Ошибка открытия устройства вывода звука.\n"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
||||||
msgid "Auto"
|
msgid "Auto"
|
||||||
msgstr "Авто"
|
msgstr "Авто"
|
||||||
|
|
@ -815,7 +838,11 @@ msgid "Blue Right"
|
||||||
msgstr "Синяя справа"
|
msgstr "Синяя справа"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Bottom"
|
msgid "Bottom"
|
||||||
msgstr "снизу"
|
msgstr "снизу"
|
||||||
|
|
||||||
|
|
@ -848,7 +875,11 @@ msgstr "Укажите папку для сохранения"
|
||||||
msgid "Buffer:"
|
msgid "Buffer:"
|
||||||
msgstr "Буфер:"
|
msgstr "Буфер:"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
||||||
msgid "Buttons"
|
msgid "Buttons"
|
||||||
|
|
@ -1082,7 +1113,11 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
||||||
msgid "Close"
|
msgid "Close"
|
||||||
msgstr "Закрыть"
|
msgstr "Закрыть"
|
||||||
|
|
@ -1192,7 +1227,11 @@ msgstr "Подключить Wiimote 3"
|
||||||
msgid "Connect Wiimote 4"
|
msgid "Connect Wiimote 4"
|
||||||
msgstr "Подключить Wiimote 4"
|
msgstr "Подключить Wiimote 4"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Connecting..."
|
msgid "Connecting..."
|
||||||
msgstr "Подключение..."
|
msgstr "Подключение..."
|
||||||
|
|
||||||
|
|
@ -1378,7 +1417,11 @@ msgid "DSP Emulator Engine"
|
||||||
msgstr "Режим эмуляции CPU"
|
msgstr "Режим эмуляции CPU"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "DSP HLE emulation (fast)"
|
msgid "DSP HLE emulation (fast)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1594,7 +1637,11 @@ msgstr ""
|
||||||
msgid "Divide"
|
msgid "Divide"
|
||||||
msgstr "/"
|
msgstr "/"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Do you want to stop the current emulation?"
|
msgid "Do you want to stop the current emulation?"
|
||||||
msgstr "Вы хотите остановить эмуляцию?"
|
msgstr "Вы хотите остановить эмуляцию?"
|
||||||
|
|
||||||
|
|
@ -1624,12 +1671,21 @@ msgstr "Настройки эмулируемого Wiimote"
|
||||||
msgid "Dolphin FIFO"
|
msgid "Dolphin FIFO"
|
||||||
msgstr "Dolphin"
|
msgstr "Dolphin"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
msgid "Dolphin GCPad Configuration"
|
msgid "Dolphin GCPad Configuration"
|
||||||
msgstr "Настройки Dolphin GCPad"
|
msgstr "Настройки Dolphin GCPad"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204
|
||||||
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
msgstr "Настройки Dolphin GCPad"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Dolphin TAS Movies (*.dtm)"
|
msgid "Dolphin TAS Movies (*.dtm)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1717,9 +1773,15 @@ msgid ""
|
||||||
"If unsure, leave this unchecked."
|
"If unsure, leave this unchecked."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Dutch"
|
msgid "Dutch"
|
||||||
msgstr "Dutch"
|
msgstr "Dutch"
|
||||||
|
|
@ -1847,16 +1909,23 @@ msgstr "Включить BAT"
|
||||||
msgid "Enable Block Merging"
|
msgid "Enable Block Merging"
|
||||||
msgstr "Включить совмещение блоков"
|
msgstr "Включить совмещение блоков"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
||||||
msgid "Enable Bounding Box Calculation"
|
msgid "Enable Bounding Box Calculation"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Enable Cache"
|
msgid "Enable Cache"
|
||||||
msgstr "кэшировать"
|
msgstr "кэшировать"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Enable Cheats"
|
msgid "Enable Cheats"
|
||||||
msgstr "Включить чит-коды"
|
msgstr "Включить чит-коды"
|
||||||
|
|
||||||
|
|
@ -1997,9 +2066,15 @@ msgstr ""
|
||||||
msgid "End"
|
msgid "End"
|
||||||
msgstr "End"
|
msgstr "End"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "English"
|
msgid "English"
|
||||||
msgstr "English"
|
msgstr "English"
|
||||||
|
|
@ -2029,6 +2104,7 @@ msgstr "Равно"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
msgid "Error"
|
msgid "Error"
|
||||||
msgstr "Ошибки"
|
msgstr "Ошибки"
|
||||||
|
|
@ -2040,6 +2116,12 @@ msgid ""
|
||||||
"Sorry, Wii recording is temporarily broken."
|
"Sorry, Wii recording is temporarily broken."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169
|
||||||
|
msgid "Error"
|
||||||
|
msgstr "Ошибки"
|
||||||
|
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
||||||
msgid "Error loading selected language. Falling back to system default."
|
msgid "Error loading selected language. Falling back to system default."
|
||||||
msgstr "Ошибка загрузки выбранного языка. Возвращаемся к стандартному."
|
msgstr "Ошибка загрузки выбранного языка. Возвращаемся к стандартному."
|
||||||
|
|
@ -2474,9 +2556,15 @@ msgstr ""
|
||||||
msgid "Free Look"
|
msgid "Free Look"
|
||||||
msgstr "Свободный обзор"
|
msgstr "Свободный обзор"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "French"
|
msgid "French"
|
||||||
msgstr "French"
|
msgstr "French"
|
||||||
|
|
@ -2546,7 +2634,11 @@ msgid "Gamecube &Pad Settings"
|
||||||
msgstr "Опции &контроллера Gamecube"
|
msgstr "Опции &контроллера Gamecube"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
||||||
msgstr "Файлы карт памяти Gamecube (*.raw,*.gcp)"
|
msgstr "Файлы карт памяти Gamecube (*.raw,*.gcp)"
|
||||||
|
|
||||||
|
|
@ -2567,8 +2659,12 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
||||||
msgid "General"
|
msgid "General"
|
||||||
msgstr "Общие"
|
msgstr "Общие"
|
||||||
|
|
@ -2578,9 +2674,15 @@ msgstr "Общие"
|
||||||
msgid "General Settings"
|
msgid "General Settings"
|
||||||
msgstr "Настройки интерфейса"
|
msgstr "Настройки интерфейса"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "German"
|
msgid "German"
|
||||||
msgstr "German"
|
msgstr "German"
|
||||||
|
|
@ -2708,8 +2810,12 @@ msgid "Hotkey Configuration"
|
||||||
msgstr "Настройка \"горячих\" клавиш"
|
msgstr "Настройка \"горячих\" клавиш"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Hotkeys"
|
msgid "Hotkeys"
|
||||||
msgstr "Клавиши"
|
msgstr "Клавиши"
|
||||||
|
|
||||||
|
|
@ -2926,7 +3032,11 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Вызван InstallExceptionHandler, но ваша платформа его еще не поддерживает."
|
"Вызван InstallExceptionHandler, но ваша платформа его еще не поддерживает."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Installing WAD..."
|
msgid "Installing WAD..."
|
||||||
msgstr "Устанавливается WAD в меню Wii..."
|
msgstr "Устанавливается WAD в меню Wii..."
|
||||||
|
|
@ -3011,9 +3121,15 @@ msgstr "Неверный файл записи"
|
||||||
msgid "Invalid state"
|
msgid "Invalid state"
|
||||||
msgstr "Неверное сохранение"
|
msgstr "Неверное сохранение"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Italian"
|
msgid "Italian"
|
||||||
msgstr "Italian"
|
msgstr "Italian"
|
||||||
|
|
@ -3179,12 +3295,20 @@ msgstr "Быстрая &загрузка"
|
||||||
msgid "Load State..."
|
msgid "Load State..."
|
||||||
msgstr "Загрузить игру..."
|
msgstr "Загрузить игру..."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Load Wii System Menu"
|
msgid "Load Wii System Menu"
|
||||||
msgstr "Загрузить Wii System Menu (%d %c)"
|
msgstr "Загрузить Wii System Menu (%d %c)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, fuzzy, c-format
|
#, fuzzy, c-format
|
||||||
msgid "Load Wii System Menu %d%c"
|
msgid "Load Wii System Menu %d%c"
|
||||||
msgstr "Загрузить Wii System Menu (%d %c)"
|
msgstr "Загрузить Wii System Menu (%d %c)"
|
||||||
|
|
@ -3268,7 +3392,11 @@ msgstr "Ускорить MMU (спидхак)"
|
||||||
msgid "MadCatz Gameshark files(*.gcs)"
|
msgid "MadCatz Gameshark files(*.gcs)"
|
||||||
msgstr "Файлы Gameshark MadCatz (*.gcs)"
|
msgstr "Файлы Gameshark MadCatz (*.gcs)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
||||||
msgid "Main Stick"
|
msgid "Main Stick"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3300,7 +3428,11 @@ msgid "Memory Byte"
|
||||||
msgstr "Па&мять"
|
msgstr "Па&мять"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Memory Card"
|
msgid "Memory Card"
|
||||||
msgstr "Карта памяти"
|
msgstr "Карта памяти"
|
||||||
|
|
||||||
|
|
@ -3478,7 +3610,11 @@ msgstr "NP Tab"
|
||||||
msgid "NP Up"
|
msgid "NP Up"
|
||||||
msgstr "NP Вверх"
|
msgstr "NP Вверх"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
||||||
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
||||||
msgid "Name:"
|
msgid "Name:"
|
||||||
|
|
@ -3567,7 +3703,11 @@ msgstr "Не равно"
|
||||||
msgid "Not Set"
|
msgid "Not Set"
|
||||||
msgstr "Неизвестно"
|
msgstr "Неизвестно"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Not connected"
|
msgid "Not connected"
|
||||||
msgstr "Не подключено"
|
msgstr "Не подключено"
|
||||||
|
|
||||||
|
|
@ -3628,7 +3768,10 @@ msgstr "Доступно только %d блоков"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Open"
|
msgid "Open"
|
||||||
msgstr "Открыть"
|
msgstr "Открыть"
|
||||||
|
|
||||||
|
|
@ -3754,8 +3897,13 @@ msgstr "Патчи"
|
||||||
msgid "Paths"
|
msgid "Paths"
|
||||||
msgstr "Папки"
|
msgstr "Папки"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
||||||
msgid "Pause"
|
msgid "Pause"
|
||||||
msgstr "Пауза"
|
msgstr "Пауза"
|
||||||
|
|
@ -3776,8 +3924,13 @@ msgstr "Точка %d"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Play"
|
msgid "Play"
|
||||||
msgstr "Запуск"
|
msgstr "Запуск"
|
||||||
|
|
||||||
|
|
@ -3805,7 +3958,11 @@ msgstr "Опции"
|
||||||
msgid "Players"
|
msgid "Players"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Please confirm..."
|
msgid "Please confirm..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -4030,10 +4187,17 @@ msgstr "&Обновить список игр"
|
||||||
msgid "Refresh game list"
|
msgid "Refresh game list"
|
||||||
msgstr "Обновление списка игр"
|
msgstr "Обновление списка игр"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434
|
||||||
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Remove"
|
msgid "Remove"
|
||||||
msgstr "Удалить"
|
msgstr "Удалить"
|
||||||
|
|
||||||
|
|
@ -4052,7 +4216,10 @@ msgid "Render to Main Window"
|
||||||
msgstr "Выводить изображение в главное окно"
|
msgstr "Выводить изображение в главное окно"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
||||||
msgid "Reset"
|
msgid "Reset"
|
||||||
msgstr "Сброс настроек"
|
msgstr "Сброс настроек"
|
||||||
|
|
@ -4095,7 +4262,11 @@ msgstr "Быстрое &сохранение"
|
||||||
msgid "Safe"
|
msgid "Safe"
|
||||||
msgstr "безопасное"
|
msgstr "безопасное"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Sample Rate:"
|
msgid "Sample Rate:"
|
||||||
msgstr "Частота"
|
msgstr "Частота"
|
||||||
|
|
@ -4188,7 +4359,11 @@ msgstr ""
|
||||||
msgid "Scaled EFB Copy"
|
msgid "Scaled EFB Copy"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, fuzzy, c-format
|
#, fuzzy, c-format
|
||||||
msgid "Scanning %s"
|
msgid "Scanning %s"
|
||||||
msgstr "Поиск..."
|
msgstr "Поиск..."
|
||||||
|
|
@ -4228,12 +4403,21 @@ msgstr "Секция %s не найдена в SYSCONF"
|
||||||
msgid "Select"
|
msgid "Select"
|
||||||
msgstr "Выбрать"
|
msgstr "Выбрать"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
||||||
msgid "Select The Recording File"
|
msgid "Select The Recording File"
|
||||||
msgstr "Выберите файл для записи игрового процесса"
|
msgstr "Выберите файл для записи игрового процесса"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:740
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142
|
||||||
|
msgid "Select The Recording File"
|
||||||
|
msgstr "Выберите файл для записи игрового процесса"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Select a Wii WAD file to install"
|
msgid "Select a Wii WAD file to install"
|
||||||
msgstr "Выберите файл сохранения для импорта"
|
msgstr "Выберите файл сохранения для импорта"
|
||||||
|
|
@ -4260,6 +4444,7 @@ msgstr ""
|
||||||
msgid "Select the file to load"
|
msgid "Select the file to load"
|
||||||
msgstr "Выберите файл для запуска..."
|
msgstr "Выберите файл для запуска..."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
msgstr "Выберите файл сохранений Wii"
|
msgstr "Выберите файл сохранений Wii"
|
||||||
|
|
@ -4269,6 +4454,17 @@ msgid "Select the state to load"
|
||||||
msgstr "Выберите файл сохранения для загрузки"
|
msgstr "Выберите файл сохранения для загрузки"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
||||||
|
msgid "Select the save file"
|
||||||
|
msgstr "Выберите файл сохранений Wii"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457
|
||||||
|
msgid "Select the state to load"
|
||||||
|
msgstr "Выберите файл сохранения для загрузки"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Select the state to save"
|
msgid "Select the state to save"
|
||||||
msgstr "Выберите или укажите файл для быстрого сохранения"
|
msgstr "Выберите или укажите файл для быстрого сохранения"
|
||||||
|
|
||||||
|
|
@ -4629,9 +4825,15 @@ msgstr "Ошибка создания аудио-буфера %s."
|
||||||
msgid "Space"
|
msgid "Space"
|
||||||
msgstr "Пробел"
|
msgstr "Пробел"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Spanish"
|
msgid "Spanish"
|
||||||
msgstr "Spanish"
|
msgstr "Spanish"
|
||||||
|
|
@ -4669,7 +4871,11 @@ msgstr ""
|
||||||
msgid "Standard Controller"
|
msgid "Standard Controller"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
||||||
msgid "Start"
|
msgid "Start"
|
||||||
|
|
@ -4706,7 +4912,10 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
||||||
msgid "Stop"
|
msgid "Stop"
|
||||||
msgstr "Стоп"
|
msgstr "Стоп"
|
||||||
|
|
@ -4778,7 +4987,10 @@ msgstr "Правая панель"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Take Screenshot"
|
msgid "Take Screenshot"
|
||||||
msgstr "Сделать скриншот"
|
msgstr "Сделать скриншот"
|
||||||
|
|
||||||
|
|
@ -5023,12 +5235,19 @@ msgstr "Включить все"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Toggle Fullscreen"
|
msgid "Toggle Fullscreen"
|
||||||
msgstr "Включение полноэкранного режима"
|
msgstr "Включение полноэкранного режима"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Top"
|
msgid "Top"
|
||||||
msgstr "сверху"
|
msgstr "сверху"
|
||||||
|
|
||||||
|
|
@ -5132,6 +5351,18 @@ msgstr "Получено неизвестное сообщение с id : %d"
|
||||||
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
||||||
msgstr "Получено неизвестное сообщение с id : %d от игрока:%d Игрок выкинут!"
|
msgstr "Получено неизвестное сообщение с id : %d от игрока:%d Игрок выкинут!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
||||||
|
#, c-format
|
||||||
|
msgid ""
|
||||||
|
"Unknown pointer %#08x\n"
|
||||||
|
"Continue?"
|
||||||
|
msgstr ""
|
||||||
|
"Неизвестный указатель %#08x\n"
|
||||||
|
"Продолжить?"
|
||||||
|
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
||||||
msgid "Up"
|
msgid "Up"
|
||||||
|
|
@ -5342,7 +5573,11 @@ msgstr "DVD-диск:"
|
||||||
msgid "Wii Save Import"
|
msgid "Wii Save Import"
|
||||||
msgstr "Импорт сохранений Wii"
|
msgstr "Импорт сохранений Wii"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wii save files (*.bin)|*.bin"
|
msgid "Wii save files (*.bin)|*.bin"
|
||||||
msgstr "Файлы сохранений Wii (*.bin)|*.bin"
|
msgstr "Файлы сохранений Wii (*.bin)|*.bin"
|
||||||
|
|
||||||
|
|
@ -5369,7 +5604,11 @@ msgid ""
|
||||||
"Do you want to reconnect immediately?"
|
"Do you want to reconnect immediately?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wiimote Connected"
|
msgid "Wiimote Connected"
|
||||||
msgstr "Wiimote подключен"
|
msgstr "Wiimote подключен"
|
||||||
|
|
||||||
|
|
@ -5405,9 +5644,15 @@ msgstr "Windows Right"
|
||||||
msgid "Word Wrap"
|
msgid "Word Wrap"
|
||||||
msgstr "Перенос строк"
|
msgstr "Перенос строк"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Working..."
|
msgid "Working..."
|
||||||
msgstr "Подождите..."
|
msgstr "Подождите..."
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,11 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: Dolphin Emu\n"
|
"Project-Id-Version: Dolphin Emu\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
|
=======
|
||||||
|
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
"PO-Revision-Date: 2011-03-02 21:58+0100\n"
|
"PO-Revision-Date: 2011-03-02 21:58+0100\n"
|
||||||
"Last-Translator: nikolassj\n"
|
"Last-Translator: nikolassj\n"
|
||||||
"Language-Team: \n"
|
"Language-Team: \n"
|
||||||
|
|
@ -508,9 +512,15 @@ msgstr "Dodaj Patch "
|
||||||
msgid "Add new pane"
|
msgid "Add new pane"
|
||||||
msgstr "Dodaj nova okna"
|
msgstr "Dodaj nova okna"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Add..."
|
msgid "Add..."
|
||||||
msgstr "Dodaj..."
|
msgstr "Dodaj..."
|
||||||
|
|
||||||
|
|
@ -564,8 +574,13 @@ msgstr ""
|
||||||
msgid "All Gamecube GCM files (gcm)"
|
msgid "All Gamecube GCM files (gcm)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "All Save States (sav, s##)"
|
msgid "All Save States (sav, s##)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -645,7 +660,11 @@ msgstr ""
|
||||||
msgid "Are you sure you want to delete this file? It will be gone forever!"
|
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!"
|
msgstr "Jesi li siguran da zelis da obrises ovaj fajl? Nestace zauvek!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
||||||
msgid "Aspect Ratio:"
|
msgid "Aspect Ratio:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -666,7 +685,11 @@ msgstr ""
|
||||||
msgid "AudioCommon: Error opening AO device.\n"
|
msgid "AudioCommon: Error opening AO device.\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
||||||
msgid "Auto"
|
msgid "Auto"
|
||||||
msgstr "Auto"
|
msgstr "Auto"
|
||||||
|
|
@ -777,7 +800,11 @@ msgid "Blue Right"
|
||||||
msgstr "Blue right "
|
msgstr "Blue right "
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Bottom"
|
msgid "Bottom"
|
||||||
msgstr "Donji deo/dno"
|
msgstr "Donji deo/dno"
|
||||||
|
|
||||||
|
|
@ -810,7 +837,11 @@ msgstr ""
|
||||||
msgid "Buffer:"
|
msgid "Buffer:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
||||||
msgid "Buttons"
|
msgid "Buttons"
|
||||||
|
|
@ -1037,7 +1068,11 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
||||||
msgid "Close"
|
msgid "Close"
|
||||||
msgstr "Zatvori"
|
msgstr "Zatvori"
|
||||||
|
|
@ -1146,7 +1181,11 @@ msgstr ""
|
||||||
msgid "Connect Wiimote 4"
|
msgid "Connect Wiimote 4"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Connecting..."
|
msgid "Connecting..."
|
||||||
msgstr "Povezivanje..."
|
msgstr "Povezivanje..."
|
||||||
|
|
||||||
|
|
@ -1321,7 +1360,11 @@ msgid "DSP Emulator Engine"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "DSP HLE emulation (fast)"
|
msgid "DSP HLE emulation (fast)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1533,7 +1576,11 @@ msgstr ""
|
||||||
msgid "Divide"
|
msgid "Divide"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Do you want to stop the current emulation?"
|
msgid "Do you want to stop the current emulation?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1563,12 +1610,21 @@ msgstr ""
|
||||||
msgid "Dolphin FIFO"
|
msgid "Dolphin FIFO"
|
||||||
msgstr "Dolphin"
|
msgstr "Dolphin"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
msgid "Dolphin GCPad Configuration"
|
msgid "Dolphin GCPad Configuration"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204
|
||||||
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Dolphin TAS Movies (*.dtm)"
|
msgid "Dolphin TAS Movies (*.dtm)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1651,9 +1707,15 @@ msgid ""
|
||||||
"If unsure, leave this unchecked."
|
"If unsure, leave this unchecked."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Dutch"
|
msgid "Dutch"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1776,15 +1838,22 @@ msgstr ""
|
||||||
msgid "Enable Block Merging"
|
msgid "Enable Block Merging"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
||||||
msgid "Enable Bounding Box Calculation"
|
msgid "Enable Bounding Box Calculation"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
||||||
msgid "Enable Cache"
|
msgid "Enable Cache"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Enable Cheats"
|
msgid "Enable Cheats"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1910,9 +1979,15 @@ msgstr ""
|
||||||
msgid "End"
|
msgid "End"
|
||||||
msgstr "Kraj"
|
msgstr "Kraj"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "English"
|
msgid "English"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1941,6 +2016,7 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
msgid "Error"
|
msgid "Error"
|
||||||
msgstr "Error"
|
msgstr "Error"
|
||||||
|
|
@ -1952,6 +2028,12 @@ msgid ""
|
||||||
"Sorry, Wii recording is temporarily broken."
|
"Sorry, Wii recording is temporarily broken."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169
|
||||||
|
msgid "Error"
|
||||||
|
msgstr "Error"
|
||||||
|
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
||||||
msgid "Error loading selected language. Falling back to system default."
|
msgid "Error loading selected language. Falling back to system default."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2368,9 +2450,15 @@ msgstr ""
|
||||||
msgid "Free Look"
|
msgid "Free Look"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "French"
|
msgid "French"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2438,7 +2526,11 @@ msgid "Gamecube &Pad Settings"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2459,8 +2551,12 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
||||||
msgid "General"
|
msgid "General"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2470,9 +2566,15 @@ msgstr ""
|
||||||
msgid "General Settings"
|
msgid "General Settings"
|
||||||
msgstr "Opcije Uredjaja "
|
msgstr "Opcije Uredjaja "
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "German"
|
msgid "German"
|
||||||
msgstr "Nemacki "
|
msgstr "Nemacki "
|
||||||
|
|
||||||
|
|
@ -2589,8 +2691,12 @@ msgid "Hotkey Configuration"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Hotkeys"
|
msgid "Hotkeys"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2786,7 +2892,11 @@ msgid ""
|
||||||
"InstallExceptionHandler called, but this platform does not yet support it."
|
"InstallExceptionHandler called, but this platform does not yet support it."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Installing WAD..."
|
msgid "Installing WAD..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2864,9 +2974,15 @@ msgstr ""
|
||||||
msgid "Invalid state"
|
msgid "Invalid state"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Italian"
|
msgid "Italian"
|
||||||
msgstr "Italianski "
|
msgstr "Italianski "
|
||||||
|
|
||||||
|
|
@ -3018,12 +3134,20 @@ msgstr "Ucitaj State Slot 8"
|
||||||
msgid "Load State..."
|
msgid "Load State..."
|
||||||
msgstr "Ucitaj State"
|
msgstr "Ucitaj State"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Load Wii System Menu"
|
msgid "Load Wii System Menu"
|
||||||
msgstr "Ucitaj Wii Sistem Meni (%d %c)"
|
msgstr "Ucitaj Wii Sistem Meni (%d %c)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, fuzzy, c-format
|
#, fuzzy, c-format
|
||||||
msgid "Load Wii System Menu %d%c"
|
msgid "Load Wii System Menu %d%c"
|
||||||
msgstr "Ucitaj Wii Sistem Meni (%d %c)"
|
msgstr "Ucitaj Wii Sistem Meni (%d %c)"
|
||||||
|
|
@ -3100,7 +3224,11 @@ msgstr ""
|
||||||
msgid "MadCatz Gameshark files(*.gcs)"
|
msgid "MadCatz Gameshark files(*.gcs)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
||||||
msgid "Main Stick"
|
msgid "Main Stick"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3132,7 +3260,11 @@ msgid "Memory Byte"
|
||||||
msgstr "&Memorija"
|
msgstr "&Memorija"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Memory Card"
|
msgid "Memory Card"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3309,7 +3441,11 @@ msgstr ""
|
||||||
msgid "NP Up"
|
msgid "NP Up"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
||||||
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
||||||
msgid "Name:"
|
msgid "Name:"
|
||||||
|
|
@ -3396,7 +3532,11 @@ msgstr ""
|
||||||
msgid "Not Set"
|
msgid "Not Set"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Not connected"
|
msgid "Not connected"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3457,7 +3597,10 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Open"
|
msgid "Open"
|
||||||
msgstr "Otvori "
|
msgstr "Otvori "
|
||||||
|
|
||||||
|
|
@ -3583,8 +3726,13 @@ msgstr ""
|
||||||
msgid "Paths"
|
msgid "Paths"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
||||||
msgid "Pause"
|
msgid "Pause"
|
||||||
msgstr "Pauza "
|
msgstr "Pauza "
|
||||||
|
|
@ -3605,8 +3753,13 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Play"
|
msgid "Play"
|
||||||
msgstr "Pokreni "
|
msgstr "Pokreni "
|
||||||
|
|
||||||
|
|
@ -3633,7 +3786,11 @@ msgstr "Opcije "
|
||||||
msgid "Players"
|
msgid "Players"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Please confirm..."
|
msgid "Please confirm..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3841,10 +3998,17 @@ msgstr ""
|
||||||
msgid "Refresh game list"
|
msgid "Refresh game list"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434
|
||||||
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Remove"
|
msgid "Remove"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3860,7 +4024,10 @@ msgid "Render to Main Window"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
||||||
msgid "Reset"
|
msgid "Reset"
|
||||||
msgstr "Reset/Restart "
|
msgstr "Reset/Restart "
|
||||||
|
|
@ -3903,7 +4070,11 @@ msgstr ""
|
||||||
msgid "Safe"
|
msgid "Safe"
|
||||||
msgstr "Siguran "
|
msgstr "Siguran "
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Sample Rate:"
|
msgid "Sample Rate:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3987,7 +4158,11 @@ msgstr ""
|
||||||
msgid "Scaled EFB Copy"
|
msgid "Scaled EFB Copy"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, fuzzy, c-format
|
#, fuzzy, c-format
|
||||||
msgid "Scanning %s"
|
msgid "Scanning %s"
|
||||||
msgstr "Skeniranje..."
|
msgstr "Skeniranje..."
|
||||||
|
|
@ -4027,12 +4202,21 @@ msgstr ""
|
||||||
msgid "Select"
|
msgid "Select"
|
||||||
msgstr "Izaberi "
|
msgstr "Izaberi "
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
||||||
msgid "Select The Recording File"
|
msgid "Select The Recording File"
|
||||||
msgstr "Izaberi Snimani fajl"
|
msgstr "Izaberi Snimani fajl"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:740
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142
|
||||||
|
msgid "Select The Recording File"
|
||||||
|
msgstr "Izaberi Snimani fajl"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Select a Wii WAD file to install"
|
msgid "Select a Wii WAD file to install"
|
||||||
msgstr "Izaberi \"Snimani fajl/Save file\" za importovanje "
|
msgstr "Izaberi \"Snimani fajl/Save file\" za importovanje "
|
||||||
|
|
@ -4059,6 +4243,7 @@ msgstr ""
|
||||||
msgid "Select the file to load"
|
msgid "Select the file to load"
|
||||||
msgstr "Izaberi fajl za ucitavanje "
|
msgstr "Izaberi fajl za ucitavanje "
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
msgstr "Izaberi \"snimani fajl/the save state\""
|
msgstr "Izaberi \"snimani fajl/the save state\""
|
||||||
|
|
@ -4068,6 +4253,17 @@ msgid "Select the state to load"
|
||||||
msgstr "Izaberi state za ucitavanje "
|
msgstr "Izaberi state za ucitavanje "
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
||||||
|
msgid "Select the save file"
|
||||||
|
msgstr "Izaberi \"snimani fajl/the save state\""
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457
|
||||||
|
msgid "Select the state to load"
|
||||||
|
msgstr "Izaberi state za ucitavanje "
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Select the state to save"
|
msgid "Select the state to save"
|
||||||
msgstr "Izaberi state za snimanje/save"
|
msgstr "Izaberi state za snimanje/save"
|
||||||
|
|
||||||
|
|
@ -4403,9 +4599,15 @@ msgstr ""
|
||||||
msgid "Space"
|
msgid "Space"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Spanish"
|
msgid "Spanish"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -4441,7 +4643,11 @@ msgstr ""
|
||||||
msgid "Standard Controller"
|
msgid "Standard Controller"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
||||||
msgid "Start"
|
msgid "Start"
|
||||||
|
|
@ -4476,7 +4682,10 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
||||||
msgid "Stop"
|
msgid "Stop"
|
||||||
msgstr " Zaustavi"
|
msgstr " Zaustavi"
|
||||||
|
|
@ -4548,7 +4757,10 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Take Screenshot"
|
msgid "Take Screenshot"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -4762,12 +4974,19 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Toggle Fullscreen"
|
msgid "Toggle Fullscreen"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Top"
|
msgid "Top"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -4869,6 +5088,16 @@ msgstr ""
|
||||||
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
||||||
|
#, c-format
|
||||||
|
msgid ""
|
||||||
|
"Unknown pointer %#08x\n"
|
||||||
|
"Continue?"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
||||||
msgid "Up"
|
msgid "Up"
|
||||||
|
|
@ -5076,7 +5305,11 @@ msgstr ""
|
||||||
msgid "Wii Save Import"
|
msgid "Wii Save Import"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wii save files (*.bin)|*.bin"
|
msgid "Wii save files (*.bin)|*.bin"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -5103,7 +5336,11 @@ msgid ""
|
||||||
"Do you want to reconnect immediately?"
|
"Do you want to reconnect immediately?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wiimote Connected"
|
msgid "Wiimote Connected"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -5136,9 +5373,15 @@ msgstr ""
|
||||||
msgid "Word Wrap"
|
msgid "Word Wrap"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Working..."
|
msgid "Working..."
|
||||||
msgstr "Radi..."
|
msgstr "Radi..."
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,11 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: Dolphin Emu\n"
|
"Project-Id-Version: Dolphin Emu\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
|
=======
|
||||||
|
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
"PO-Revision-Date: 2011-08-19 08:38-0500\n"
|
"PO-Revision-Date: 2011-08-19 08:38-0500\n"
|
||||||
"Last-Translator: nlgzrgn <nlgzrgn@live.com>\n"
|
"Last-Translator: nlgzrgn <nlgzrgn@live.com>\n"
|
||||||
"Language-Team: nlgzrgn <nlgzrgn@live.com>\n"
|
"Language-Team: nlgzrgn <nlgzrgn@live.com>\n"
|
||||||
|
|
@ -555,9 +559,15 @@ msgstr "Yama Ekle"
|
||||||
msgid "Add new pane"
|
msgid "Add new pane"
|
||||||
msgstr "Bölme ekle"
|
msgstr "Bölme ekle"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Add..."
|
msgid "Add..."
|
||||||
msgstr "Ekle..."
|
msgstr "Ekle..."
|
||||||
|
|
||||||
|
|
@ -627,8 +637,13 @@ msgstr "Tüm GC/Wii kalıpları (gcm, iso, ciso, gcz)"
|
||||||
msgid "All Gamecube GCM files (gcm)"
|
msgid "All Gamecube GCM files (gcm)"
|
||||||
msgstr "Tüm GameCube GCM Dosyaları (gcm)"
|
msgstr "Tüm GameCube GCM Dosyaları (gcm)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "All Save States (sav, s##)"
|
msgid "All Save States (sav, s##)"
|
||||||
msgstr "Tüm Kayıtlı Oyunlar (sav,s##)"
|
msgstr "Tüm Kayıtlı Oyunlar (sav,s##)"
|
||||||
|
|
||||||
|
|
@ -717,7 +732,11 @@ msgid "Are you sure you want to delete this file? It will be gone forever!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Bu dosyayı gerçekten silmek istiyor musunuz? Ama geri döndürülemeyecektir!"
|
"Bu dosyayı gerçekten silmek istiyor musunuz? Ama geri döndürülemeyecektir!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
||||||
msgid "Aspect Ratio:"
|
msgid "Aspect Ratio:"
|
||||||
msgstr "En-boy Oranı:"
|
msgstr "En-boy Oranı:"
|
||||||
|
|
@ -738,7 +757,11 @@ msgstr "Ses Arka Ucu:"
|
||||||
msgid "AudioCommon: Error opening AO device.\n"
|
msgid "AudioCommon: Error opening AO device.\n"
|
||||||
msgstr "AudioCommon: AO sürücüyü açarken hata.\n"
|
msgstr "AudioCommon: AO sürücüyü açarken hata.\n"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
||||||
msgid "Auto"
|
msgid "Auto"
|
||||||
msgstr "Otomatik"
|
msgstr "Otomatik"
|
||||||
|
|
@ -853,7 +876,11 @@ msgid "Blue Right"
|
||||||
msgstr "Mavi Sağ"
|
msgstr "Mavi Sağ"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Bottom"
|
msgid "Bottom"
|
||||||
msgstr "Alt"
|
msgstr "Alt"
|
||||||
|
|
||||||
|
|
@ -886,7 +913,11 @@ msgstr "Çıkış klasörü için gözat"
|
||||||
msgid "Buffer:"
|
msgid "Buffer:"
|
||||||
msgstr "Tampon:"
|
msgstr "Tampon:"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
||||||
msgid "Buttons"
|
msgid "Buttons"
|
||||||
|
|
@ -1131,7 +1162,11 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
||||||
msgid "Close"
|
msgid "Close"
|
||||||
msgstr "Kapat"
|
msgstr "Kapat"
|
||||||
|
|
@ -1240,7 +1275,11 @@ msgstr "Wiimote 3'ü Bağla"
|
||||||
msgid "Connect Wiimote 4"
|
msgid "Connect Wiimote 4"
|
||||||
msgstr "Wiimote 4'ü Bağla"
|
msgstr "Wiimote 4'ü Bağla"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Connecting..."
|
msgid "Connecting..."
|
||||||
msgstr "Bağlanıyor..."
|
msgstr "Bağlanıyor..."
|
||||||
|
|
||||||
|
|
@ -1434,7 +1473,11 @@ msgid "DSP Emulator Engine"
|
||||||
msgstr "Ses Emülatörü Motoru"
|
msgstr "Ses Emülatörü Motoru"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "DSP HLE emulation (fast)"
|
msgid "DSP HLE emulation (fast)"
|
||||||
msgstr "DSP HLE Emülasyonu (Hızlı)"
|
msgstr "DSP HLE Emülasyonu (Hızlı)"
|
||||||
|
|
||||||
|
|
@ -1665,7 +1708,11 @@ msgstr ""
|
||||||
msgid "Divide"
|
msgid "Divide"
|
||||||
msgstr "Böl"
|
msgstr "Böl"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Do you want to stop the current emulation?"
|
msgid "Do you want to stop the current emulation?"
|
||||||
msgstr "Emülasyonu durdurmak istiyor musunuz?"
|
msgstr "Emülasyonu durdurmak istiyor musunuz?"
|
||||||
|
|
||||||
|
|
@ -1694,12 +1741,21 @@ msgstr "Dolphin Taklit Wiimote Yapılandırması"
|
||||||
msgid "Dolphin FIFO"
|
msgid "Dolphin FIFO"
|
||||||
msgstr "Dolphin FIFO"
|
msgstr "Dolphin FIFO"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
msgid "Dolphin GCPad Configuration"
|
msgid "Dolphin GCPad Configuration"
|
||||||
msgstr "Dolphin GC Kolu Yapılandırması"
|
msgstr "Dolphin GC Kolu Yapılandırması"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204
|
||||||
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
msgstr "Dolphin GC Kolu Yapılandırması"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Dolphin TAS Movies (*.dtm)"
|
msgid "Dolphin TAS Movies (*.dtm)"
|
||||||
msgstr "Dolphin TAS Filmleri (*.dtm)"
|
msgstr "Dolphin TAS Filmleri (*.dtm)"
|
||||||
|
|
||||||
|
|
@ -1796,9 +1852,15 @@ msgstr ""
|
||||||
"\n"
|
"\n"
|
||||||
"Emin değilseniz, işaretsiz bırakın."
|
"Emin değilseniz, işaretsiz bırakın."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Dutch"
|
msgid "Dutch"
|
||||||
msgstr "Flemenkçe"
|
msgstr "Flemenkçe"
|
||||||
|
|
||||||
|
|
@ -1942,15 +2004,22 @@ msgstr "BAT'a İzin Ver"
|
||||||
msgid "Enable Block Merging"
|
msgid "Enable Block Merging"
|
||||||
msgstr "Blok Birleşimine İzin Ver"
|
msgstr "Blok Birleşimine İzin Ver"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
||||||
msgid "Enable Bounding Box Calculation"
|
msgid "Enable Bounding Box Calculation"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
||||||
msgid "Enable Cache"
|
msgid "Enable Cache"
|
||||||
msgstr "Önbelleğe izin ver"
|
msgstr "Önbelleğe izin ver"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Enable Cheats"
|
msgid "Enable Cheats"
|
||||||
msgstr "Hilelere İzin Ver"
|
msgstr "Hilelere İzin Ver"
|
||||||
|
|
||||||
|
|
@ -2106,9 +2175,15 @@ msgstr ""
|
||||||
msgid "End"
|
msgid "End"
|
||||||
msgstr "Son"
|
msgstr "Son"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "English"
|
msgid "English"
|
||||||
msgstr "İngilizce"
|
msgstr "İngilizce"
|
||||||
|
|
||||||
|
|
@ -2137,6 +2212,7 @@ msgstr "Eşit"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
msgid "Error"
|
msgid "Error"
|
||||||
msgstr "Hata"
|
msgstr "Hata"
|
||||||
|
|
@ -2148,6 +2224,12 @@ msgid ""
|
||||||
"Sorry, Wii recording is temporarily broken."
|
"Sorry, Wii recording is temporarily broken."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169
|
||||||
|
msgid "Error"
|
||||||
|
msgstr "Hata"
|
||||||
|
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
||||||
msgid "Error loading selected language. Falling back to system default."
|
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."
|
msgstr "Seçili dili yüklerken hata. Sistem varsayılanlarına geri dönülüyor."
|
||||||
|
|
@ -2602,9 +2684,15 @@ msgstr "Çekilecek Kareler"
|
||||||
msgid "Free Look"
|
msgid "Free Look"
|
||||||
msgstr "Serbest Bakış"
|
msgstr "Serbest Bakış"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "French"
|
msgid "French"
|
||||||
msgstr "Fransızca"
|
msgstr "Fransızca"
|
||||||
|
|
||||||
|
|
@ -2671,7 +2759,11 @@ msgid "Gamecube &Pad Settings"
|
||||||
msgstr "Gamecube Kolu Ayarları (&P)"
|
msgstr "Gamecube Kolu Ayarları (&P)"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
||||||
msgstr "GameCube Hafıza Kartları (*.raw,*.gcp)"
|
msgstr "GameCube Hafıza Kartları (*.raw,*.gcp)"
|
||||||
|
|
||||||
|
|
@ -2694,8 +2786,12 @@ msgstr ""
|
||||||
"(kötü bir kod veya türü henüz desteklenmiyor.)"
|
"(kötü bir kod veya türü henüz desteklenmiyor.)"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
||||||
msgid "General"
|
msgid "General"
|
||||||
msgstr "Genel"
|
msgstr "Genel"
|
||||||
|
|
@ -2704,9 +2800,15 @@ msgstr "Genel"
|
||||||
msgid "General Settings"
|
msgid "General Settings"
|
||||||
msgstr "Genel Ayarlar"
|
msgstr "Genel Ayarlar"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "German"
|
msgid "German"
|
||||||
msgstr "Almanca"
|
msgstr "Almanca"
|
||||||
|
|
||||||
|
|
@ -2835,8 +2937,12 @@ msgid "Hotkey Configuration"
|
||||||
msgstr "Kısayol Tuşu Yapılandırması"
|
msgstr "Kısayol Tuşu Yapılandırması"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Hotkeys"
|
msgid "Hotkeys"
|
||||||
msgstr "Tuşlar"
|
msgstr "Tuşlar"
|
||||||
|
|
||||||
|
|
@ -3059,7 +3165,11 @@ msgstr ""
|
||||||
"Kurulum Özel Durum İşleyici çağrıldı, ama bu platform henüz bunu "
|
"Kurulum Özel Durum İşleyici çağrıldı, ama bu platform henüz bunu "
|
||||||
"desteklemiyor."
|
"desteklemiyor."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Installing WAD..."
|
msgid "Installing WAD..."
|
||||||
msgstr "WAD kuruluyor..."
|
msgstr "WAD kuruluyor..."
|
||||||
|
|
||||||
|
|
@ -3141,9 +3251,15 @@ msgstr "Hatalı çekim dosyası"
|
||||||
msgid "Invalid state"
|
msgid "Invalid state"
|
||||||
msgstr "Hatalı durum"
|
msgstr "Hatalı durum"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Italian"
|
msgid "Italian"
|
||||||
msgstr "İtalyanca"
|
msgstr "İtalyanca"
|
||||||
|
|
||||||
|
|
@ -3301,11 +3417,19 @@ msgstr "Durumu Yükle : 8"
|
||||||
msgid "Load State..."
|
msgid "Load State..."
|
||||||
msgstr "Durumu Yükle..."
|
msgstr "Durumu Yükle..."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
msgid "Load Wii System Menu"
|
msgid "Load Wii System Menu"
|
||||||
msgstr "Wii Sistem Menüsünü Yükle"
|
msgstr "Wii Sistem Menüsünü Yükle"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
|
||||||
|
msgid "Load Wii System Menu"
|
||||||
|
msgstr "Wii Sistem Menüsünü Yükle"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Load Wii System Menu %d%c"
|
msgid "Load Wii System Menu %d%c"
|
||||||
msgstr "Wii Sistem Menüsünü Yükle %d%c"
|
msgstr "Wii Sistem Menüsünü Yükle %d%c"
|
||||||
|
|
@ -3387,7 +3511,11 @@ msgstr "MMU Hız Hilesi"
|
||||||
msgid "MadCatz Gameshark files(*.gcs)"
|
msgid "MadCatz Gameshark files(*.gcs)"
|
||||||
msgstr "MadCatz Gameshark dosyaları(*.gcs)"
|
msgstr "MadCatz Gameshark dosyaları(*.gcs)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
||||||
msgid "Main Stick"
|
msgid "Main Stick"
|
||||||
msgstr "Ana Çubuk"
|
msgstr "Ana Çubuk"
|
||||||
|
|
@ -3418,7 +3546,11 @@ msgid "Memory Byte"
|
||||||
msgstr "Hafıza Baytı"
|
msgstr "Hafıza Baytı"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Memory Card"
|
msgid "Memory Card"
|
||||||
msgstr "Hafıza Kartı"
|
msgstr "Hafıza Kartı"
|
||||||
|
|
||||||
|
|
@ -3616,7 +3748,11 @@ msgstr "NP Sekme"
|
||||||
msgid "NP Up"
|
msgid "NP Up"
|
||||||
msgstr "NP Yukarı"
|
msgstr "NP Yukarı"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
||||||
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
||||||
msgid "Name:"
|
msgid "Name:"
|
||||||
|
|
@ -3703,7 +3839,11 @@ msgstr "Eşit Değil"
|
||||||
msgid "Not Set"
|
msgid "Not Set"
|
||||||
msgstr "Ayarlanmamış"
|
msgstr "Ayarlanmamış"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Not connected"
|
msgid "Not connected"
|
||||||
msgstr "Bağlı değil"
|
msgstr "Bağlı değil"
|
||||||
|
|
||||||
|
|
@ -3764,7 +3904,10 @@ msgstr "Sadece %d blok kullanılabilir"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Open"
|
msgid "Open"
|
||||||
msgstr "Aç"
|
msgstr "Aç"
|
||||||
|
|
||||||
|
|
@ -3895,8 +4038,13 @@ msgstr "Yamalar"
|
||||||
msgid "Paths"
|
msgid "Paths"
|
||||||
msgstr "Yollar"
|
msgstr "Yollar"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
||||||
msgid "Pause"
|
msgid "Pause"
|
||||||
msgstr "Duraklat"
|
msgstr "Duraklat"
|
||||||
|
|
@ -3916,8 +4064,13 @@ msgstr "Perspektif %d"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Play"
|
msgid "Play"
|
||||||
msgstr "Oynat"
|
msgstr "Oynat"
|
||||||
|
|
||||||
|
|
@ -3943,7 +4096,11 @@ msgstr "Oynatma Seçenekleri"
|
||||||
msgid "Players"
|
msgid "Players"
|
||||||
msgstr "Oyuncular"
|
msgstr "Oyuncular"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Please confirm..."
|
msgid "Please confirm..."
|
||||||
msgstr "Lütfen onaylayın..."
|
msgstr "Lütfen onaylayın..."
|
||||||
|
|
||||||
|
|
@ -4154,10 +4311,17 @@ msgstr "Listeyi Yenile"
|
||||||
msgid "Refresh game list"
|
msgid "Refresh game list"
|
||||||
msgstr "Oyun Listesini Yenile"
|
msgstr "Oyun Listesini Yenile"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434
|
||||||
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Remove"
|
msgid "Remove"
|
||||||
msgstr "Kaldır"
|
msgstr "Kaldır"
|
||||||
|
|
||||||
|
|
@ -4176,7 +4340,10 @@ msgid "Render to Main Window"
|
||||||
msgstr "Ana pencerede yorumla"
|
msgstr "Ana pencerede yorumla"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
||||||
msgid "Reset"
|
msgid "Reset"
|
||||||
msgstr "Sıfırla"
|
msgstr "Sıfırla"
|
||||||
|
|
@ -4219,7 +4386,11 @@ msgstr "Durumu Kaydet (&V)"
|
||||||
msgid "Safe"
|
msgid "Safe"
|
||||||
msgstr "Güvenli"
|
msgstr "Güvenli"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Sample Rate:"
|
msgid "Sample Rate:"
|
||||||
msgstr "Örnek Oran:"
|
msgstr "Örnek Oran:"
|
||||||
|
|
||||||
|
|
@ -4303,7 +4474,11 @@ msgstr "Kayıtlı durum filmi %s bozuk, film çekimi duruyor..."
|
||||||
msgid "Scaled EFB Copy"
|
msgid "Scaled EFB Copy"
|
||||||
msgstr "Boyutlandırılmış EFB Kopyası"
|
msgstr "Boyutlandırılmış EFB Kopyası"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Scanning %s"
|
msgid "Scanning %s"
|
||||||
msgstr "Taranıyor %s"
|
msgstr "Taranıyor %s"
|
||||||
|
|
@ -4343,12 +4518,21 @@ msgstr "SYSCONF içinde %s bölümü bulunamadı"
|
||||||
msgid "Select"
|
msgid "Select"
|
||||||
msgstr "Seç"
|
msgstr "Seç"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
||||||
msgid "Select The Recording File"
|
msgid "Select The Recording File"
|
||||||
msgstr "Çekim Dosyasını Seç"
|
msgstr "Çekim Dosyasını Seç"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:740
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142
|
||||||
|
msgid "Select The Recording File"
|
||||||
|
msgstr "Çekim Dosyasını Seç"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Select a Wii WAD file to install"
|
msgid "Select a Wii WAD file to install"
|
||||||
msgstr "Kurmak için bir Wii WAD dosyası seçin"
|
msgstr "Kurmak için bir Wii WAD dosyası seçin"
|
||||||
|
|
||||||
|
|
@ -4374,6 +4558,7 @@ msgstr "Sabit olmayan pencereyi seçin"
|
||||||
msgid "Select the file to load"
|
msgid "Select the file to load"
|
||||||
msgstr "Yüklemek için dosyayı seçin"
|
msgstr "Yüklemek için dosyayı seçin"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
msgstr "Kayıt dosyasını seçin"
|
msgstr "Kayıt dosyasını seçin"
|
||||||
|
|
@ -4383,6 +4568,17 @@ msgid "Select the state to load"
|
||||||
msgstr "Yüklemek için durum seçin"
|
msgstr "Yüklemek için durum seçin"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
||||||
|
msgid "Select the save file"
|
||||||
|
msgstr "Kayıt dosyasını seçin"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457
|
||||||
|
msgid "Select the state to load"
|
||||||
|
msgstr "Yüklemek için durum seçin"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Select the state to save"
|
msgid "Select the state to save"
|
||||||
msgstr "Kaydetmek için durum seçin"
|
msgstr "Kaydetmek için durum seçin"
|
||||||
|
|
||||||
|
|
@ -4759,9 +4955,15 @@ msgstr "Ses tamponu oluşturulamadı: %s"
|
||||||
msgid "Space"
|
msgid "Space"
|
||||||
msgstr "Boşluk"
|
msgstr "Boşluk"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Spanish"
|
msgid "Spanish"
|
||||||
msgstr "İspanyolca"
|
msgstr "İspanyolca"
|
||||||
|
|
||||||
|
|
@ -4805,7 +5007,11 @@ msgstr "Kare Çubuk"
|
||||||
msgid "Standard Controller"
|
msgid "Standard Controller"
|
||||||
msgstr "Varsayılan Denetim Aygıtı"
|
msgstr "Varsayılan Denetim Aygıtı"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
||||||
msgid "Start"
|
msgid "Start"
|
||||||
|
|
@ -4840,7 +5046,10 @@ msgstr "Çubuk"
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
||||||
msgid "Stop"
|
msgid "Stop"
|
||||||
msgstr "Durdur"
|
msgstr "Durdur"
|
||||||
|
|
@ -4917,7 +5126,10 @@ msgstr "Tablo Sağ"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Take Screenshot"
|
msgid "Take Screenshot"
|
||||||
msgstr "Ekran Görüntüsü Al"
|
msgstr "Ekran Görüntüsü Al"
|
||||||
|
|
||||||
|
|
@ -5160,12 +5372,19 @@ msgstr "Tüm Geçmiş Türlerini Seç"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Toggle Fullscreen"
|
msgid "Toggle Fullscreen"
|
||||||
msgstr "Tam Ekran Moduna Geç"
|
msgstr "Tam Ekran Moduna Geç"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Top"
|
msgid "Top"
|
||||||
msgstr "Üst"
|
msgstr "Üst"
|
||||||
|
|
||||||
|
|
@ -5274,6 +5493,18 @@ msgstr "Şu ID ile bilinmeyen mesaj alındı : %d"
|
||||||
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
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!"
|
msgstr "ID %d ile %d oyuncusundan bilinmeyen mesaj alındı. Oyuncu atılıyor!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
||||||
|
#, c-format
|
||||||
|
msgid ""
|
||||||
|
"Unknown pointer %#08x\n"
|
||||||
|
"Continue?"
|
||||||
|
msgstr ""
|
||||||
|
"Bilinmeyen işaretleyici %#08x\n"
|
||||||
|
"Devam?"
|
||||||
|
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
||||||
msgid "Up"
|
msgid "Up"
|
||||||
|
|
@ -5496,7 +5727,11 @@ msgstr "Wii NAND Kök Dizini:"
|
||||||
msgid "Wii Save Import"
|
msgid "Wii Save Import"
|
||||||
msgstr "Wii Kaydı Al"
|
msgstr "Wii Kaydı Al"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wii save files (*.bin)|*.bin"
|
msgid "Wii save files (*.bin)|*.bin"
|
||||||
msgstr "Wii kayıt dosyaları (*.bin)|*.bin"
|
msgstr "Wii kayıt dosyaları (*.bin)|*.bin"
|
||||||
|
|
||||||
|
|
@ -5527,7 +5762,11 @@ msgstr ""
|
||||||
"bir zaman aşımı olabilir veya başka bir şey olabilir. \n"
|
"bir zaman aşımı olabilir veya başka bir şey olabilir. \n"
|
||||||
"Tekrar bağlamak istiyor musunuz?"
|
"Tekrar bağlamak istiyor musunuz?"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wiimote Connected"
|
msgid "Wiimote Connected"
|
||||||
msgstr "Wiimote Bağlandı"
|
msgstr "Wiimote Bağlandı"
|
||||||
|
|
||||||
|
|
@ -5559,9 +5798,15 @@ msgstr "Pencereleri Sağa Döşe"
|
||||||
msgid "Word Wrap"
|
msgid "Word Wrap"
|
||||||
msgstr "Heceleme"
|
msgstr "Heceleme"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Working..."
|
msgid "Working..."
|
||||||
msgstr "Çalışıyor..."
|
msgstr "Çalışıyor..."
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,11 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: Dolphin Emu\n"
|
"Project-Id-Version: Dolphin Emu\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
|
=======
|
||||||
|
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
"PO-Revision-Date: 2011-01-09 13:55-0800\n"
|
"PO-Revision-Date: 2011-01-09 13:55-0800\n"
|
||||||
"Last-Translator: thegfw <thegfw@gmail.com>\n"
|
"Last-Translator: thegfw <thegfw@gmail.com>\n"
|
||||||
"Language-Team: \n"
|
"Language-Team: \n"
|
||||||
|
|
@ -536,9 +540,15 @@ msgstr "添加补丁"
|
||||||
msgid "Add new pane"
|
msgid "Add new pane"
|
||||||
msgstr "添加新面板"
|
msgstr "添加新面板"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Add..."
|
msgid "Add..."
|
||||||
msgstr "添加..."
|
msgstr "添加..."
|
||||||
|
|
||||||
|
|
@ -592,8 +602,13 @@ msgstr "所有 GC/Wii 镜像 (gcm, iso, ciso, gcz)"
|
||||||
msgid "All Gamecube GCM files (gcm)"
|
msgid "All Gamecube GCM files (gcm)"
|
||||||
msgstr "所有 Gamecube GCM 文件 (gcm)"
|
msgstr "所有 Gamecube GCM 文件 (gcm)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "All Save States (sav, s##)"
|
msgid "All Save States (sav, s##)"
|
||||||
msgstr "所有存档状态 (sav, s##)"
|
msgstr "所有存档状态 (sav, s##)"
|
||||||
|
|
||||||
|
|
@ -674,7 +689,11 @@ msgstr ""
|
||||||
msgid "Are you sure you want to delete this file? It will be gone forever!"
|
msgid "Are you sure you want to delete this file? It will be gone forever!"
|
||||||
msgstr "请确认真的要删除这些文件?这将是永久性的删除!"
|
msgstr "请确认真的要删除这些文件?这将是永久性的删除!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
||||||
msgid "Aspect Ratio:"
|
msgid "Aspect Ratio:"
|
||||||
msgstr "高宽比:"
|
msgstr "高宽比:"
|
||||||
|
|
@ -695,7 +714,11 @@ msgstr "音频后端:"
|
||||||
msgid "AudioCommon: Error opening AO device.\n"
|
msgid "AudioCommon: Error opening AO device.\n"
|
||||||
msgstr "AudioCommon: 打开 AO 设备错误.\n"
|
msgstr "AudioCommon: 打开 AO 设备错误.\n"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
||||||
msgid "Auto"
|
msgid "Auto"
|
||||||
msgstr "自动"
|
msgstr "自动"
|
||||||
|
|
@ -807,7 +830,11 @@ msgid "Blue Right"
|
||||||
msgstr "蓝 右"
|
msgstr "蓝 右"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Bottom"
|
msgid "Bottom"
|
||||||
msgstr "底部"
|
msgstr "底部"
|
||||||
|
|
||||||
|
|
@ -840,7 +867,11 @@ msgstr "浏览输出目录"
|
||||||
msgid "Buffer:"
|
msgid "Buffer:"
|
||||||
msgstr "缓冲区:"
|
msgstr "缓冲区:"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
||||||
msgid "Buttons"
|
msgid "Buttons"
|
||||||
|
|
@ -1075,7 +1106,11 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
||||||
msgid "Close"
|
msgid "Close"
|
||||||
msgstr "关闭"
|
msgstr "关闭"
|
||||||
|
|
@ -1185,7 +1220,11 @@ msgstr "连接 Wiimote 3"
|
||||||
msgid "Connect Wiimote 4"
|
msgid "Connect Wiimote 4"
|
||||||
msgstr "连接 Wiimote 4"
|
msgstr "连接 Wiimote 4"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Connecting..."
|
msgid "Connecting..."
|
||||||
msgstr "连接中..."
|
msgstr "连接中..."
|
||||||
|
|
||||||
|
|
@ -1371,7 +1410,11 @@ msgid "DSP Emulator Engine"
|
||||||
msgstr "音频模拟引擎"
|
msgstr "音频模拟引擎"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "DSP HLE emulation (fast)"
|
msgid "DSP HLE emulation (fast)"
|
||||||
msgstr "音频 HLE 模拟(很快)"
|
msgstr "音频 HLE 模拟(很快)"
|
||||||
|
|
||||||
|
|
@ -1591,7 +1634,11 @@ msgstr "按模拟器显示输入读取"
|
||||||
msgid "Divide"
|
msgid "Divide"
|
||||||
msgstr "Divide"
|
msgstr "Divide"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Do you want to stop the current emulation?"
|
msgid "Do you want to stop the current emulation?"
|
||||||
msgstr "您确定是否停止当前模拟?"
|
msgstr "您确定是否停止当前模拟?"
|
||||||
|
|
||||||
|
|
@ -1621,12 +1668,21 @@ msgstr "Dolphin 模拟 Wiimote 设置"
|
||||||
msgid "Dolphin FIFO"
|
msgid "Dolphin FIFO"
|
||||||
msgstr "Dolphin"
|
msgstr "Dolphin"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
msgid "Dolphin GCPad Configuration"
|
msgid "Dolphin GCPad Configuration"
|
||||||
msgstr "Dolphin GC 手柄设置"
|
msgstr "Dolphin GC 手柄设置"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204
|
||||||
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
msgstr "Dolphin GC 手柄设置"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Dolphin TAS Movies (*.dtm)"
|
msgid "Dolphin TAS Movies (*.dtm)"
|
||||||
msgstr "Dolphin TAS 电影 (*.dtm)"
|
msgstr "Dolphin TAS 电影 (*.dtm)"
|
||||||
|
|
||||||
|
|
@ -1710,9 +1766,15 @@ msgid ""
|
||||||
"If unsure, leave this unchecked."
|
"If unsure, leave this unchecked."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Dutch"
|
msgid "Dutch"
|
||||||
msgstr "荷兰语"
|
msgstr "荷兰语"
|
||||||
|
|
||||||
|
|
@ -1840,16 +1902,23 @@ msgstr "启用 BAT"
|
||||||
msgid "Enable Block Merging"
|
msgid "Enable Block Merging"
|
||||||
msgstr "启用区块合并"
|
msgstr "启用区块合并"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
||||||
msgid "Enable Bounding Box Calculation"
|
msgid "Enable Bounding Box Calculation"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Enable Cache"
|
msgid "Enable Cache"
|
||||||
msgstr "启用缓存"
|
msgstr "启用缓存"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Enable Cheats"
|
msgid "Enable Cheats"
|
||||||
msgstr "启用作弊"
|
msgstr "启用作弊"
|
||||||
|
|
||||||
|
|
@ -1984,9 +2053,15 @@ msgstr ""
|
||||||
msgid "End"
|
msgid "End"
|
||||||
msgstr "End"
|
msgstr "End"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "English"
|
msgid "English"
|
||||||
msgstr "英语"
|
msgstr "英语"
|
||||||
|
|
||||||
|
|
@ -2015,6 +2090,7 @@ msgstr "等于"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
msgid "Error"
|
msgid "Error"
|
||||||
msgstr "错误"
|
msgstr "错误"
|
||||||
|
|
@ -2026,6 +2102,12 @@ msgid ""
|
||||||
"Sorry, Wii recording is temporarily broken."
|
"Sorry, Wii recording is temporarily broken."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169
|
||||||
|
msgid "Error"
|
||||||
|
msgstr "错误"
|
||||||
|
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
||||||
msgid "Error loading selected language. Falling back to system default."
|
msgid "Error loading selected language. Falling back to system default."
|
||||||
msgstr "Error loading selected language. Falling back to system default."
|
msgstr "Error loading selected language. Falling back to system default."
|
||||||
|
|
@ -2480,9 +2562,15 @@ msgstr ""
|
||||||
msgid "Free Look"
|
msgid "Free Look"
|
||||||
msgstr "自由视点"
|
msgstr "自由视点"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "French"
|
msgid "French"
|
||||||
msgstr "法语"
|
msgstr "法语"
|
||||||
|
|
||||||
|
|
@ -2550,7 +2638,11 @@ msgid "Gamecube &Pad Settings"
|
||||||
msgstr "Gamecube 手柄设置(&P)"
|
msgstr "Gamecube 手柄设置(&P)"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
||||||
msgstr "Gamecube 内存卡 (*.raw,*.gcp)"
|
msgstr "Gamecube 内存卡 (*.raw,*.gcp)"
|
||||||
|
|
||||||
|
|
@ -2573,8 +2665,12 @@ msgstr ""
|
||||||
"(either a bad code or the code type is not yet supported.)"
|
"(either a bad code or the code type is not yet supported.)"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
||||||
msgid "General"
|
msgid "General"
|
||||||
msgstr "常规"
|
msgstr "常规"
|
||||||
|
|
@ -2584,9 +2680,15 @@ msgstr "常规"
|
||||||
msgid "General Settings"
|
msgid "General Settings"
|
||||||
msgstr "界面设置"
|
msgstr "界面设置"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "German"
|
msgid "German"
|
||||||
msgstr "德语"
|
msgstr "德语"
|
||||||
|
|
||||||
|
|
@ -2708,8 +2810,12 @@ msgid "Hotkey Configuration"
|
||||||
msgstr "热键设置"
|
msgstr "热键设置"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Hotkeys"
|
msgid "Hotkeys"
|
||||||
msgstr "热键"
|
msgstr "热键"
|
||||||
|
|
||||||
|
|
@ -2919,7 +3025,11 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"InstallExceptionHandler called, but this platform does not yet support it."
|
"InstallExceptionHandler called, but this platform does not yet support it."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Installing WAD..."
|
msgid "Installing WAD..."
|
||||||
msgstr "安装 WAD 到 Wii 菜单中..."
|
msgstr "安装 WAD 到 Wii 菜单中..."
|
||||||
|
|
@ -3004,9 +3114,15 @@ msgstr "无效录制文件"
|
||||||
msgid "Invalid state"
|
msgid "Invalid state"
|
||||||
msgstr "Invalid state"
|
msgstr "Invalid state"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Italian"
|
msgid "Italian"
|
||||||
msgstr "意大利语"
|
msgstr "意大利语"
|
||||||
|
|
||||||
|
|
@ -3165,12 +3281,20 @@ msgstr "载入存档插槽 8"
|
||||||
msgid "Load State..."
|
msgid "Load State..."
|
||||||
msgstr "载入状态..."
|
msgstr "载入状态..."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Load Wii System Menu"
|
msgid "Load Wii System Menu"
|
||||||
msgstr "载入 Wii 系统菜单(%d %c)"
|
msgstr "载入 Wii 系统菜单(%d %c)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, fuzzy, c-format
|
#, fuzzy, c-format
|
||||||
msgid "Load Wii System Menu %d%c"
|
msgid "Load Wii System Menu %d%c"
|
||||||
msgstr "载入 Wii 系统菜单(%d %c)"
|
msgstr "载入 Wii 系统菜单(%d %c)"
|
||||||
|
|
@ -3251,7 +3375,11 @@ msgstr "MMU 速度破解"
|
||||||
msgid "MadCatz Gameshark files(*.gcs)"
|
msgid "MadCatz Gameshark files(*.gcs)"
|
||||||
msgstr "MadCatz Gameshark 文件(*.gcs)"
|
msgstr "MadCatz Gameshark 文件(*.gcs)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
||||||
msgid "Main Stick"
|
msgid "Main Stick"
|
||||||
msgstr "主摇杆"
|
msgstr "主摇杆"
|
||||||
|
|
@ -3283,7 +3411,11 @@ msgid "Memory Byte"
|
||||||
msgstr "内存(&M)"
|
msgstr "内存(&M)"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Memory Card"
|
msgid "Memory Card"
|
||||||
msgstr "内存卡"
|
msgstr "内存卡"
|
||||||
|
|
||||||
|
|
@ -3467,7 +3599,11 @@ msgstr "NP Tab"
|
||||||
msgid "NP Up"
|
msgid "NP Up"
|
||||||
msgstr "NP Up"
|
msgstr "NP Up"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
||||||
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
||||||
msgid "Name:"
|
msgid "Name:"
|
||||||
|
|
@ -3555,7 +3691,11 @@ msgstr "不等于"
|
||||||
msgid "Not Set"
|
msgid "Not Set"
|
||||||
msgstr "未设置"
|
msgstr "未设置"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Not connected"
|
msgid "Not connected"
|
||||||
msgstr "未连接"
|
msgstr "未连接"
|
||||||
|
|
||||||
|
|
@ -3616,7 +3756,10 @@ msgstr "只有 %d 区块有效"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Open"
|
msgid "Open"
|
||||||
msgstr "打开"
|
msgstr "打开"
|
||||||
|
|
||||||
|
|
@ -3747,8 +3890,13 @@ msgstr "补丁"
|
||||||
msgid "Paths"
|
msgid "Paths"
|
||||||
msgstr "路径"
|
msgstr "路径"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
||||||
msgid "Pause"
|
msgid "Pause"
|
||||||
msgstr "暂停"
|
msgstr "暂停"
|
||||||
|
|
@ -3769,8 +3917,13 @@ msgstr "Perspective %d"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Play"
|
msgid "Play"
|
||||||
msgstr "开始"
|
msgstr "开始"
|
||||||
|
|
||||||
|
|
@ -3797,7 +3950,11 @@ msgstr "选项"
|
||||||
msgid "Players"
|
msgid "Players"
|
||||||
msgstr "玩家"
|
msgstr "玩家"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Please confirm..."
|
msgid "Please confirm..."
|
||||||
msgstr "请确认..."
|
msgstr "请确认..."
|
||||||
|
|
||||||
|
|
@ -4012,10 +4169,17 @@ msgstr "刷新列表"
|
||||||
msgid "Refresh game list"
|
msgid "Refresh game list"
|
||||||
msgstr "刷新游戏列表"
|
msgstr "刷新游戏列表"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434
|
||||||
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Remove"
|
msgid "Remove"
|
||||||
msgstr "移除"
|
msgstr "移除"
|
||||||
|
|
||||||
|
|
@ -4034,7 +4198,10 @@ msgid "Render to Main Window"
|
||||||
msgstr "附加到主窗口"
|
msgstr "附加到主窗口"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
||||||
msgid "Reset"
|
msgid "Reset"
|
||||||
msgstr "重置"
|
msgstr "重置"
|
||||||
|
|
@ -4077,7 +4244,11 @@ msgstr "保存状态(&V)"
|
||||||
msgid "Safe"
|
msgid "Safe"
|
||||||
msgstr "安全"
|
msgstr "安全"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Sample Rate:"
|
msgid "Sample Rate:"
|
||||||
msgstr "采样率:"
|
msgstr "采样率:"
|
||||||
|
|
||||||
|
|
@ -4162,7 +4333,11 @@ msgstr "Savestate movie %s is corrupted, movie recording stopping..."
|
||||||
msgid "Scaled EFB Copy"
|
msgid "Scaled EFB Copy"
|
||||||
msgstr "EFB 比例复制"
|
msgstr "EFB 比例复制"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, fuzzy, c-format
|
#, fuzzy, c-format
|
||||||
msgid "Scanning %s"
|
msgid "Scanning %s"
|
||||||
msgstr "扫描中..."
|
msgstr "扫描中..."
|
||||||
|
|
@ -4202,12 +4377,21 @@ msgstr "Section %s not found in SYSCONF"
|
||||||
msgid "Select"
|
msgid "Select"
|
||||||
msgstr "选择"
|
msgstr "选择"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
||||||
msgid "Select The Recording File"
|
msgid "Select The Recording File"
|
||||||
msgstr "选择录制文件"
|
msgstr "选择录制文件"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:740
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142
|
||||||
|
msgid "Select The Recording File"
|
||||||
|
msgstr "选择录制文件"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Select a Wii WAD file to install"
|
msgid "Select a Wii WAD file to install"
|
||||||
msgstr "选择要导入的存档"
|
msgstr "选择要导入的存档"
|
||||||
|
|
@ -4234,6 +4418,7 @@ msgstr "选择浮动窗口"
|
||||||
msgid "Select the file to load"
|
msgid "Select the file to load"
|
||||||
msgstr "选择要载入的文件"
|
msgstr "选择要载入的文件"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
msgstr "选择一个存档文件"
|
msgstr "选择一个存档文件"
|
||||||
|
|
@ -4243,6 +4428,17 @@ msgid "Select the state to load"
|
||||||
msgstr "选择要载入的状态"
|
msgstr "选择要载入的状态"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
||||||
|
msgid "Select the save file"
|
||||||
|
msgstr "选择一个存档文件"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457
|
||||||
|
msgid "Select the state to load"
|
||||||
|
msgstr "选择要载入的状态"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Select the state to save"
|
msgid "Select the state to save"
|
||||||
msgstr "选择要保存的状态"
|
msgstr "选择要保存的状态"
|
||||||
|
|
||||||
|
|
@ -4591,9 +4787,15 @@ msgstr "声音缓冲区创建失败: %s"
|
||||||
msgid "Space"
|
msgid "Space"
|
||||||
msgstr "空格"
|
msgstr "空格"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Spanish"
|
msgid "Spanish"
|
||||||
msgstr "西班牙语"
|
msgstr "西班牙语"
|
||||||
|
|
||||||
|
|
@ -4629,7 +4831,11 @@ msgstr "方块键"
|
||||||
msgid "Standard Controller"
|
msgid "Standard Controller"
|
||||||
msgstr "标准控制器"
|
msgstr "标准控制器"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
||||||
msgid "Start"
|
msgid "Start"
|
||||||
|
|
@ -4664,7 +4870,10 @@ msgstr "摇杆"
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
||||||
msgid "Stop"
|
msgid "Stop"
|
||||||
msgstr "停止"
|
msgstr "停止"
|
||||||
|
|
@ -4737,7 +4946,10 @@ msgstr "Table Right"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Take Screenshot"
|
msgid "Take Screenshot"
|
||||||
msgstr "屏幕截图(&T)"
|
msgstr "屏幕截图(&T)"
|
||||||
|
|
||||||
|
|
@ -4973,12 +5185,19 @@ msgstr "切换所有日志类型"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Toggle Fullscreen"
|
msgid "Toggle Fullscreen"
|
||||||
msgstr "切换全屏"
|
msgstr "切换全屏"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Top"
|
msgid "Top"
|
||||||
msgstr "顶部"
|
msgstr "顶部"
|
||||||
|
|
||||||
|
|
@ -5082,6 +5301,18 @@ msgstr "Unknown message received with id : %d"
|
||||||
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
||||||
msgstr "Unknown message with id:%d received from player:%d Kicking player!"
|
msgstr "Unknown message with id:%d received from player:%d Kicking player!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
||||||
|
#, c-format
|
||||||
|
msgid ""
|
||||||
|
"Unknown pointer %#08x\n"
|
||||||
|
"Continue?"
|
||||||
|
msgstr ""
|
||||||
|
"未知指针 %#08x\n"
|
||||||
|
"继续?"
|
||||||
|
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
||||||
msgid "Up"
|
msgid "Up"
|
||||||
|
|
@ -5292,7 +5523,11 @@ msgstr "DVD 根目录:"
|
||||||
msgid "Wii Save Import"
|
msgid "Wii Save Import"
|
||||||
msgstr "导入 Wii 存档"
|
msgstr "导入 Wii 存档"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wii save files (*.bin)|*.bin"
|
msgid "Wii save files (*.bin)|*.bin"
|
||||||
msgstr "Wii 存档文件 (*.bin)|*.bin"
|
msgstr "Wii 存档文件 (*.bin)|*.bin"
|
||||||
|
|
||||||
|
|
@ -5323,7 +5558,11 @@ msgstr ""
|
||||||
"or maybe it is due to idle time out or other reason.\n"
|
"or maybe it is due to idle time out or other reason.\n"
|
||||||
"Do you want to reconnect immediately?"
|
"Do you want to reconnect immediately?"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wiimote Connected"
|
msgid "Wiimote Connected"
|
||||||
msgstr "Wiimote 已连接"
|
msgstr "Wiimote 已连接"
|
||||||
|
|
||||||
|
|
@ -5356,9 +5595,15 @@ msgstr "窗口右侧"
|
||||||
msgid "Word Wrap"
|
msgid "Word Wrap"
|
||||||
msgstr "自动换行"
|
msgstr "自动换行"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Working..."
|
msgid "Working..."
|
||||||
msgstr "工作中..."
|
msgstr "工作中..."
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,11 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: Dolphin Emu\n"
|
"Project-Id-Version: Dolphin Emu\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
|
=======
|
||||||
|
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
"PO-Revision-Date: 2011-03-15 02:51+0800\n"
|
"PO-Revision-Date: 2011-03-15 02:51+0800\n"
|
||||||
"Last-Translator: khiav <khiav1118@yahoo.com.tw>\n"
|
"Last-Translator: khiav <khiav1118@yahoo.com.tw>\n"
|
||||||
"Language-Team: khiav&yrbn <http://khiav.99k.org/>\n"
|
"Language-Team: khiav&yrbn <http://khiav.99k.org/>\n"
|
||||||
|
|
@ -536,9 +540,15 @@ msgstr "新增修正"
|
||||||
msgid "Add new pane"
|
msgid "Add new pane"
|
||||||
msgstr "新增面版"
|
msgstr "新增面版"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Add..."
|
msgid "Add..."
|
||||||
msgstr "新增..."
|
msgstr "新增..."
|
||||||
|
|
||||||
|
|
@ -605,8 +615,13 @@ msgstr "所有 GC/Wii 映像檔 (gcm, iso, ciso, gcz)"
|
||||||
msgid "All Gamecube GCM files (gcm)"
|
msgid "All Gamecube GCM files (gcm)"
|
||||||
msgstr "所有 Gamecube GCM 檔案 (gcm)"
|
msgstr "所有 Gamecube GCM 檔案 (gcm)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "All Save States (sav, s##)"
|
msgid "All Save States (sav, s##)"
|
||||||
msgstr "所有即時存檔 (sav, s##)"
|
msgstr "所有即時存檔 (sav, s##)"
|
||||||
|
|
||||||
|
|
@ -687,7 +702,11 @@ msgstr ""
|
||||||
msgid "Are you sure you want to delete this file? It will be gone forever!"
|
msgid "Are you sure you want to delete this file? It will be gone forever!"
|
||||||
msgstr "是否真的要刪除這些檔案？刪了之後就回不來了哦！"
|
msgstr "是否真的要刪除這些檔案？刪了之後就回不來了哦！"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
||||||
msgid "Aspect Ratio:"
|
msgid "Aspect Ratio:"
|
||||||
msgstr "畫面比例："
|
msgstr "畫面比例："
|
||||||
|
|
@ -708,7 +727,11 @@ msgstr "聲音裝置："
|
||||||
msgid "AudioCommon: Error opening AO device.\n"
|
msgid "AudioCommon: Error opening AO device.\n"
|
||||||
msgstr "AudioCommon：開啟 AO 裝置出錯。\n"
|
msgstr "AudioCommon：開啟 AO 裝置出錯。\n"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
||||||
msgid "Auto"
|
msgid "Auto"
|
||||||
msgstr "自動"
|
msgstr "自動"
|
||||||
|
|
@ -820,7 +843,11 @@ msgid "Blue Right"
|
||||||
msgstr "藍 右"
|
msgstr "藍 右"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Bottom"
|
msgid "Bottom"
|
||||||
msgstr "下方"
|
msgstr "下方"
|
||||||
|
|
||||||
|
|
@ -853,7 +880,11 @@ msgstr "瀏覽輸出的資料夾"
|
||||||
msgid "Buffer:"
|
msgid "Buffer:"
|
||||||
msgstr "緩衝："
|
msgstr "緩衝："
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
||||||
msgid "Buttons"
|
msgid "Buttons"
|
||||||
|
|
@ -1084,7 +1115,11 @@ msgstr "在遊戲執行時客戶端斷開連接！！網路對戰已經被關閉
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
||||||
msgid "Close"
|
msgid "Close"
|
||||||
msgstr "關閉"
|
msgstr "關閉"
|
||||||
|
|
@ -1194,7 +1229,11 @@ msgstr "連接 Wiimote 3"
|
||||||
msgid "Connect Wiimote 4"
|
msgid "Connect Wiimote 4"
|
||||||
msgstr "連接 Wiimote 4"
|
msgstr "連接 Wiimote 4"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Connecting..."
|
msgid "Connecting..."
|
||||||
msgstr "正在連接..."
|
msgstr "正在連接..."
|
||||||
|
|
||||||
|
|
@ -1379,7 +1418,11 @@ msgid "DSP Emulator Engine"
|
||||||
msgstr "DSP 模擬引擎"
|
msgstr "DSP 模擬引擎"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "DSP HLE emulation (fast)"
|
msgid "DSP HLE emulation (fast)"
|
||||||
msgstr "DSP HLE 模擬器 (快)"
|
msgstr "DSP HLE 模擬器 (快)"
|
||||||
|
|
||||||
|
|
@ -1599,7 +1642,11 @@ msgstr "顯示控制器輸入狀態 (僅作用於錄製或播放影片時)。"
|
||||||
msgid "Divide"
|
msgid "Divide"
|
||||||
msgstr "Divide"
|
msgstr "Divide"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Do you want to stop the current emulation?"
|
msgid "Do you want to stop the current emulation?"
|
||||||
msgstr "您要停止目前的模擬嗎？"
|
msgstr "您要停止目前的模擬嗎？"
|
||||||
|
|
||||||
|
|
@ -1629,12 +1676,21 @@ msgstr "Dolphin 模擬 Wiimote 設定"
|
||||||
msgid "Dolphin FIFO"
|
msgid "Dolphin FIFO"
|
||||||
msgstr "Dolphin"
|
msgstr "Dolphin"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
msgid "Dolphin GCPad Configuration"
|
msgid "Dolphin GCPad Configuration"
|
||||||
msgstr "Dolphin GC 控制器設定"
|
msgstr "Dolphin GC 控制器設定"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204
|
||||||
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
msgstr "Dolphin GC 控制器設定"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Dolphin TAS Movies (*.dtm)"
|
msgid "Dolphin TAS Movies (*.dtm)"
|
||||||
msgstr "Dolphin TAS 影片 (*.dtm)"
|
msgstr "Dolphin TAS 影片 (*.dtm)"
|
||||||
|
|
||||||
|
|
@ -1718,9 +1774,15 @@ msgid ""
|
||||||
"If unsure, leave this unchecked."
|
"If unsure, leave this unchecked."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Dutch"
|
msgid "Dutch"
|
||||||
msgstr "Dutch"
|
msgstr "Dutch"
|
||||||
|
|
||||||
|
|
@ -1846,16 +1908,23 @@ msgstr "開啟 BAT"
|
||||||
msgid "Enable Block Merging"
|
msgid "Enable Block Merging"
|
||||||
msgstr "開啟塊合併"
|
msgstr "開啟塊合併"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
||||||
msgid "Enable Bounding Box Calculation"
|
msgid "Enable Bounding Box Calculation"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Enable Cache"
|
msgid "Enable Cache"
|
||||||
msgstr "開啟快取"
|
msgstr "開啟快取"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Enable Cheats"
|
msgid "Enable Cheats"
|
||||||
msgstr "開啟作弊"
|
msgstr "開啟作弊"
|
||||||
|
|
||||||
|
|
@ -1987,9 +2056,15 @@ msgstr ""
|
||||||
msgid "End"
|
msgid "End"
|
||||||
msgstr "End"
|
msgstr "End"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "English"
|
msgid "English"
|
||||||
msgstr "English"
|
msgstr "English"
|
||||||
|
|
||||||
|
|
@ -2018,6 +2093,7 @@ msgstr "等於"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
msgid "Error"
|
msgid "Error"
|
||||||
msgstr "錯誤"
|
msgstr "錯誤"
|
||||||
|
|
@ -2029,6 +2105,12 @@ msgid ""
|
||||||
"Sorry, Wii recording is temporarily broken."
|
"Sorry, Wii recording is temporarily broken."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169
|
||||||
|
msgid "Error"
|
||||||
|
msgstr "錯誤"
|
||||||
|
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
||||||
msgid "Error loading selected language. Falling back to system default."
|
msgid "Error loading selected language. Falling back to system default."
|
||||||
msgstr "讀取選擇的語系出錯。返回使用系統預設值。"
|
msgstr "讀取選擇的語系出錯。返回使用系統預設值。"
|
||||||
|
|
@ -2481,9 +2563,15 @@ msgstr ""
|
||||||
msgid "Free Look"
|
msgid "Free Look"
|
||||||
msgstr "自由視點"
|
msgstr "自由視點"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "French"
|
msgid "French"
|
||||||
msgstr "French"
|
msgstr "French"
|
||||||
|
|
||||||
|
|
@ -2551,7 +2639,11 @@ msgid "Gamecube &Pad Settings"
|
||||||
msgstr "Gamecube 控制器設定(&P)"
|
msgstr "Gamecube 控制器設定(&P)"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
||||||
msgstr "Gamecube 記憶卡 (*.raw,*.gcp)"
|
msgstr "Gamecube 記憶卡 (*.raw,*.gcp)"
|
||||||
|
|
||||||
|
|
@ -2574,8 +2666,12 @@ msgstr ""
|
||||||
"(一個損毀的代碼或不支援的代碼類型。)"
|
"(一個損毀的代碼或不支援的代碼類型。)"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
||||||
msgid "General"
|
msgid "General"
|
||||||
msgstr "一般"
|
msgstr "一般"
|
||||||
|
|
@ -2585,9 +2681,15 @@ msgstr "一般"
|
||||||
msgid "General Settings"
|
msgid "General Settings"
|
||||||
msgstr "界面設定"
|
msgstr "界面設定"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "German"
|
msgid "German"
|
||||||
msgstr "German"
|
msgstr "German"
|
||||||
|
|
||||||
|
|
@ -2709,8 +2811,12 @@ msgid "Hotkey Configuration"
|
||||||
msgstr "快捷鍵設定"
|
msgstr "快捷鍵設定"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Hotkeys"
|
msgid "Hotkeys"
|
||||||
msgstr "快捷鍵"
|
msgstr "快捷鍵"
|
||||||
|
|
||||||
|
|
@ -2912,7 +3018,11 @@ msgid ""
|
||||||
"InstallExceptionHandler called, but this platform does not yet support it."
|
"InstallExceptionHandler called, but this platform does not yet support it."
|
||||||
msgstr "調用 InstallExceptionHandler，但是這個平台尚未支援此功能。"
|
msgstr "調用 InstallExceptionHandler，但是這個平台尚未支援此功能。"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Installing WAD..."
|
msgid "Installing WAD..."
|
||||||
msgstr "正在安裝 WAD 至 Wii 選單..."
|
msgstr "正在安裝 WAD 至 Wii 選單..."
|
||||||
|
|
||||||
|
|
@ -2996,9 +3106,15 @@ msgstr "無效的錄像檔"
|
||||||
msgid "Invalid state"
|
msgid "Invalid state"
|
||||||
msgstr "無效的狀態"
|
msgstr "無效的狀態"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Italian"
|
msgid "Italian"
|
||||||
msgstr "Italian"
|
msgstr "Italian"
|
||||||
|
|
||||||
|
|
@ -3157,12 +3273,20 @@ msgstr "讀取儲存格 8"
|
||||||
msgid "Load State..."
|
msgid "Load State..."
|
||||||
msgstr "讀取進度檔..."
|
msgstr "讀取進度檔..."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Load Wii System Menu"
|
msgid "Load Wii System Menu"
|
||||||
msgstr "讀取 Wii 系統選單 (%d%c)"
|
msgstr "讀取 Wii 系統選單 (%d%c)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Load Wii System Menu %d%c"
|
msgid "Load Wii System Menu %d%c"
|
||||||
msgstr "讀取 Wii 系統選單 (%d%c)"
|
msgstr "讀取 Wii 系統選單 (%d%c)"
|
||||||
|
|
@ -3243,7 +3367,11 @@ msgstr "MMU 速度修正"
|
||||||
msgid "MadCatz Gameshark files(*.gcs)"
|
msgid "MadCatz Gameshark files(*.gcs)"
|
||||||
msgstr "MadCatz Gameshark 檔案(*.gcs)"
|
msgstr "MadCatz Gameshark 檔案(*.gcs)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
||||||
msgid "Main Stick"
|
msgid "Main Stick"
|
||||||
msgstr "主搖桿"
|
msgstr "主搖桿"
|
||||||
|
|
@ -3275,7 +3403,11 @@ msgid "Memory Byte"
|
||||||
msgstr "記憶卡(&M)"
|
msgstr "記憶卡(&M)"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Memory Card"
|
msgid "Memory Card"
|
||||||
msgstr "記憶卡"
|
msgstr "記憶卡"
|
||||||
|
|
||||||
|
|
@ -3459,7 +3591,11 @@ msgstr "NP Tab"
|
||||||
msgid "NP Up"
|
msgid "NP Up"
|
||||||
msgstr "NP Up"
|
msgstr "NP Up"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
||||||
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
||||||
msgid "Name:"
|
msgid "Name:"
|
||||||
|
|
@ -3547,7 +3683,11 @@ msgstr "不相等"
|
||||||
msgid "Not Set"
|
msgid "Not Set"
|
||||||
msgstr "未設定"
|
msgstr "未設定"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Not connected"
|
msgid "Not connected"
|
||||||
msgstr "未連接"
|
msgstr "未連接"
|
||||||
|
|
||||||
|
|
@ -3608,7 +3748,10 @@ msgstr "僅 %d 個區塊可用"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Open"
|
msgid "Open"
|
||||||
msgstr "開啟"
|
msgstr "開啟"
|
||||||
|
|
||||||
|
|
@ -3737,8 +3880,13 @@ msgstr "修正"
|
||||||
msgid "Paths"
|
msgid "Paths"
|
||||||
msgstr "路徑"
|
msgstr "路徑"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
||||||
msgid "Pause"
|
msgid "Pause"
|
||||||
msgstr "暫停"
|
msgstr "暫停"
|
||||||
|
|
@ -3759,8 +3907,13 @@ msgstr "版式 %d"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Play"
|
msgid "Play"
|
||||||
msgstr "執行"
|
msgstr "執行"
|
||||||
|
|
||||||
|
|
@ -3787,7 +3940,11 @@ msgstr "選項"
|
||||||
msgid "Players"
|
msgid "Players"
|
||||||
msgstr "玩家"
|
msgstr "玩家"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Please confirm..."
|
msgid "Please confirm..."
|
||||||
msgstr "請確認..."
|
msgstr "請確認..."
|
||||||
|
|
||||||
|
|
@ -4001,10 +4158,17 @@ msgstr "更新列表"
|
||||||
msgid "Refresh game list"
|
msgid "Refresh game list"
|
||||||
msgstr "更新遊戲列表"
|
msgstr "更新遊戲列表"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434
|
||||||
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Remove"
|
msgid "Remove"
|
||||||
msgstr "移除"
|
msgstr "移除"
|
||||||
|
|
||||||
|
|
@ -4023,7 +4187,10 @@ msgid "Render to Main Window"
|
||||||
msgstr "渲染至主視窗"
|
msgstr "渲染至主視窗"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
||||||
msgid "Reset"
|
msgid "Reset"
|
||||||
msgstr "重置"
|
msgstr "重置"
|
||||||
|
|
@ -4066,7 +4233,11 @@ msgstr "儲存進度(&V)"
|
||||||
msgid "Safe"
|
msgid "Safe"
|
||||||
msgstr "安全"
|
msgstr "安全"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Sample Rate:"
|
msgid "Sample Rate:"
|
||||||
msgstr "取樣率："
|
msgstr "取樣率："
|
||||||
|
|
||||||
|
|
@ -4151,7 +4322,11 @@ msgstr "儲存的影片 %s 是損毀的，影片錄製停止..."
|
||||||
msgid "Scaled EFB Copy"
|
msgid "Scaled EFB Copy"
|
||||||
msgstr "EFB 縮放複製"
|
msgstr "EFB 縮放複製"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#, fuzzy, c-format
|
#, fuzzy, c-format
|
||||||
msgid "Scanning %s"
|
msgid "Scanning %s"
|
||||||
msgstr "正在掃瞄..."
|
msgstr "正在掃瞄..."
|
||||||
|
|
@ -4191,12 +4366,21 @@ msgstr "項目 %s 在 SYSCONF 中找不到"
|
||||||
msgid "Select"
|
msgid "Select"
|
||||||
msgstr "選擇"
|
msgstr "選擇"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
||||||
msgid "Select The Recording File"
|
msgid "Select The Recording File"
|
||||||
msgstr "選擇已錄製的檔案"
|
msgstr "選擇已錄製的檔案"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:740
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142
|
||||||
|
msgid "Select The Recording File"
|
||||||
|
msgstr "選擇已錄製的檔案"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Select a Wii WAD file to install"
|
msgid "Select a Wii WAD file to install"
|
||||||
msgstr "選擇要安裝的 Wii WAD"
|
msgstr "選擇要安裝的 Wii WAD"
|
||||||
|
|
||||||
|
|
@ -4222,6 +4406,7 @@ msgstr "選擇浮動視窗"
|
||||||
msgid "Select the file to load"
|
msgid "Select the file to load"
|
||||||
msgstr "選擇要讀取的檔案"
|
msgstr "選擇要讀取的檔案"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
msgstr "選擇存檔"
|
msgstr "選擇存檔"
|
||||||
|
|
@ -4231,6 +4416,17 @@ msgid "Select the state to load"
|
||||||
msgstr "選擇要讀取的進度"
|
msgstr "選擇要讀取的進度"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
||||||
|
msgid "Select the save file"
|
||||||
|
msgstr "選擇存檔"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457
|
||||||
|
msgid "Select the state to load"
|
||||||
|
msgstr "選擇要讀取的進度"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Select the state to save"
|
msgid "Select the state to save"
|
||||||
msgstr "選擇要儲存的進度"
|
msgstr "選擇要儲存的進度"
|
||||||
|
|
||||||
|
|
@ -4578,9 +4774,15 @@ msgstr "聲音緩衝建立失敗：%s"
|
||||||
msgid "Space"
|
msgid "Space"
|
||||||
msgstr "Space"
|
msgstr "Space"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Spanish"
|
msgid "Spanish"
|
||||||
msgstr "Spanish"
|
msgstr "Spanish"
|
||||||
|
|
||||||
|
|
@ -4616,7 +4818,11 @@ msgstr "Square Stick"
|
||||||
msgid "Standard Controller"
|
msgid "Standard Controller"
|
||||||
msgstr "標準控制器"
|
msgstr "標準控制器"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
||||||
msgid "Start"
|
msgid "Start"
|
||||||
|
|
@ -4651,7 +4857,10 @@ msgstr "搖桿"
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
||||||
msgid "Stop"
|
msgid "Stop"
|
||||||
msgstr "停止"
|
msgstr "停止"
|
||||||
|
|
@ -4724,7 +4933,10 @@ msgstr "Table 右"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Take Screenshot"
|
msgid "Take Screenshot"
|
||||||
msgstr "截取畫面"
|
msgstr "截取畫面"
|
||||||
|
|
||||||
|
|
@ -4950,12 +5162,19 @@ msgstr "全選/全部取消"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
|
=======
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Toggle Fullscreen"
|
msgid "Toggle Fullscreen"
|
||||||
msgstr "切換全螢幕"
|
msgstr "切換全螢幕"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Top"
|
msgid "Top"
|
||||||
msgstr "上方"
|
msgstr "上方"
|
||||||
|
|
||||||
|
|
@ -5059,6 +5278,18 @@ msgstr "接收到帶有未知 id 的錯誤訊息：%d"
|
||||||
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
||||||
msgstr "知訊息帶有 id:%d 接收於玩家:%d 正在提出玩家！"
|
msgstr "知訊息帶有 id:%d 接收於玩家:%d 正在提出玩家！"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
||||||
|
#, c-format
|
||||||
|
msgid ""
|
||||||
|
"Unknown pointer %#08x\n"
|
||||||
|
"Continue?"
|
||||||
|
msgstr ""
|
||||||
|
"未知的指示器 %#08x\n"
|
||||||
|
"是否繼續？"
|
||||||
|
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
||||||
msgid "Up"
|
msgid "Up"
|
||||||
|
|
@ -5269,7 +5500,11 @@ msgstr "DVD 根："
|
||||||
msgid "Wii Save Import"
|
msgid "Wii Save Import"
|
||||||
msgstr "匯入 Wii 存檔"
|
msgstr "匯入 Wii 存檔"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wii save files (*.bin)|*.bin"
|
msgid "Wii save files (*.bin)|*.bin"
|
||||||
msgstr "Wii 存檔 (*.bin)|*.bin"
|
msgstr "Wii 存檔 (*.bin)|*.bin"
|
||||||
|
|
||||||
|
|
@ -5300,7 +5535,11 @@ msgstr ""
|
||||||
"或閒置的時間太久。\n"
|
"或閒置的時間太久。\n"
|
||||||
"是否要重新連接？"
|
"是否要重新連接？"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Wiimote Connected"
|
msgid "Wiimote Connected"
|
||||||
msgstr "Wiimote 已連接"
|
msgstr "Wiimote 已連接"
|
||||||
|
|
||||||
|
|
@ -5333,9 +5572,15 @@ msgstr "視窗 右"
|
||||||
msgid "Word Wrap"
|
msgid "Word Wrap"
|
||||||
msgstr "自動換行"
|
msgstr "自動換行"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
||||||
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
msgid "Working..."
|
msgid "Working..."
|
||||||
msgstr "執行中..."
|
msgstr "執行中..."
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue