From 2f9e35e5ae51d2afb8ea1fa4310e7a4875eff4de Mon Sep 17 00:00:00 2001 From: "gregory.hainaut" Date: Fri, 11 May 2012 20:52:50 +0000 Subject: [PATCH] i18n: tr_TR pcsx2_Iconized is wrongly translated. I fuzzy all strings to have an english string instead of lookup key various: apply some patch of Micove to disable debug logging in GSdx release mode git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5206 96395faa-99c1-11dd-bbfe-3dabce05a288 --- cmake/BuildParameters.cmake | 4 +- debian-unstable-upstream/README.Debian | 79 ++++++++++++++++++++++---- locales/tr_TR/pcsx2_Iconized.po | 74 +++++++++++++++++++++++- plugins/GSdx/CMakeLists.txt | 2 +- plugins/GSdx/GSDeviceOGL.cpp | 4 ++ plugins/GSdx/linux_replay.cpp | 2 +- 6 files changed, 148 insertions(+), 17 deletions(-) diff --git a/cmake/BuildParameters.cmake b/cmake/BuildParameters.cmake index 3489a5dba7..1d48c0393d 100644 --- a/cmake/BuildParameters.cmake +++ b/cmake/BuildParameters.cmake @@ -20,7 +20,7 @@ ### Packaging options # Installation path : -DPACKAGE_MODE=TRUE(follow FHS)|FALSE(local bin/) # Plugin installation path : -DPLUGIN_DIR="/usr/lib/pcsx2" -# GL Shader installation path : -DGLSL_SHADER_DIR="/usr/share/games/pcsx2/" +# GL Shader installation path : -DGLSL_SHADER_DIR="/usr/share/games/pcsx2" # Game DB installation path : -DGAMEINDEX_DIR="/var/games/pcsx2" # Follow XDG standard : -DXDG_STD=TRUE|FALSE #------------------------------------------------------------------------------- @@ -188,7 +188,7 @@ if(PACKAGE_MODE) set(GLSL_SHADER_DIR "/usr/share/games/pcsx2") endif(NOT DEFINED GLSL_SHADER_DIR) - # Compile all source codes with these 4 defines + # Compile all source codes with these 3 defines add_definitions(-DPLUGIN_DIR_COMPILATION=${PLUGIN_DIR} -DGAMEINDEX_DIR_COMPILATION=${GAMEINDEX_DIR}) add_definitions(-DGLSL_SHADER_DIR_COMPILATION=${GLSL_SHADER_DIR}) endif(PACKAGE_MODE) diff --git a/debian-unstable-upstream/README.Debian b/debian-unstable-upstream/README.Debian index fa970c355c..41f70a58f9 100644 --- a/debian-unstable-upstream/README.Debian +++ b/debian-unstable-upstream/README.Debian @@ -1,15 +1,72 @@ - pcsx2 for debian -========================= +------------------------------ +Package information for PCSX2 +------------------------------ -* This version has some major modifications against the default upstream code. - -> documents are stored in $XDG_CONFIG_HOME instead of $HOME/pcsx2 + * The reasons given by upstream as to why they remove -fPIC are the following: + - Code only supports the i386 architecture. + - Code uses the ebx register and this is not compliant with -fPIC. + - The use of -fPIC negatively impacts the performance of the program. + - The .so file are not shared libraries but plug-ins. No program should try + to link with them. -* Documentation needs some love. Feel free to help. +------------------------------------------ +Information about the plug-ins for video +------------------------------------------ -* -fPIC option was removed for multiple reasons. - - Code only supports the x86 architecture. - - Upstream code uses the ebx register so it's not compliant with PIC. - - Impacts the performance too much. - - Only plugins. No package will link to them. + * The zzogl plug-in comes in two flavors: + - The Nvidia Cg version which requires the non-free nvidia-cg-toolkit + package. Since this package contains GPL-2+ code this plug-in can't be + distributed without an GPL exception allowing linking with non-free + libraries. If the user desires to try this flavor of the plug-in he/she + must: + + Install the nvidia-cg-dev or nvidia-cg-toolkit package from non-free. + + Pass "-DGLSL_API=FALSE" to dh_auto_configure in the rules file. + + Add "usr/lib/*/games/pcsx2/*.dat /usr/share/games/pcsx2/" to the install + file. + + Compile the program using dpkg-buildpackage. + This plug-in currently provides the greatest compatibility with video cards + and drivers. It currently works with open source drivers like radeon R600. + - The OpenGL Shading Language (GLSL) version which currently only works with + AMD video cards but support for other cards is being worked on. + + * The GSdx plug-in currently only supports the OpenGL software renderer. + + * The GSdx and zzogl GLSL plug-ins currently require a video card that supports + at least OpenGL 3.0. A noninclusive list of cards that support OpenGL 3.0 is: + - Radeon HD series (except HD2300) + - GeForce 8, 9, 100-series, 200-series, 300-series, 400-series and 500-series + - Intel Sandy Bridge HD Graphics 2000 and 3000 + + * Currently only the proprietary drivers for AMD and Nvidia have support for + OpenGL 3.0 and above. The GSdx and/or zzogl GLSL plug-ins use the following + extensions/commands that may or may not be completely implemented in the open + source video stack: + - OpenGL 3.0 + + glClearBuffer + + glGetStringi + + glVertexAttribI + + GLX_ARB_create_context + + GL_APPLE_vertex_array_object + + GL_ARB_framebuffer_object + - OpenGL 3.1 + + GL_ARB_texture_rectangle (zzogl) + + GL_ARB_uniform_buffer_object + - OpenGL 3.2 + + GL_ARB_geometry_shader4 (GSdx) + + GL_ARB_draw_elements_base_vertex + + GLX_ARB_create_context_profile + - OpenGL 3.3 + + GL_ARB_blend_func_extended (GSdx) + + GL_ARB_explicit_attrib_location + + GL_ARB_sampler_objects (GSdx) + - OpenGL 4.1 + + GL_ARB_separate_shader_objects + - OpenGL 4.2 + + GL_ARB_map_buffer_alignment + + GL_ARB_shading_language_420pack + + GL_ARB_texture_storage + - Extensions that may get included in future versions: + + GL_NV_copy_image + The current status for the open source drivers can be found at: + - http://cgit.freedesktop.org/mesa/mesa/tree/docs/GL3.txt - -- Gregory Hainaut Sat, 24 Apr 2010 23:11:10 +0200 diff --git a/locales/tr_TR/pcsx2_Iconized.po b/locales/tr_TR/pcsx2_Iconized.po index 9ced83dab7..57963ce518 100644 --- a/locales/tr_TR/pcsx2_Iconized.po +++ b/locales/tr_TR/pcsx2_Iconized.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: PCSX2 0.9.9\n" "Report-Msgid-Bugs-To: http://code.google.com/p/pcsx2/\n" "POT-Creation-Date: 2012-04-07 11:42+0200\n" -"PO-Revision-Date: 2011-04-08 19:53+0200\n" -"Last-Translator: PyramidHead \n" +"PO-Revision-Date: 2012-05-08 19:05+0100\n" +"Last-Translator: Gregory Hainaut \n" "Language-Team: Ceyhun Özgöç (PyramidHead) \n" "Language: \n" "MIME-Version: 1.0\n" @@ -24,126 +24,157 @@ msgstr "" "X-Poedit-SearchPath-1: common\n" #: common/src/Utilities/Exceptions.cpp:254 +#, fuzzy msgid "!Notice:VirtualMemoryMap" msgstr "!Notice:VirtualMemoryMap" #: pcsx2/CDVD/CDVD.cpp:389 +#, fuzzy msgid "!Notice:PsxDisc" msgstr "!Notice:PsxDisc" #: pcsx2/System.cpp:114 +#, fuzzy msgid "!Notice:Recompiler:VirtualMemoryAlloc" msgstr "!Notice:Recompiler:VirtualMemoryAlloc" #: pcsx2/System.cpp:348 +#, fuzzy msgid "!Notice:EmuCore::MemoryForVM" msgstr "!Notice:EmuCore::MemoryForVM" #: pcsx2/gui/AppInit.cpp:43 +#, fuzzy msgid "!Notice:Startup:NoSSE2" msgstr "!Notice:Startup:NoSSE2" #: pcsx2/gui/AppInit.cpp:162 +#, fuzzy msgid "!Notice:RecompilerInit:Header" msgstr "!Notice:RecompilerInit:Header" #: pcsx2/gui/AppInit.cpp:211 +#, fuzzy msgid "!Notice:RecompilerInit:Footer" msgstr "!Notice:RecompilerInit:Footer" #: pcsx2/gui/AppMain.cpp:546 +#, fuzzy msgid "!Notice:BiosDumpRequired" msgstr "!Notice:BiosDumpRequired" #: pcsx2/gui/AppMain.cpp:629 +#, fuzzy msgid "!Notice Error:Thread Deadlock Actions" msgstr "!Notice Error:Thread Deadlock Actions" #: pcsx2/gui/AppUserMode.cpp:57 +#, fuzzy msgid "!Notice:PortableModeRights" msgstr "!Notice:PortableModeRights" #: pcsx2/gui/Dialogs/CreateMemoryCardDialog.cpp:181 +#, fuzzy msgid "!ContextTip:ChangingNTFS" msgstr "!ContextTip:ChangingNTFS" #: pcsx2/gui/Dialogs/FirstTimeWizard.cpp:49 +#, fuzzy msgid "!ContextTip:Folders:Settings" msgstr "!ContextTip:Folders:Settings" #: pcsx2/gui/Dialogs/FirstTimeWizard.cpp:54 +#, fuzzy msgid "!Panel:Folders:Settings" msgstr "!Panel:Folders:Settings" #: pcsx2/gui/Dialogs/FirstTimeWizard.cpp:94 +#, fuzzy msgid "!Wizard:Welcome" msgstr "!Wizard:Welcome" #: pcsx2/gui/Dialogs/FirstTimeWizard.cpp:140 +#, fuzzy msgid "!Wizard:Bios:Tutorial" msgstr "!Wizard:Bios:Tutorial" #: pcsx2/gui/Dialogs/ImportSettingsDialog.cpp:31 +#, fuzzy msgid "!Notice:ImportExistingSettings" msgstr "!Notice:ImportExistingSettings" #: pcsx2/gui/Dialogs/McdConfigDialog.cpp:30 +#, fuzzy msgid "!Panel:Mcd:NtfsCompress" msgstr "!Panel:Mcd:NtfsCompress" #: pcsx2/gui/Dialogs/McdConfigDialog.cpp:41 +#, fuzzy msgid "!Panel:Mcd:EnableEjection" msgstr "!Panel:Mcd:EnableEjection" #: pcsx2/gui/Dialogs/StuckThreadDialog.cpp:33 +#, fuzzy msgid "!Panel:StuckThread:Heading" msgstr "!Panel:StuckThread:Heading" #: pcsx2/gui/Dialogs/SysConfigDialog.cpp:38 +#, fuzzy msgid "!Panel:HasHacksOverrides" msgstr "!Panel:HasHacksOverrides" #: pcsx2/gui/Dialogs/SysConfigDialog.cpp:58 +#, fuzzy msgid "!Panel:HasPluginsOverrides" msgstr "!Panel:HasPluginsOverrides" #: pcsx2/gui/Dialogs/SysConfigDialog.cpp:135 +#, fuzzy msgid "!Notice:Tooltip:Presets:Slider" msgstr "!Notice:Tooltip:Presets:Slider" #: pcsx2/gui/Dialogs/SysConfigDialog.cpp:149 +#, fuzzy msgid "!Notice:Tooltip:Presets:Checkbox" msgstr "!Notice:Tooltip:Presets:Checkbox" #: pcsx2/gui/IsoDropTarget.cpp:28 +#, fuzzy msgid "!Notice:ConfirmSysReset" msgstr "!Notice:ConfirmSysReset" #: pcsx2/gui/MainMenuClicks.cpp:106 +#, fuzzy msgid "!Notice:DeleteSettings" msgstr "!Notice:DeleteSettings" #: pcsx2/gui/MemoryCardFile.cpp:78 +#, fuzzy msgid "!Notice:Mcd:HasBeenDisabled" msgstr "!Notice:Mcd:HasBeenDisabled" #: pcsx2/gui/Panels/BiosSelectorPanel.cpp:138 +#, fuzzy msgid "!Notice:BIOS:InvalidSelection" msgstr "!Notice:BIOS:InvalidSelection" #: pcsx2/gui/Panels/CpuPanel.cpp:111 +#, fuzzy msgid "!Panel:EE/IOP:Heading" msgstr "!Panel:EE/IOP:Heading" #: pcsx2/gui/Panels/CpuPanel.cpp:178 +#, fuzzy msgid "!Panel:VUs:Heading" msgstr "!Panel:VUs:Heading" #: pcsx2/gui/Panels/DirPickerPanel.cpp:69 +#, fuzzy msgid "!Notice:DirPicker:CreatePath" msgstr "!Notice:DirPicker:CreatePath" #: pcsx2/gui/Panels/DirPickerPanel.cpp:158 +#, fuzzy msgid "!ContextTip:DirPicker:UseDefault" msgstr "!ContextTip:DirPicker:UseDefault" @@ -153,34 +184,42 @@ msgid "!ContextTip:Window:Zoom" msgstr "!ContextTip:Window:Vsync" #: pcsx2/gui/Panels/GSWindowPanel.cpp:63 +#, fuzzy msgid "!ContextTip:Window:Vsync" msgstr "!ContextTip:Window:Vsync" #: pcsx2/gui/Panels/GSWindowPanel.cpp:68 +#, fuzzy msgid "!ContextTip:Window:ManagedVsync" msgstr "!ContextTip:Window:ManagedVsync" #: pcsx2/gui/Panels/GSWindowPanel.cpp:76 +#, fuzzy msgid "!ContextTip:Window:HideMouse" msgstr "!ContextTip:Window:HideMouse" #: pcsx2/gui/Panels/GSWindowPanel.cpp:82 +#, fuzzy msgid "!ContextTip:Window:Fullscreen" msgstr "!ContextTip:Window:Fullscreen" #: pcsx2/gui/Panels/GSWindowPanel.cpp:93 +#, fuzzy msgid "!ContextTip:Window:HideGS" msgstr "!ContextTip:Window:HideGS" #: pcsx2/gui/Panels/GameFixesPanel.cpp:67 +#, fuzzy msgid "!ContextTip:Gamefixes:EE Timing Hack" msgstr "!ContextTip:Gamefixes:EE Timing Hack" #: pcsx2/gui/Panels/GameFixesPanel.cpp:80 +#, fuzzy msgid "!ContextTip:Gamefixes:OPH Flag hack" msgstr "!ContextTip:Gamefixes:OPH Flag hack" #: pcsx2/gui/Panels/GameFixesPanel.cpp:89 +#, fuzzy msgid "!ContextTip:Gamefixes:DMA Busy hack" msgstr "!ContextTip:Gamefixes:DMA Busy hack" @@ -190,90 +229,112 @@ msgid "!ContextTip:Gamefixes:VIF1 FIFO hack" msgstr "!ContextTip:Gamefixes:OPH Flag hack" #: pcsx2/gui/Panels/GameFixesPanel.cpp:119 +#, fuzzy msgid "!Panel:Gamefixes:Compat Warning" msgstr "!Panel:Gamefixes:Compat Warning" #: pcsx2/gui/Panels/MemoryCardListPanel.cpp:720 +#, fuzzy msgid "!Notice:Mcd:Delete" msgstr "!Notice:Mcd:Delete" #: pcsx2/gui/Panels/MemoryCardListPanel.cpp:758 +#, fuzzy msgid "!Notice:Mcd:CantDuplicate" msgstr "!Notice:Mcd:CantDuplicate" #: pcsx2/gui/Panels/MemoryCardListPanel.cpp:801 +#, fuzzy msgid "!Notice:Mcd:Copy Failed" msgstr "!Notice:Mcd:Copy Failed" #: pcsx2/gui/Panels/MiscPanelStuff.cpp:35 +#, fuzzy msgid "!Panel:Usermode:Explained" msgstr "!Panel:Usermode:Explained" #: pcsx2/gui/Panels/MiscPanelStuff.cpp:41 +#, fuzzy msgid "!Panel:Usermode:Warning" msgstr "!Panel:Usermode:Warning" #: pcsx2/gui/Panels/PathsPanel.cpp:40 +#, fuzzy msgid "!ContextTip:Folders:Savestates" msgstr "!ContextTip:Folders:Savestates" #: pcsx2/gui/Panels/PathsPanel.cpp:50 +#, fuzzy msgid "!ContextTip:Folders:Snapshots" msgstr "!ContextTip:Folders:Snapshots" #: pcsx2/gui/Panels/PathsPanel.cpp:60 +#, fuzzy msgid "!ContextTip:Folders:Logs" msgstr "!ContextTip:Folders:Logs" #: pcsx2/gui/Panels/PluginSelectorPanel.cpp:242 +#, fuzzy msgid "!Notice:PluginSelector:ConfirmShutdown" msgstr "!Notice:PluginSelector:ConfirmShutdown" #: pcsx2/gui/Panels/PluginSelectorPanel.cpp:457 +#, fuzzy msgid "!Notice:PluginSelector:ApplyFailed" msgstr "!Notice:PluginSelector:ApplyFailed" #: pcsx2/gui/Panels/SpeedhacksPanel.cpp:27 +#, fuzzy msgid "!Panel:Speedhacks:EECycleX1" msgstr "!Panel:Speedhacks:EECycleX1" #: pcsx2/gui/Panels/SpeedhacksPanel.cpp:32 +#, fuzzy msgid "!Panel:Speedhacks:EECycleX2" msgstr "!Panel:Speedhacks:EECycleX2" #: pcsx2/gui/Panels/SpeedhacksPanel.cpp:37 +#, fuzzy msgid "!Panel:Speedhacks:EECycleX3" msgstr "!Panel:Speedhacks:EECycleX3" #: pcsx2/gui/Panels/SpeedhacksPanel.cpp:54 +#, fuzzy msgid "!Panel:Speedhacks:VUCycleStealOff" msgstr "!Panel:Speedhacks:VUCycleStealOff" #: pcsx2/gui/Panels/SpeedhacksPanel.cpp:59 +#, fuzzy msgid "!Panel:Speedhacks:VUCycleSteal1" msgstr "!Panel:Speedhacks:VUCycleSteal1" #: pcsx2/gui/Panels/SpeedhacksPanel.cpp:64 +#, fuzzy msgid "!Panel:Speedhacks:VUCycleSteal2" msgstr "!Panel:Speedhacks:VUCycleSteal2" #: pcsx2/gui/Panels/SpeedhacksPanel.cpp:70 +#, fuzzy msgid "!Panel:Speedhacks:VUCycleSteal3" msgstr "!Panel:Speedhacks:VUCycleSteal3" #: pcsx2/gui/Panels/SpeedhacksPanel.cpp:97 +#, fuzzy msgid "!Panel:Speedhacks:Overview" msgstr "!Panel:Speedhacks:Overview" #: pcsx2/gui/Panels/SpeedhacksPanel.cpp:129 +#, fuzzy msgid "!ContextTip:Speedhacks:EECycleRate Slider" msgstr "!ContextTip:Speedhacks:EECycleRate Slider" #: pcsx2/gui/Panels/SpeedhacksPanel.cpp:150 +#, fuzzy msgid "!ContextTip:Speedhacks:VUCycleStealing Slider" msgstr "!ContextTip:Speedhacks:VUCycleStealing Slider" #: pcsx2/gui/Panels/SpeedhacksPanel.cpp:169 +#, fuzzy msgid "!ContextTip:Speedhacks:vuFlagHack" msgstr "!ContextTip:Speedhacks:vuFlagHack" @@ -283,38 +344,47 @@ msgid "!ContextTip:Speedhacks:vuThread" msgstr "!ContextTip:Speedhacks:vuMinMax" #: pcsx2/gui/Panels/SpeedhacksPanel.cpp:195 +#, fuzzy msgid "!ContextTip:Speedhacks:INTC" msgstr "!ContextTip:Speedhacks:INTC" #: pcsx2/gui/Panels/SpeedhacksPanel.cpp:200 +#, fuzzy msgid "!ContextTip:Speedhacks:BIFC0" msgstr "!ContextTip:Speedhacks:BIFC0" #: pcsx2/gui/Panels/SpeedhacksPanel.cpp:207 +#, fuzzy msgid "!ContextTip:Speedhacks:fastCDVD" msgstr "!ContextTip:Speedhacks:fastCDVD" #: pcsx2/gui/Panels/VideoPanel.cpp:37 +#, fuzzy msgid "!ContextTip:Framelimiter:Disable" msgstr "!ContextTip:Framelimiter:Disable" #: pcsx2/gui/Panels/VideoPanel.cpp:227 +#, fuzzy msgid "!Panel:Frameskip:Heading" msgstr "!Panel:Frameskip:Heading" #: pcsx2/gui/Panels/VideoPanel.cpp:306 +#, fuzzy msgid "!ContextTip:GS:SyncMTGS" msgstr "!ContextTip:GS:SyncMTGS" #: pcsx2/gui/Panels/VideoPanel.cpp:310 +#, fuzzy msgid "!ContextTip:GS:DisableOutput" msgstr "!ContextTip:GS:DisableOutput" #: pcsx2/vtlb.cpp:710 +#, fuzzy msgid "!Notice:HostVmReserve" msgstr "!Notice:HostVmReserve" #: pcsx2/x86/sVU_zerorec.cpp:363 +#, fuzzy msgid "!Notice:superVU:VirtualMemoryAlloc" msgstr "!Notice:superVU:VirtualMemoryAlloc" diff --git a/plugins/GSdx/CMakeLists.txt b/plugins/GSdx/CMakeLists.txt index 279c186ee4..b6fa45ae4e 100644 --- a/plugins/GSdx/CMakeLists.txt +++ b/plugins/GSdx/CMakeLists.txt @@ -18,7 +18,7 @@ set(CommonFlags -Wunused-variable -std=c++0x -fno-strict-aliasing - -DOGL_DEBUG # FIXME remove me when code is ready + #-DOGL_DEBUG # FIXME remove me when code is ready # Unload of Geometry shader was fixed in Cat 12.3 (ie OpenGL version string: 4.2.11554) #-DAMD_DRIVER_WORKAROUND ) diff --git a/plugins/GSdx/GSDeviceOGL.cpp b/plugins/GSdx/GSDeviceOGL.cpp index 1edc371395..b0eb286275 100644 --- a/plugins/GSdx/GSDeviceOGL.cpp +++ b/plugins/GSdx/GSDeviceOGL.cpp @@ -52,8 +52,10 @@ GSDeviceOGL::GSDeviceOGL() memset(&m_state, 0, sizeof(m_state)); // Reset the debug file + #ifdef OGL_DEBUG FILE* f = fopen("Debug.txt","w"); fclose(f); + #endif } GSDeviceOGL::~GSDeviceOGL() @@ -497,7 +499,9 @@ bool GSDeviceOGL::Reset(int w, int h) void GSDeviceOGL::Flip() { // FIXME: disable it when code is working + #ifdef OGL_DEBUG CheckDebugLog(); + #endif m_wnd->Flip(); diff --git a/plugins/GSdx/linux_replay.cpp b/plugins/GSdx/linux_replay.cpp index f2d25ab8c9..fad26cd6e4 100644 --- a/plugins/GSdx/linux_replay.cpp +++ b/plugins/GSdx/linux_replay.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 20011-2012 Hainaut gregory + * Copyright (C) 2011-2012 Hainaut gregory * * This Program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by