[playonlinux] 224/230: New upstream version 4.2.10
Bertrand Marc
bmarc at moszumanska.debian.org
Sun Jul 9 17:42:26 UTC 2017
This is an automated email from the git hooks/post-receive script.
bmarc pushed a commit to branch master
in repository playonlinux.
commit bb013b08c8bdbb1084d8963d7017afd8546bc40c
Author: Bertrand Marc <bmarc at debian.org>
Date: Sun Jul 9 19:28:32 2017 +0200
New upstream version 4.2.10
---
CHANGELOG.md | 13 +
README.md | 2 +-
doc/copyright | 4 +
doc/playonlinux-daemon.1 | 28 ++
doc/playonlinux-pkg.1 | 33 +++
doc/playonlinux.1 | 33 +++
lang/po/pol.pot | 458 +++++++++++++++++++++------------
lib/deprecated.lib | 177 ++-----------
lib/playonlinux.lib | 2 +-
lib/scripts.lib | 5 +-
lib/wine.lib | 39 ++-
python/configure.py | 25 +-
python/lib/Variables.py | 2 +-
resources/images/configure/control.png | Bin 0 -> 2591 bytes
resources/images/menu/extensions.png | Bin 2207 -> 1880 bytes
15 files changed, 468 insertions(+), 353 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ac118b..2ae9290 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,16 @@
+# 4.2.10
+
+* Silence POL_Notice_IsAck when ack_notices file doesn't exist
+* Allow Set_SoundDriver '' to disable sound
+* Add in the wineprefix configuration tab for Wine: Control panel
+* Remove in the wineprefix configuration tab for Wine: Wine Uninstaller
+* Add support for Wine-staging DLL redirects (POL_Wine_RedirectDLL,
+ POL_Wine_DelRedirectDLL, POL_Wine_RedirectDLL_App,
+ POL_Wine_DelRedirectDLL_App) (#5163)
+* Fix POL_System_cpmv log message
+* Reimplement deprecated functions POL_SetupWindow_make_shortcut and
+ POL_SetupWindow_auto_shortcut using POL_Shortcut for consistency
+
# 4.2.9
* Fixed a bug in the user agent used in urllib that would make it look like an attack to paranoid eyes (and filters) (#5072)
diff --git a/README.md b/README.md
index 5c1d65d..9b6ca31 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@ POL-POM-4
=========
PlayOnLinux 4 repository
-
+Note: PlayOnLinux 5 is currently under development. Please clone POL-POM-5 repository if you want to contribute
What is PlayOnLinux?
=====================
diff --git a/doc/copyright b/doc/copyright
new file mode 100644
index 0000000..f60d569
--- /dev/null
+++ b/doc/copyright
@@ -0,0 +1,4 @@
+Copyright 2011 Quentin Pâris <qparis at playonlinux.com>
+Copyright 2011 PlayOnLinux Team <contact at playonlinux.com>
+
+Read /usr/share/common-licenses/GPL-3
diff --git a/doc/playonlinux-daemon.1 b/doc/playonlinux-daemon.1
new file mode 100644
index 0000000..f8e8a4e
--- /dev/null
+++ b/doc/playonlinux-daemon.1
@@ -0,0 +1,28 @@
+.TH PLAYONLINUX-DAEMON 1 "February 6, 2009"
+
+.SH NAME
+playonlinux-daemon \- daemon to handle disk insertion in PlayOnLinux
+
+.SH SYNOPSIS
+.B playonlinux-daemon
+.RI [ options ]
+
+.SH DESCRIPTION
+.B playonlinux-daemon
+is a daemon to handle disk insertion within PlayOnLinux. It still needs testing and may not work flawlessly.
+.br
+Users who want to handle autoruns with PlayOnLinux should launch this script at startup.
+
+.SH OPTIONS
+.TP
+.I "--version"
+ Show version number and exit.
+.TP
+.I "--kill"
+ Kill the daemon.
+
+.SH AUTHOR
+playonlinux was written by Quentin Pâris <qparis at playonlinux.com>.
+.PP
+This manual page was written by Bertrand Marc <beberking at gmail.com>,
+for the Debian project (but may be used by others).
diff --git a/doc/playonlinux-pkg.1 b/doc/playonlinux-pkg.1
new file mode 100644
index 0000000..b96a8dc
--- /dev/null
+++ b/doc/playonlinux-pkg.1
@@ -0,0 +1,33 @@
+.TH PLAYONLINUX-PKG 1 "February 6, 2009"
+
+.SH NAME
+playonlinux-pkg \- tool to manage playonlinux packages
+
+.SH SYNOPSIS
+.B playonlinux-pkg
+.RI [ options ]
+.RI [ package ]
+
+.SH DESCRIPTION
+.B playonlinux-pkg
+is a tool to install or manage the playonlinux packages
+
+.SH OPTIONS
+.TP
+.I "-b, --browse"
+ Choose a file.
+.TP
+.I "-e, --extract"
+ Extract the package.
+.TP
+.I "-i, --install"
+ Install the package.
+.TP
+.I "-h, --help"
+ Show usage.
+
+.SH AUTHOR
+playonlinux was written by Quentin Pâris <qparis at playonlinux.com>.
+.PP
+This manual page was written by Bertrand Marc <beberking at gmail.com>,
+for the Debian project (but may be used by others).
diff --git a/doc/playonlinux.1 b/doc/playonlinux.1
new file mode 100644
index 0000000..3f2aabe
--- /dev/null
+++ b/doc/playonlinux.1
@@ -0,0 +1,33 @@
+.TH PLAYONLINUX 1 "February 6, 2009"
+
+.SH NAME
+PlayOnLinux \- front-end for Wine
+
+.SH SYNOPSIS
+.B playonlinux
+.RI [ options ]
+
+.SH DESCRIPTION
+.B PlayOnLinux
+is a front-end for Wine. It allows you to easily install and use numerous games and softwares designed to run with Microsoft®'s Windows®.
+.br
+Few games are compatible with GNU/Linux at the moment and it certainly is a factor preventing the migration to this system.
+.P
+.B PlayOnLinux
+performs installations in
+.I ~/.PlayOnLinux
+and uses separate Wine prefixes to avoid conflicts between applications.
+
+.SH OPTIONS
+.TP
+.I --version
+ Show version number and exit.
+.TP
+.I "--run <prog>"
+ Run directly the specified program.
+
+.SH AUTHOR
+playonlinux was written by Quentin Pâris <qparis at playonlinux.com>.
+.PP
+This manual page was written by Bertrand Marc <beberking at gmail.com>,
+for the Debian project (but may be used by others).
diff --git a/lang/po/pol.pot b/lang/po/pol.pot
index c53a61b..0080caf 100644
--- a/lang/po/pol.pot
+++ b/lang/po/pol.pot
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PlayOnLinux\n"
"Report-Msgid-Bugs-To: MulX/APLU <pol-gettext at mulx.net>\n"
-"POT-Creation-Date: 2015-09-07 00:43:49+02:00\n"
+"POT-Creation-Date: 2016-01-03 19:00:52+01:00\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -246,13 +246,15 @@ msgstr ""
#: PlayOnLinux_Scripts/Brink_:66 PlayOnLinux_Scripts/Brink_:79
#: PlayOnLinux_Scripts/Dark_Messiah_Of_Might_And_Magic_:65
#: PlayOnLinux_Scripts/Deadpool_The_Game_:47 PlayOnLinux_Scripts/Diablo_II_:57
+#: PlayOnLinux_Scripts/Diablo_II___Lord_Of_Destruction_:47
#: PlayOnLinux_Scripts/Dragon_Age_2___DLC_:40
#: PlayOnLinux_Scripts/Dreamweaver_8_:22 PlayOnLinux_Scripts/EVE_online_:87
-#: PlayOnLinux_Scripts/ElsterFormular_:43 PlayOnLinux_Scripts/FEZ__Steam__:49
-#: PlayOnLinux_Scripts/FL_Studio_10_:33 PlayOnLinux_Scripts/Far_Cry_2_:80
-#: PlayOnLinux_Scripts/Flash_8_:22 PlayOnLinux_Scripts/Flash_MX_:22
-#: PlayOnLinux_Scripts/Google_SketchUp_:95
-#: PlayOnLinux_Scripts/Guild_Wars_2_:70 PlayOnLinux_Scripts/Half_Life_2_:108
+#: PlayOnLinux_Scripts/ElsterFormular_:43
+#: PlayOnLinux_Scripts/Entropia_Universe_:31
+#: PlayOnLinux_Scripts/FEZ__Steam__:49 PlayOnLinux_Scripts/FL_Studio_10_:33
+#: PlayOnLinux_Scripts/Far_Cry_2_:80 PlayOnLinux_Scripts/Flash_8_:22
+#: PlayOnLinux_Scripts/Flash_MX_:22 PlayOnLinux_Scripts/Google_SketchUp_:95
+#: PlayOnLinux_Scripts/Guild_Wars_2_:79 PlayOnLinux_Scripts/Half_Life_2_:108
#: PlayOnLinux_Scripts/Half_Life_2___Episode_One_:88
#: PlayOnLinux_Scripts/Half_Life_2___Episode_Two_:88
#: PlayOnLinux_Scripts/Half_Life_2___Lost_Coast_:102
@@ -264,11 +266,14 @@ msgstr ""
#: PlayOnLinux_Scripts/Mass_Effect_:75 PlayOnLinux_Scripts/Memories_On_TV_:68
#: PlayOnLinux_Scripts/Microsoft_Excel_Viewer_2003_:34
#: PlayOnLinux_Scripts/Microsoft_Money_2005_:37
-#: PlayOnLinux_Scripts/Microsoft_Office_2010_:46
+#: PlayOnLinux_Scripts/Microsoft_Office_2010_:47
+#: PlayOnLinux_Scripts/Microsoft_Office_2013_:38
+#: PlayOnLinux_Scripts/Microsoft_Project_2010_:40
+#: PlayOnLinux_Scripts/Microsoft_Visio_2010_:40
#: PlayOnLinux_Scripts/Microsoft_Word_Viewer_2003_:35
#: PlayOnLinux_Scripts/Monkey_Island_2_Special_Edition_:79
#: PlayOnLinux_Scripts/Mount_and_Blade___Warband_:41
-#: PlayOnLinux_Scripts/Mozilla_Firefox_:165
+#: PlayOnLinux_Scripts/Mozilla_Firefox_:167
#: PlayOnLinux_Scripts/Need_For_Speed_III___Hot_Pursuit_:53
#: PlayOnLinux_Scripts/Need_For_Speed_Undercover_:28
#: PlayOnLinux_Scripts/Need_For_Speed_World_:28
@@ -280,6 +285,7 @@ msgstr ""
#: PlayOnLinux_Scripts/Prince_of_Persia___The_Forgotten_Sands_:85
#: PlayOnLinux_Scripts/Pro_Evolution_Soccer_2014_:27
#: PlayOnLinux_Scripts/Publish_or_Perish_:51 PlayOnLinux_Scripts/Q.U.B.E_:101
+#: PlayOnLinux_Scripts/Railroad_Pioneer_:39
#: PlayOnLinux_Scripts/Railroad_Tycoon_II_:48
#: PlayOnLinux_Scripts/Rayman_Legends_:81
#: PlayOnLinux_Scripts/Rayman_Legends_:99
@@ -294,10 +300,11 @@ msgstr ""
#: PlayOnLinux_Scripts/SFR_LiberTalk_:42 PlayOnLinux_Scripts/Safari_:63
#: PlayOnLinux_Scripts/Seals_with_Clubs_:54
#: PlayOnLinux_Scripts/Secret_of_Monkey_Island_Special_Edition_:79
-#: PlayOnLinux_Scripts/Spotify_:62 PlayOnLinux_Scripts/Star_Twine_:80
+#: PlayOnLinux_Scripts/Space_Engineers_:59 PlayOnLinux_Scripts/Spotify_:63
+#: PlayOnLinux_Scripts/Star_Twine_:80
#: PlayOnLinux_Scripts/Star_Wars__Jedi_Knight_II___Jedi_Outcast_:31
#: PlayOnLinux_Scripts/Star_Wars__The_Force_Unleashed___Ultimate_Sith_Edition_:147
-#: PlayOnLinux_Scripts/Star_Wars__The_Old_Republic_:35
+#: PlayOnLinux_Scripts/Star_Wars__The_Old_Republic_:36
#: PlayOnLinux_Scripts/Starcraft_:34
#: PlayOnLinux_Scripts/Starcraft___BroodWar_:24
#: PlayOnLinux_Scripts/Super_Street_Fighter_IV___Arcade_Edition_:88
@@ -315,7 +322,7 @@ msgstr ""
#: PlayOnLinux_Scripts/Warcraft_III__The_Frozen_Throne_:44
#: PlayOnLinux_Scripts/Windows_Media_Player_10_:39
#: PlayOnLinux_Scripts/Wizard_101_:38
-#: PlayOnLinux_Scripts/World_Of_Warcraft_:109
+#: PlayOnLinux_Scripts/World_Of_Warcraft_:110
#: PlayOnLinux_Scripts/World_Of_Warcraft___The_Burning_Crusade_:92
#: PlayOnLinux_Scripts/World_Of_Warcraft___Wrath_of_the_Lich_King_:70
#: PlayOnLinux_Scripts/Worms_Reloaded_:78
@@ -350,7 +357,9 @@ msgid "Please wait while installing prerequisites."
msgstr ""
#: PlayOnLinux_Scripts/3D_Train_Studio_:37
+#: PlayOnLinux_Scripts/Adobe_Digital_Editions_4.5_:32
#: PlayOnLinux_Scripts/Alone_In_The_Dark___The_New_Nightmare_:39
+#: PlayOnLinux_Scripts/AndreaMosaic_:34
#: PlayOnLinux_Scripts/Apple_AirPort_Utility_:30
#: PlayOnLinux_Scripts/Command_And_Conquer_3___Tiberium_Wars__Kane_Edition__:123
#: PlayOnLinux_Scripts/Command_And_Conquer___Red_Alert_3_:79
@@ -365,8 +374,10 @@ msgstr ""
#: PlayOnLinux_Scripts/GOG.com___Temple_of_Elemental_Evil_patch_CO8_Modpack_7_:53
#: PlayOnLinux_Scripts/Google_Picasa_3.9_:48
#: PlayOnLinux_Scripts/League_Of_Legends_:65
+#: PlayOnLinux_Scripts/Little_Fighter_2_v2.0a_:47
#: PlayOnLinux_Scripts/POL_GoG_setup_:31
-#: PlayOnLinux_Scripts/Photomatix_Pro_5_:32 PlayOnLinux_Scripts/Rage_:114
+#: PlayOnLinux_Scripts/Photomatix_Pro_5_:32
+#: PlayOnLinux_Scripts/Pronote_2015_:39 PlayOnLinux_Scripts/Rage_:114
#: PlayOnLinux_Scripts/Reshade_Image_Enlarger_:41
#: PlayOnLinux_Scripts/S.T.A.L.K.E.R.__Call_of_Pripyat_:40
#: PlayOnLinux_Scripts/S.T.A.L.K.E.R.__Clear_Sky_:40
@@ -379,7 +390,7 @@ msgstr ""
#: PlayOnLinux_Scripts/The_Matrix__Path_of_Neo_Update_2_:23
#: PlayOnLinux_Scripts/Toontown_Online_:25
#: PlayOnLinux_Scripts/Watchtower_Library_2014_:44
-#: PlayOnLinux_Scripts/Watchtower_library_:43
+#: PlayOnLinux_Scripts/Watchtower_library_:43 PlayOnLinux_Scripts/WowApp_:50
#: PlayOnLinux_Scripts/iMindMap_6_:31 PlayOnLinux_Scripts/iMindMap_7_:31
#: PlayOnLinux_Scripts/iTunes_10_:29
#, sh-format
@@ -419,7 +430,8 @@ msgstr ""
msgid "NOTICE: For low-latency audio, look into WineASIO."
msgstr ""
-#: PlayOnLinux_Scripts/Adobe_Photoshop_CS6_:29
+#: PlayOnLinux_Scripts/Adobe_Fireworks_CS6_:30
+#: PlayOnLinux_Scripts/Adobe_Photoshop_CS6_:30
#: PlayOnLinux_Scripts/Adobe_Photoshop_Lightroom_5_:31
#: PlayOnLinux_Scripts/Final_Fantasy_III_:29
#: PlayOnLinux_Scripts/Final_Fantasy_IV_:29
@@ -431,7 +443,8 @@ msgstr ""
msgid "Please select $TITLE install file."
msgstr ""
-#: PlayOnLinux_Scripts/Adobe_Photoshop_CS6_:50
+#: PlayOnLinux_Scripts/Adobe_Fireworks_CS6_:51
+#: PlayOnLinux_Scripts/Adobe_Photoshop_CS6_:51
#, sh-format
msgid ""
"NOTICE: If you get an error saying that the installation failed, wait at "
@@ -439,7 +452,7 @@ msgid ""
"though it crashed."
msgstr ""
-#: PlayOnLinux_Scripts/Adobe_Photoshop_CS6_:62
+#: PlayOnLinux_Scripts/Adobe_Photoshop_CS6_:63
#, sh-format
msgid ""
"NOTICE: Online updates and any 3D services do not work. If you want to "
@@ -461,6 +474,11 @@ msgid ""
"click NEXT through IE install, as you usually would."
msgstr ""
+#: PlayOnLinux_Scripts/Age_Of_Empires_III_:37
+#, sh-format
+msgid "Please select the setup file"
+msgstr ""
+
#: PlayOnLinux_Scripts/Age_of_Empires_II___The_Age_of_Kings_:66
#, sh-format
msgid "Do you want to install the 2.0a Patch?"
@@ -476,6 +494,7 @@ msgstr ""
#: PlayOnLinux_Scripts/Assassin_s_Creed_Patch_1.02_:32
#: PlayOnLinux_Scripts/Bioshock_Patch_1.1_:34
#: PlayOnLinux_Scripts/Command_And_Conquer_3___Tiberium_Wars__Kane_Edition__Patch_1.09_:35
+#: PlayOnLinux_Scripts/Diablo_II___Lord_Of_Destruction_:28
#: PlayOnLinux_Scripts/GOG.com___Advent_Rising__Advent_Revising_patch_:29
#: PlayOnLinux_Scripts/GOG.com___Heroes_of_Might_and_Magic_3_HD_mod_:43
#: PlayOnLinux_Scripts/GOG.com___Outcast__High_resolution_patch_:33
@@ -483,7 +502,7 @@ msgstr ""
#: PlayOnLinux_Scripts/The_Elder_Scrolls_III___Morrowind___Bloodmoon_:26
#: PlayOnLinux_Scripts/The_Elder_Scrolls_III___Morrowind___Tribunal_:26
#: PlayOnLinux_Scripts/The_Elder_Scrolls_IV___Oblivion_Patch_1.2.0416_:26
-#: PlayOnLinux_Scripts/X3___Terran_Conflict_Patch_3.2_:30 lib/wine.lib:624
+#: PlayOnLinux_Scripts/X3___Terran_Conflict_Patch_3.2_:30 lib/wine.lib:623
#, sh-format
msgid ""
"This is an installer for an update or an addon;\\nPlease install "
@@ -530,9 +549,10 @@ msgstr ""
#: PlayOnLinux_Scripts/Magicka_:68
#: PlayOnLinux_Scripts/Monkey_Island_2_Special_Edition_:72
#: PlayOnLinux_Scripts/Orcs_Must_Die__:33
-#: PlayOnLinux_Scripts/Orcs_Must_Die__2_:36 PlayOnLinux_Scripts/Portal_:89
-#: PlayOnLinux_Scripts/Portal_2_:75 PlayOnLinux_Scripts/Q.U.B.E_:86
-#: PlayOnLinux_Scripts/Rayman_Legends_:92
+#: PlayOnLinux_Scripts/Orcs_Must_Die__2_:36
+#: PlayOnLinux_Scripts/Pathologic_Classic_HD_:46
+#: PlayOnLinux_Scripts/Portal_:89 PlayOnLinux_Scripts/Portal_2_:75
+#: PlayOnLinux_Scripts/Q.U.B.E_:86 PlayOnLinux_Scripts/Rayman_Legends_:92
#: PlayOnLinux_Scripts/Rayman_Origins_:83
#: PlayOnLinux_Scripts/Secret_of_Monkey_Island_Special_Edition_:72
#: PlayOnLinux_Scripts/Star_Wars__Jedi_Knight__Jedi_Academy_:59
@@ -563,6 +583,21 @@ msgstr ""
msgid "You dont have to install DirectX or use GLSetup."
msgstr ""
+#: PlayOnLinux_Scripts/AndreaMosaic_:33
+#, sh-format
+msgid "Please be sure to use the Portable version of AndreaMosaic!"
+msgstr ""
+
+#: PlayOnLinux_Scripts/AndreaMosaic_:41
+#, sh-format
+msgid "Do you want to try the Beta version?"
+msgstr ""
+
+#: PlayOnLinux_Scripts/AndreaMosaic_:71
+#, sh-format
+msgid "License"
+msgstr ""
+
#: PlayOnLinux_Scripts/Anno_1602_:41 PlayOnLinux_Scripts/EVE_online_:96
#: PlayOnLinux_Scripts/EVE_online_:124
#: PlayOnLinux_Scripts/Escape_From_Monkey_Island_:39
@@ -576,12 +611,12 @@ msgstr ""
#: PlayOnLinux_Scripts/Star_Wars__Jedi_Knight__Jedi_Academy_:34
#: PlayOnLinux_Scripts/Star_Wars__Jedi_Knight__Jedi_Academy_:42
#: PlayOnLinux_Scripts/SubRip_:33 PlayOnLinux_Scripts/Theme_Hospital_:48
-#: PlayOnLinux_Scripts/World_Of_Warcraft_:122 bash/installpolpackages:29
+#: PlayOnLinux_Scripts/World_Of_Warcraft_:123 bash/installpolpackages:29
#: bash/killall:29 bash/read_pc_cd:39 bash/read_pc_cd:73 bash/read_pc_cd:103
#: bash/winebash:27 lib/scripts.lib:675 lib/scripts.lib:683
#: lib/scripts.lib:691 lib/scripts.lib:699 lib/scripts.lib:707
-#: lib/setupwindow.lib:439 lib/wine.lib:1015 lib/wine.lib:1034
-#: lib/wine.lib:1093 lib/wine.lib:1123
+#: lib/setupwindow.lib:439 lib/wine.lib:1014 lib/wine.lib:1033
+#: lib/wine.lib:1120 lib/wine.lib:1150
#, sh-format
msgid "Please wait..."
msgstr ""
@@ -716,7 +751,7 @@ msgstr ""
#: PlayOnLinux_Scripts/The_Elder_Scrolls_IV___Shivering_Isle_:52
#: PlayOnLinux_Scripts/The_Next_BIG_Thing_:47
#: PlayOnLinux_Scripts/Unreal_Tounament_3_:60
-#: PlayOnLinux_Scripts/World_Of_Warcraft_:93
+#: PlayOnLinux_Scripts/World_Of_Warcraft_:94
#: PlayOnLinux_Scripts/World_Of_Warcraft___The_Burning_Crusade_:76
#: PlayOnLinux_Scripts/World_Of_Warcraft___Wrath_of_the_Lich_King_:43
#, sh-format
@@ -749,7 +784,7 @@ msgstr ""
#: PlayOnLinux_Scripts/Prince_of_Persia___The_Forgotten_Sands_:60
#: PlayOnLinux_Scripts/Sacrifice_:45
#: PlayOnLinux_Scripts/Star_Wars__The_Force_Unleashed___Ultimate_Sith_Edition_:118
-#: PlayOnLinux_Scripts/The_Elder_Scrolls_V__Skyrim_:76
+#: PlayOnLinux_Scripts/The_Elder_Scrolls_V__Skyrim_:77
#: PlayOnLinux_Scripts/The_Witcher_:102
#, sh-format
msgid "Please insert the game media into your disk drive"
@@ -842,7 +877,7 @@ msgstr ""
#: PlayOnLinux_Scripts/Baldur_s_Gate_Patch_1.1.4315_:51
#: PlayOnLinux_Scripts/Baldur_s_Gate___Tales_of_the_Sword_Coast_Patch_1.3.5512_:51
#: PlayOnLinux_Scripts/Borderlands_:59 PlayOnLinux_Scripts/Fallout_3_:57
-#: PlayOnLinux_Scripts/World_Of_Warcraft_:48
+#: PlayOnLinux_Scripts/World_Of_Warcraft_:49
#, sh-format
msgid "Which version do you have?"
msgstr ""
@@ -1021,6 +1056,7 @@ msgid ""
msgstr ""
#: PlayOnLinux_Scripts/Cities_XL_Platinum_:36
+#: PlayOnLinux_Scripts/Pathologic_Classic_HD_:39
#, sh-format
msgid ""
"NOTICE: $TITLE will be installed via Steam. After Steam is installed, "
@@ -1073,9 +1109,7 @@ msgstr ""
#: PlayOnLinux_Scripts/Civilization_IV__Complete_Edition_:107
#, sh-format
-msgid ""
-"Installation finished\\n\\nThe game might crash on the first attempt, but no "
-"worries, just try one more time."
+msgid "Installation finished\\n"
msgstr ""
#: PlayOnLinux_Scripts/Command_And_Conquer_3___Kane_s_Wrath_:62
@@ -1152,7 +1186,7 @@ msgstr ""
#: PlayOnLinux_Scripts/Command_And_Conquer_3___Tiberium_Wars__Kane_Edition__Patch_1.09_:55
#: PlayOnLinux_Scripts/Internet_Explorer_7_:57
-#: PlayOnLinux_Scripts/Mozilla_Firefox_:77
+#: PlayOnLinux_Scripts/Mozilla_Firefox_:81
#, sh-format
msgid "Which language version would you like to install?"
msgstr ""
@@ -1167,8 +1201,23 @@ msgid ""
"work for this."
msgstr ""
+#: PlayOnLinux_Scripts/Crossword_Compiler_:24
+#, sh-format
+msgid "Please select a language."
+msgstr ""
+
+#: PlayOnLinux_Scripts/Crossword_Compiler_:35
+#, sh-format
+msgid "Please select the program."
+msgstr ""
+
+#: PlayOnLinux_Scripts/Crossword_Compiler_:42
+#, sh-format
+msgid "Notice: This will only be a demo version."
+msgstr ""
+
#: PlayOnLinux_Scripts/DC_Universe_Online_:51
-#: PlayOnLinux_Scripts/PlanetSide_2_:47
+#: PlayOnLinux_Scripts/PlanetSide_2_:55
#, sh-format
msgid ""
"Attention: After installation is complete, the patcher will load. Please "
@@ -1187,12 +1236,12 @@ msgstr ""
#: PlayOnLinux_Scripts/Fable___The_Lost_Chapters_:81
#: PlayOnLinux_Scripts/Fable___The_Lost_Chapters_:89
#: PlayOnLinux_Scripts/Fable___The_Lost_Chapters_:97
-#: PlayOnLinux_Scripts/World_Of_Warcraft_:54
-#: PlayOnLinux_Scripts/World_Of_Warcraft_:60
-#: PlayOnLinux_Scripts/World_Of_Warcraft_:66
-#: PlayOnLinux_Scripts/World_Of_Warcraft_:72
-#: PlayOnLinux_Scripts/World_Of_Warcraft_:80
-#: PlayOnLinux_Scripts/World_Of_Warcraft_:96
+#: PlayOnLinux_Scripts/World_Of_Warcraft_:55
+#: PlayOnLinux_Scripts/World_Of_Warcraft_:61
+#: PlayOnLinux_Scripts/World_Of_Warcraft_:67
+#: PlayOnLinux_Scripts/World_Of_Warcraft_:73
+#: PlayOnLinux_Scripts/World_Of_Warcraft_:81
+#: PlayOnLinux_Scripts/World_Of_Warcraft_:97
#: PlayOnLinux_Scripts/World_Of_Warcraft___The_Burning_Crusade_:46
#: PlayOnLinux_Scripts/World_Of_Warcraft___The_Burning_Crusade_:52
#: PlayOnLinux_Scripts/World_Of_Warcraft___The_Burning_Crusade_:58
@@ -1233,6 +1282,21 @@ msgid ""
"sudo tee /proc/sys/kernel/yama/ptrace_scope"
msgstr ""
+#: PlayOnLinux_Scripts/Diablo_II___Lord_Of_Destruction_:39
+#, sh-format
+msgid "When the installer will ask you for PlayDisc, click NEXT."
+msgstr ""
+
+#: PlayOnLinux_Scripts/Diablo_II___Lord_Of_Destruction_:41
+#, sh-format
+msgid "When the installer will ask you for Expansion Disc, click NEXT."
+msgstr ""
+
+#: PlayOnLinux_Scripts/Diablo_II___Lord_Of_Destruction_:43
+#, sh-format
+msgid "Click NEXT when the installation will finish"
+msgstr ""
+
#: PlayOnLinux_Scripts/Diagnostic_Tools_:20
#, sh-format
msgid "Scanning your hardware..."
@@ -1337,7 +1401,7 @@ msgstr ""
#: PlayOnLinux_Scripts/GOG.com___Temple_of_Elemental_Evil_patch_CO8_Modpack_7_:62
#: PlayOnLinux_Scripts/Infinity_Engine_widescreen_mod_:25
#: PlayOnLinux_Scripts/Runes_Of_Magic_:49 PlayOnLinux_Scripts/Sacrifice_:42
-#: PlayOnLinux_Scripts/Sacrifice_:48 PlayOnLinux_Scripts/Spotify_:63
+#: PlayOnLinux_Scripts/Sacrifice_:48 PlayOnLinux_Scripts/Spotify_:64
#: PlayOnLinux_Scripts/The_Elder_Scrolls_II__Daggerfall_:68
#: PlayOnLinux_Scripts/Toontown_Online_:26
#: PlayOnLinux_Scripts/Toontown_Online_:33
@@ -1347,6 +1411,7 @@ msgid "Please wait while $TITLE is installed."
msgstr ""
#: PlayOnLinux_Scripts/Evolution_4_:43
+#: PlayOnLinux_Scripts/GOG.com___RollerCoaster_Tycoon__Deluxe_:105
#: PlayOnLinux_Scripts/Photomatix_Pro_4.2.7_:59
#: PlayOnLinux_Scripts/Rayman_Legends_:110
#: PlayOnLinux_Scripts/Star_Wars___Rogue_Squadron_3D_:75
@@ -1571,6 +1636,13 @@ msgstr ""
msgid "Dedicated Server"
msgstr ""
+#: PlayOnLinux_Scripts/GOG.com___Legend_of_Grimrock_2_:34
+#, sh-format
+msgid ""
+"At the end of the install progres there will appear few error messages; just "
+"ignore them!"
+msgstr ""
+
#: PlayOnLinux_Scripts/GOG.com___Magrunner__Dark_Pulse_:21
#, sh-format
msgid ""
@@ -1767,6 +1839,13 @@ msgid ""
"if you want."
msgstr ""
+#: PlayOnLinux_Scripts/GOG.com___RollerCoaster_Tycoon_3_:25
+#, sh-format
+msgid ""
+"At the end of the installation process you will get a few runtime errors, "
+"ignore them for now."
+msgstr ""
+
#: PlayOnLinux_Scripts/GOG.com___Sanitarium_:63
#, sh-format
msgid "(windowed)"
@@ -1834,7 +1913,8 @@ msgstr ""
msgid "Please select the game language"
msgstr ""
-#: PlayOnLinux_Scripts/Google_SketchUp_:43 PlayOnLinux_Scripts/Hearthstone_:29
+#: PlayOnLinux_Scripts/Google_SketchUp_:43 PlayOnLinux_Scripts/Hearthstone_:32
+#: PlayOnLinux_Scripts/Heroes_of_the_Storm_:30
#, sh-format
msgid "What language do you want to install?"
msgstr ""
@@ -1877,6 +1957,11 @@ msgstr ""
msgid "Please insert the DVD-ROM"
msgstr ""
+#: PlayOnLinux_Scripts/Guild_Wars_2_:43
+#, sh-format
+msgid "Select architecture"
+msgstr ""
+
#: PlayOnLinux_Scripts/Guitar_Rig_5_:38
#, sh-format
msgid ""
@@ -1983,12 +2068,12 @@ msgstr ""
msgid "Registering libraries, please wait\\n(It can take a while)"
msgstr ""
-#: PlayOnLinux_Scripts/League_Of_Legends_:50
+#: PlayOnLinux_Scripts/League_Of_Legends_:50 PlayOnLinux_Scripts/WowApp_:35
#, sh-format
msgid "glxinfo is not installed. Please install mesa-utils package"
msgstr ""
-#: PlayOnLinux_Scripts/League_Of_Legends_:53
+#: PlayOnLinux_Scripts/League_Of_Legends_:53 PlayOnLinux_Scripts/WowApp_:38
#, sh-format
msgid ""
"Warning! S3TC compression is not available on your system.\\n\\nIf you have "
@@ -2021,11 +2106,12 @@ msgid "North America"
msgstr ""
#: PlayOnLinux_Scripts/League_Of_Legends_:76
+#: PlayOnLinux_Scripts/Little_Fighter_2_v2.0a_:53
#, sh-format
msgid "Select installer to download:"
msgstr ""
-#: PlayOnLinux_Scripts/League_Of_Legends_:109
+#: PlayOnLinux_Scripts/League_Of_Legends_:109 PlayOnLinux_Scripts/WowApp_:69
#, sh-format
msgid ""
"Warning: You must not tick the checkbox \"Run $TITLE\" when setup is done"
@@ -2043,6 +2129,12 @@ msgid ""
"tcp_timestamps in the kernel."
msgstr ""
+#: PlayOnLinux_Scripts/Little_Fighter_2_v2.0a_:36
+#, sh-format
+msgid ""
+"$APPLICATION_TITLE equal or superior to 4.1.4 is required to install $TITLE"
+msgstr ""
+
#: PlayOnLinux_Scripts/Mass_Effect_:48
#, sh-format
msgid "Please insert game media 1 into your disk drive"
@@ -2111,12 +2203,18 @@ msgid ""
"LibreOffice, OpenOffice or some other editor. "
msgstr ""
-#: PlayOnLinux_Scripts/Microsoft_Office_2010_:64
+#: PlayOnLinux_Scripts/Microsoft_Office_2010_:65
+#: PlayOnLinux_Scripts/Microsoft_Office_2013_:58
+#: PlayOnLinux_Scripts/Microsoft_Project_2010_:58
+#: PlayOnLinux_Scripts/Microsoft_Visio_2010_:58
#, sh-format
msgid "The 64bits version is not compatible! Sorry"
msgstr ""
-#: PlayOnLinux_Scripts/Microsoft_Office_2010_:96
+#: PlayOnLinux_Scripts/Microsoft_Office_2010_:97
+#: PlayOnLinux_Scripts/Microsoft_Office_2013_:90
+#: PlayOnLinux_Scripts/Microsoft_Project_2010_:80
+#: PlayOnLinux_Scripts/Microsoft_Visio_2010_:82
#, sh-format
msgid ""
"$TITLE has been installed successfully\\n\\nIf an installation Windows "
@@ -2160,7 +2258,7 @@ msgid ""
"No $TITLE installation found.\\n\\nPlease use the $TITLE installation script!"
msgstr ""
-#: PlayOnLinux_Scripts/Mozilla_Firefox_:176
+#: PlayOnLinux_Scripts/Mozilla_Firefox_:174
#, sh-format
msgid "Check which components do you want to install additionally:"
msgstr ""
@@ -2189,6 +2287,13 @@ msgid ""
"If the download update stuck close and run until the download is complete."
msgstr ""
+#: PlayOnLinux_Scripts/OBDwiz_OBDII_vehicle_diagnostic_program_:25
+#: PlayOnLinux_Scripts/Vegas_Pro_8.0c_:48
+#: PlayOnLinux_Scripts/WEB_Surveillance_DVR_OCX_with_Internet_Explorer_6_:24
+#, sh-format
+msgid "Please select the install file."
+msgstr ""
+
#: PlayOnLinux_Scripts/Orcs_Must_Die__:40
#: PlayOnLinux_Scripts/Orcs_Must_Die__2_:43
#, sh-format
@@ -2444,6 +2549,23 @@ msgstr ""
msgid "Installing msasn1 DLL..."
msgstr ""
+#: PlayOnLinux_Scripts/POL_Install_steam_:22
+#, sh-format
+msgid "$TITLE - Steam Installation"
+msgstr ""
+
+#: PlayOnLinux_Scripts/POL_Install_steam_:22
+#, sh-format
+msgid "Please complete the Steam setup wizard."
+msgstr ""
+
+#: PlayOnLinux_Scripts/POL_Install_steam_:24
+#, sh-format
+msgid ""
+"Log into your Steam account once the update is complete.\\n\\nClick Next to "
+"continue."
+msgstr ""
+
#: PlayOnLinux_Scripts/POL_Install_ubigamelauncher_:13
#, sh-format
msgid ""
@@ -2648,7 +2770,7 @@ msgid ""
"To continue, PlayOnLinux needs to remount your CD-ROM with unhide option."
msgstr ""
-#: PlayOnLinux_Scripts/POL_Test_ptrace_:16 lib/wine.lib:899
+#: PlayOnLinux_Scripts/POL_Test_ptrace_:16 lib/wine.lib:898
#, sh-format
msgid "Abort installation"
msgstr ""
@@ -2673,7 +2795,7 @@ msgstr ""
msgid "The program needs access to ptrace() to proceed:"
msgstr ""
-#: PlayOnLinux_Scripts/POL_Test_ptrace_:28 lib/wine.lib:928
+#: PlayOnLinux_Scripts/POL_Test_ptrace_:28 lib/wine.lib:927
#, sh-format
msgid "User abort"
msgstr ""
@@ -2707,6 +2829,41 @@ msgstr ""
msgid "Now you can go back to the $TITLE installation window to continue"
msgstr ""
+#: PlayOnLinux_Scripts/POL_innoextract_:14
+#, sh-format
+msgid "POL_innoextract failed: INSTALLER_FILE not set."
+msgstr ""
+
+#: PlayOnLinux_Scripts/POL_innoextract_:17
+#, sh-format
+msgid "POL_innoextract failed: TEMP_DIR not set."
+msgstr ""
+
+#: PlayOnLinux_Scripts/POL_innoextract_:20
+#, sh-format
+msgid "POL_innoextract failed: INSTALL_PATH not set."
+msgstr ""
+
+#: PlayOnLinux_Scripts/POL_innoextract_:26
+#, sh-format
+msgid ""
+"Could not find innoextract binary. Install the \"innoextract\" package or "
+"see http://constexpr.org/innoextract for more information on how to install, "
+"then run the script again."
+msgstr ""
+
+#: PlayOnLinux_Scripts/POL_innoextract_:31
+#, sh-format
+msgid "Extracting game files..."
+msgstr ""
+
+#: PlayOnLinux_Scripts/POL_innoextract_:57
+#, sh-format
+msgid ""
+"Failed to extract files. Is innoextract is up to date and the input file "
+"valid?"
+msgstr ""
+
#: PlayOnLinux_Scripts/PatternMaker_7.5_:36
#, sh-format
msgid ""
@@ -2903,7 +3060,7 @@ msgid ""
"not have this issue."
msgstr ""
-#: PlayOnLinux_Scripts/Red_Faction_:87 PlayOnLinux_Scripts/Terraria_:73
+#: PlayOnLinux_Scripts/Red_Faction_:87 PlayOnLinux_Scripts/Terraria_:74
#, sh-format
msgid ""
"If the game crashes at startup, open a terminal and type:\\necho 0|sudo tee /"
@@ -2944,20 +3101,6 @@ msgstr ""
msgid "The launcher can still self update after installation"
msgstr ""
-#: PlayOnLinux_Scripts/RollerCoaster_Tycoon_3_:47
-#, sh-format
-msgid ""
-"Choose Detailed Installation for Media Player Codec Pack to avoid a useless "
-"systray icon."
-msgstr ""
-
-#: PlayOnLinux_Scripts/RollerCoaster_Tycoon_3_:59
-#, sh-format
-msgid ""
-"The RCT3 installer will start when you click Next. Do not attempt to "
-"register your game."
-msgstr ""
-
#: PlayOnLinux_Scripts/Rome_Total_War__Gold_Edition__:72
#, sh-format
msgid ""
@@ -3100,7 +3243,7 @@ msgid "Sorry, but that was not a valid .zip file"
msgstr ""
#: PlayOnLinux_Scripts/Spintires_:35
-#: PlayOnLinux_Scripts/The_Elder_Scrolls_V__Skyrim_:34
+#: PlayOnLinux_Scripts/The_Elder_Scrolls_V__Skyrim_:35
#, sh-format
msgid ""
"The game will fail to launch until you set /proc/sys/kernel/yama/"
@@ -3156,7 +3299,7 @@ msgstr ""
msgid "Download on Steam Store"
msgstr ""
-#: PlayOnLinux_Scripts/Terraria_:56
+#: PlayOnLinux_Scripts/Terraria_:57
#, sh-format
msgid ""
"Install Terraria via Steam. Once Terraria has fully downloaded, press the "
@@ -3511,9 +3654,9 @@ msgstr ""
msgid "Do you want to browse $TITLE website?"
msgstr ""
-#: PlayOnLinux_Scripts/WEB_Surveillance_DVR_OCX_with_Internet_Explorer_6_:24
+#: PlayOnLinux_Scripts/Vegas_Pro_8.0c_:50
#, sh-format
-msgid "Please select the install file."
+msgid "PlayOnLinux is installing your application..."
msgstr ""
#: PlayOnLinux_Scripts/WTW_Instant_Messenger_:37
@@ -3554,25 +3697,14 @@ msgstr ""
msgid "Your browser will pop, download patch from it and uncompress it please"
msgstr ""
-#: PlayOnLinux_Scripts/World_Of_Tanks_:56
+#: PlayOnLinux_Scripts/World_Of_Tanks_:41
#, sh-format
msgid ""
"Which region version of World of Tanks would you like to install? Note: "
"Korea not supported on this installation."
msgstr ""
-#: PlayOnLinux_Scripts/World_Of_Tanks_:66
-#, sh-format
-msgid ""
-"Attention:After installation is complete, the patcher will load. After, go "
-"to the top right of the patcher and click the wrench, Then Un-check the box "
-"for \"Allow Torrent\", if this is not done the patcher will crash after 1 "
-"minuite. When finished with this, please close the patcher before logging in "
-"or finish updating to complete the installation. After this, you can run "
-"\"$TITLE\" when setup is done"
-msgstr ""
-
-#: PlayOnLinux_Scripts/World_Of_Warcraft_:51
+#: PlayOnLinux_Scripts/World_Of_Warcraft_:52
#: PlayOnLinux_Scripts/World_Of_Warcraft___The_Burning_Crusade_:43
#: PlayOnLinux_Scripts/Zoo_Tycoon_2___Ultimate_Collection_:36
#: PlayOnLinux_Scripts/Zoo_Tycoon_2___Ultimate_Collection_:69
@@ -3580,27 +3712,27 @@ msgstr ""
msgid "Please insert game media 1 into your disk drive\\nif not already done."
msgstr ""
-#: PlayOnLinux_Scripts/World_Of_Warcraft_:57
+#: PlayOnLinux_Scripts/World_Of_Warcraft_:58
#: PlayOnLinux_Scripts/World_Of_Warcraft___The_Burning_Crusade_:49
#: PlayOnLinux_Scripts/Zoo_Tycoon_2___Ultimate_Collection_:44
#, sh-format
msgid "Please insert game media 2 into your disk drive\\nif not already done."
msgstr ""
-#: PlayOnLinux_Scripts/World_Of_Warcraft_:63
+#: PlayOnLinux_Scripts/World_Of_Warcraft_:64
#: PlayOnLinux_Scripts/World_Of_Warcraft___The_Burning_Crusade_:55
#: PlayOnLinux_Scripts/Zoo_Tycoon_2___Ultimate_Collection_:52
#, sh-format
msgid "Please insert game media 3 into your disk drive\\nif not already done."
msgstr ""
-#: PlayOnLinux_Scripts/World_Of_Warcraft_:69
+#: PlayOnLinux_Scripts/World_Of_Warcraft_:70
#: PlayOnLinux_Scripts/World_Of_Warcraft___The_Burning_Crusade_:61
#, sh-format
msgid "Please insert game media 4 into your disk drive\\nif not already done."
msgstr ""
-#: PlayOnLinux_Scripts/World_Of_Warcraft_:77
+#: PlayOnLinux_Scripts/World_Of_Warcraft_:78
#, sh-format
msgid "Please insert game media 5 into your disk drive\\nif not already done."
msgstr ""
@@ -3621,19 +3753,13 @@ msgid ""
"\"$TITLE\" when setup is done"
msgstr ""
-#: PlayOnLinux_Scripts/World_Of_Warships_:33
+#: PlayOnLinux_Scripts/World_Of_Warships_:34
#, sh-format
msgid ""
"Which region version of World Of Warships would you like to install? Note: "
"Korea is not supported yet."
msgstr ""
-#: PlayOnLinux_Scripts/World_Of_Warships_:43
-#, sh-format
-msgid ""
-"Please Un-check the box: \"Allow Torrent\" in World Of Warships dowloader."
-msgstr ""
-
#: PlayOnLinux_Scripts/Wurm_Clock_:37
#, sh-format
msgid "Do you have downloaded the zip file?"
@@ -3962,7 +4088,7 @@ msgid "Use another version of Wine"
msgstr ""
#: bash/manual_install:139 bash/manual_install:191 bash/polconfigurator:105
-#: python/configure.py:232 python/mainwindow.py:584
+#: python/configure.py:231 python/mainwindow.py:584
#, sh-format
msgid "Configure Wine"
msgstr ""
@@ -4119,7 +4245,7 @@ msgstr ""
msgid "is not an icon extension"
msgstr ""
-#: bash/polconfigurator:106 python/configure.py:240 python/mainwindow.py:588
+#: bash/polconfigurator:106 python/configure.py:239 python/mainwindow.py:588
#, sh-format
msgid "Registry Editor"
msgstr ""
@@ -4315,7 +4441,7 @@ msgid "Unable to install XQuartz! You must install it to use wine properly."
msgstr ""
#: bash/uninstall:31 bash/uninstall:65 bash/uninstall:68 bash/uninstall:75
-#: lib/wine.lib:867
+#: lib/wine.lib:866
#, sh-format
msgid "$APPLICATION_TITLE Uninstaller"
msgstr ""
@@ -4335,7 +4461,7 @@ msgstr ""
msgid "This wizard will help you to uninstall: "
msgstr ""
-#: bash/uninstall:65 lib/wine.lib:867
+#: bash/uninstall:65 lib/wine.lib:866
#, sh-format
msgid "Uninstalling..."
msgstr ""
@@ -4395,17 +4521,17 @@ msgid ""
msgstr ""
#: lib/deprecated.lib:87 lib/deprecated.lib:100 lib/deprecated.lib:121
-#: lib/wine.lib:934 lib/wine.lib:973
+#: lib/wine.lib:933 lib/wine.lib:972
#, sh-format
msgid "Please wait while the virtual drive is being created..."
msgstr ""
-#: lib/deprecated.lib:431
+#: lib/deprecated.lib:294
#, sh-format
msgid "Please wait while $APPLICATION_TITLE is simulating a Windows reboot"
msgstr ""
-#: lib/deprecated.lib:563
+#: lib/deprecated.lib:426
#, sh-format
msgid "Setting Program Files var"
msgstr ""
@@ -4531,7 +4657,7 @@ msgstr ""
msgid "No enough space to download:\\n$URL ($neededSpace KB)"
msgstr ""
-#: lib/scripts.lib:529 lib/scripts.lib:822
+#: lib/scripts.lib:529 lib/scripts.lib:821
#, sh-format
msgid "Please wait while $APPLICATION_TITLE is downloading:"
msgstr ""
@@ -4568,31 +4694,31 @@ msgstr ""
msgid "Extracted file size does not match!"
msgstr ""
-#: lib/scripts.lib:784
+#: lib/scripts.lib:783
#, sh-format
msgid "Copying ${filename}"
msgstr ""
-#: lib/scripts.lib:797
+#: lib/scripts.lib:796
#, sh-format
msgid "File size does not match!"
msgstr ""
-#: lib/scripts.lib:955
+#: lib/scripts.lib:954
#, sh-format
msgid ""
"Sorry, $APPLICATION_TITLE $VERSION is too old to continue.\\n"
"$APPLICATION_TITLE $NEEDED is required."
msgstr ""
-#: lib/scripts.lib:970
+#: lib/scripts.lib:969
#, sh-format
msgid ""
"Warning: You are running $APPLICATION_TITLE $VERSION.\\n$APPLICATION_TITLE "
"$NEEDED is recommended to continue."
msgstr ""
-#: lib/scripts.lib:1001
+#: lib/scripts.lib:1000
#, sh-format
msgid "$AUTHOR profile"
msgstr ""
@@ -4787,220 +4913,210 @@ msgid ""
"valid."
msgstr ""
-#: lib/wine.lib:389
+#: lib/wine.lib:388
#, sh-format
msgid "Please wait while $APPLICATION_TITLE is scanning your hardware"
msgstr ""
-#: lib/wine.lib:395
+#: lib/wine.lib:394
#, sh-format
msgid "Select the main videocard to report:"
msgstr ""
-#: lib/wine.lib:541
+#: lib/wine.lib:540
#, sh-format
msgid ""
"Starting 64-bit process $EXEFILE is not supported in 32-bit virtual drives"
msgstr ""
-#: lib/wine.lib:579
+#: lib/wine.lib:578
#, sh-format
msgid ""
"Wine seems to have crashed\\n\\nIf your program is running, just ignore this "
"message"
msgstr ""
-#: lib/wine.lib:683
+#: lib/wine.lib:682
#, sh-format
msgid "Unable to find version: "
msgstr ""
-#: lib/wine.lib:689 lib/wine.lib:690
+#: lib/wine.lib:688 lib/wine.lib:689
#, sh-format
msgid "Downloading Wine: "
msgstr ""
-#: lib/wine.lib:699
+#: lib/wine.lib:698
#, sh-format
msgid "The download seems to have failed."
msgstr ""
-#: lib/wine.lib:701
+#: lib/wine.lib:700
#, sh-format
msgid "Extracting Wine..."
msgstr ""
-#: lib/wine.lib:897
+#: lib/wine.lib:896
#, sh-format
msgid "Overwrite (usually works, no guarantee)"
msgstr ""
-#: lib/wine.lib:898
+#: lib/wine.lib:897
#, sh-format
msgid "Erase (virtual drive content will be lost)"
msgstr ""
-#: lib/wine.lib:912
+#: lib/wine.lib:911
#, sh-format
msgid "The target virtual drive $PREFNAME already exists:"
msgstr ""
-#: lib/wine.lib:1093 lib/wine.lib:1123
+#: lib/wine.lib:1120 lib/wine.lib:1150
#, sh-format
msgid "Please wait while $SOFTNAME is installed..."
msgstr ""
-#: lib/wine.lib:1097 lib/wine.lib:1126
+#: lib/wine.lib:1124 lib/wine.lib:1153
#, sh-format
msgid ""
"Be careful! This will kill install process. If it is not finished, you will "
"have to reinstall $SOFTNAME"
msgstr ""
-#: lib/wine.lib:1097 lib/wine.lib:1126
+#: lib/wine.lib:1124 lib/wine.lib:1153
#, sh-format
msgid "Install is done"
msgstr ""
-#: lib/wine.lib:1130 lib/wine.lib:1131
+#: lib/wine.lib:1157 lib/wine.lib:1158
#, sh-format
msgid "Press next only when the installation process is finished"
msgstr ""
-#: lib/wine.lib:1139
+#: lib/wine.lib:1166
#, sh-format
msgid "Please wait while $APPLICATION_TITLE is simulating a reboot"
msgstr ""
-#: python/configure.py:117
-#, python-brace-format
-msgid ""
-"Warning:\n"
-"\n"
-"This tool is for advanced users.\n"
-"To uninstall cleanly a program with {0}, you must delete the virtual drive "
-"associated"
-msgstr ""
-
-#: python/configure.py:198 python/configure.py:713
+#: python/configure.py:197 python/configure.py:712
msgid "General"
msgstr ""
-#: python/configure.py:201
+#: python/configure.py:200
msgid "Make a new shortcut from this virtual drive"
msgstr ""
-#: python/configure.py:202
+#: python/configure.py:201
msgid "Name"
msgstr ""
-#: python/configure.py:203
+#: python/configure.py:202
msgid "Wine version"
msgstr ""
-#: python/configure.py:204
+#: python/configure.py:203
msgid "Debug flags"
msgstr ""
-#: python/configure.py:206
+#: python/configure.py:205
msgid "Virtual drive"
msgstr ""
-#: python/configure.py:208
+#: python/configure.py:207
msgid "Arguments"
msgstr ""
-#: python/configure.py:212
+#: python/configure.py:211
msgid "Run configuration wizard"
msgstr ""
-#: python/configure.py:249
+#: python/configure.py:248
msgid "Windows reboot"
msgstr ""
-#: python/configure.py:257
+#: python/configure.py:256
msgid "Repair virtual drive"
msgstr ""
-#: python/configure.py:266
+#: python/configure.py:264
msgid "Command prompt"
msgstr ""
-#: python/configure.py:273
+#: python/configure.py:271
msgid "Task manager"
msgstr ""
-#: python/configure.py:281
+#: python/configure.py:279
msgid "Kill processes"
msgstr ""
-#: python/configure.py:288
-msgid "Wine uninstaller"
+#: python/configure.py:286
+msgid "Control panel"
msgstr ""
-#: python/configure.py:313
+#: python/configure.py:312
msgid ""
"Be careful! Installing one of these components can break your virtual drive."
msgstr ""
-#: python/configure.py:335 python/install.py:289 python/install.py:293
+#: python/configure.py:334 python/install.py:289 python/install.py:293
#: python/mainwindow.py:244 python/mainwindow.py:384
msgid "Install"
msgstr ""
-#: python/configure.py:398
+#: python/configure.py:397
msgid "Open program's directory"
msgstr ""
-#: python/configure.py:421
+#: python/configure.py:420
msgid "Open virtual drive's directory"
msgstr ""
-#: python/configure.py:565
+#: python/configure.py:564
msgid "GLSL Support"
msgstr ""
-#: python/configure.py:566
+#: python/configure.py:565
msgid "Direct Draw Renderer"
msgstr ""
-#: python/configure.py:567
+#: python/configure.py:566
msgid "Video memory size"
msgstr ""
-#: python/configure.py:568
+#: python/configure.py:567
msgid "Offscreen rendering mode"
msgstr ""
-#: python/configure.py:569
+#: python/configure.py:568
msgid "Render target mode lock"
msgstr ""
-#: python/configure.py:570
+#: python/configure.py:569
msgid "Multisampling"
msgstr ""
-#: python/configure.py:571
+#: python/configure.py:570
msgid "Strict Draw Ordering"
msgstr ""
-#: python/configure.py:581
+#: python/configure.py:580
msgid "Mouse warp override"
msgstr ""
-#: python/configure.py:583
+#: python/configure.py:582
msgid "Open a shell"
msgstr ""
-#: python/configure.py:584
+#: python/configure.py:583
msgid "Run a .exe file in this virtual drive"
msgstr ""
-#: python/configure.py:585
+#: python/configure.py:584
msgid "Command to exec before running the program"
msgstr ""
-#: python/configure.py:595
+#: python/configure.py:594
msgid ""
"Warning:\n"
"\n"
@@ -5009,52 +5125,52 @@ msgid ""
"Are you sure you want to continue?"
msgstr ""
-#: python/configure.py:606
+#: python/configure.py:605
msgid ""
"Be careful!\n"
"If you change "
msgstr ""
-#: python/configure.py:666 python/mainwindow.py:973 python/mainwindow.py:975
+#: python/configure.py:665 python/mainwindow.py:973 python/mainwindow.py:975
#, python-brace-format
msgid "{0} configuration"
msgstr ""
-#: python/configure.py:674
+#: python/configure.py:673
msgid "Please select a program or a virtual drive to configure"
msgstr ""
-#: python/configure.py:693 python/configure.py:696 python/options.py:279
+#: python/configure.py:692 python/configure.py:695 python/options.py:279
msgid "New"
msgstr ""
-#: python/configure.py:694 python/configure.py:697 python/mainwindow.py:245
+#: python/configure.py:693 python/configure.py:696 python/mainwindow.py:245
#: python/mainwindow.py:385 python/mainwindow.py:604 python/options.py:206
msgid "Remove"
msgstr ""
-#: python/configure.py:715
+#: python/configure.py:714
msgid "Install components"
msgstr ""
-#: python/configure.py:716 python/mainwindow.py:365
+#: python/configure.py:715 python/mainwindow.py:365
msgid "Display"
msgstr ""
-#: python/configure.py:717
+#: python/configure.py:716
msgid "Miscellaneous"
msgstr ""
-#: python/configure.py:745
+#: python/configure.py:744
msgid "This virtual drive is protected"
msgstr ""
-#: python/configure.py:747
+#: python/configure.py:746
#, python-brace-format
msgid "Are you sure you want to delete {0} virtual drive ?"
msgstr ""
-#: python/configure.py:754
+#: python/configure.py:753
#, python-brace-format
msgid "Are you sure you want to delete {0} ?"
msgstr ""
diff --git a/lib/deprecated.lib b/lib/deprecated.lib
index 9fa4935..92ad11c 100755
--- a/lib/deprecated.lib
+++ b/lib/deprecated.lib
@@ -179,7 +179,7 @@ Set_WineVersion_Assign ()
# Usage: Set_WineVersion_Assign [VERSION] [SHORTCUT]
- prefixold="$WINEPREFIX"
+ local prefixold="$WINEPREFIX"
POL_Debug_Warning "Function deprecated !"
export WINEPREFIX="$POL_USER_ROOT/wineprefix/$(POL_Shortcut_GetPrefix "$2")"
POL_Wine_SetVersionPrefix "$1"
@@ -204,7 +204,7 @@ fonts_to_prefix ()
Use_WineVersion()
{
# Set the good wineversion in PATH
- # No longuer needed, use POL_WINEVERSION variable before calling POL_Wine
+ # No longer needed, use POL_WINEVERSION variable before calling POL_Wine
# Usage: Use_WineVersion [VERSION]
POL_Debug_Warning "Function is deprecated. Use export WINEVERSION instead"
export POL_WINEVERSION="$1"
@@ -224,28 +224,15 @@ POL_SetupWindow_make_shortcut()
# Usage: POL_SetupWindow_make_shortcut [Prefix name] [Program's directory] [Program's file] [POL Website icon] [Name of the sortcut] [Leave empty] [Argument]
POL_Debug_Warning "Deprecated function! Use POL_Shortcut"
-
- creer_lanceur_base "$@"
- if [ ! "$(POL_Config_Read NO_DESKTOP_ICON)" = "TRUE" ]
- then
- if [ "$POL_OS" = "Mac" ] # Ouai, la c'est complètement différent sous linux et sous mac
- then
- if [ "$5" = "" ]
- then
- POL_SetupWindow_AutoApp "$1" "$1"
- else
- POL_SetupWindow_AutoApp "$5" "$1"
- fi
-
+ local PREFIX="$(POL_Wine_GetPrefixFromPath "$WINEPREFIX")"
+ if [ "$1" = "$PREFIX" ]; then
+ POL_Shortcut "$2/$3" "$4" "$5" "$7"
else
-
- if [ -f "$POL_USER_ROOT/icones/full_size/$NOMICONE_" ]; then # L'icone existe...
- iconPath="$POL_USER_ROOT/icones/full_size/$NOMICONE_"
- else
- iconPath="$PLAYONLINUX/etc/playonlinux.png"
- fi
- make_desktop_shortcut "$iconPath" "$NOMICONE_" "$DESKTOP" "$PLAYONLINUX/playonlinux --run \"$NOMICONE_\"" "$NOMICONE_"
- fi
+ # Are there real use cases?
+ POL_Debug_Warning "Temporarily set prefix to $1 as requested"
+ POL_Wine_SelectPrefix "$1"
+ POL_Shortcut "$2/$3" "$4" "$5" "$7"
+ POL_Wine_SelectPrefix "$PREFIX"
fi
}
@@ -253,73 +240,18 @@ POL_SetupWindow_auto_shortcut()
{
# Make a shortcut into PlayOnLinux, easier using than POL_SetupWindow_make_shortcut
# Use POL_Shortcut
- # Usage: POL_SetupWindow_make_shortcut [Prefix name] [Program's binary file] [Name of the sortcut] [POL Website icon] [Argument]
+ # Usage: POL_SetupWindow_auto_shortcut [Prefix name] [Program's binary file] [Name of the shortcut] [POL Website icon] [Argument]
- POL_Debug_Warning "POL_SetupWindow_auto_shortcut is deprecated"
- Binaire="$2"
- SpecialArg="$5"
-
- if [ "$3" = "" ]
- then
- NOMICONE_="$1"
- else
- NOMICONE_="$3"
- fi
-
- mkdir -p "$POL_USER_ROOT/icones/32"
- mkdir -p "$POL_USER_ROOT/icones/full_size"
-
- ICON_WEB_NAME="$4"
- ICON_OK=0
-
- ## On chope le dossier du binaire
- cd "$POL_USER_ROOT/wineprefix/$1" || POL_SetupError "Prefixe $1 does not exists"
- cd drive_c || POL_SetupError "drive_c folder does not exists"
- binary_path=$(find ./ -iname "$Binaire" | tail -n 1)
- binary_dir=$(dirname "$binary_path")
- Binaire=$(basename "$binary_path")
- [ "$binary_dir" = "" ] && POL_SetupError "Can't find $Binaire"
-
- if [ -n "$ICON_WEB_NAME" ]; then
- if [ ! "$OFFLINE" = "1" ]; then # On peut le télécharger...
- $POL_WGET "$SITE/icones/$ICON_WEB_NAME" -O- > "$POL_USER_ROOT/icones/full_size/$NOMICONE_" || rm "$POL_USER_ROOT/icones/full_size/$NOMICONE_" # On prend l'icone full size
- fi
-
- if [ -f "$POL_USER_ROOT/icones/full_size/$NOMICONE_" ]; then
- convert -resize 32 "$POL_USER_ROOT/icones/full_size/$NOMICONE_" "$POL_USER_ROOT/icones/32/$NOMICONE_" # On fabrique l'icone 32*32
- ICON_OK=1
- fi
- elif [ "$ICON_OK" -ne 1 ]; then # Pas d'incone sur le web => Création à partir de l'exe...
- echo "No internet icon..."
-
- POL_ExtractIcon "$POL_USER_ROOT/wineprefix/$1/drive_c/$binary_dir/$Binaire" "$POL_USER_ROOT/icones/32/$NOMICONE_"
-
- # On ne crée pas d'icone "full_size", parce que les résolutions des icones windows ne sont pas suffisantes tout le temps.
- # Pour verifier la taille des icones, il faudrait utiliser "identify", mais ce programme n'est pas toujours fournis.
- fi
-
- ## On génère le binaire
- echo "#!/bin/bash" > "$POL_USER_ROOT/shortcuts/$NOMICONE_"
- echo "[ \"\$PLAYONLINUX\" = \"\" ] && exit 0" >> "$POL_USER_ROOT/shortcuts/$NOMICONE_"
- echo "source \"\$PLAYONLINUX/lib/sources\"" >> "$POL_USER_ROOT/shortcuts/$NOMICONE_"
- echo "export WINEPREFIX=\"$POL_USER_ROOT/wineprefix/$1\"" >> "$POL_USER_ROOT/shortcuts/$NOMICONE_"
- echo "export WINEDEBUG=\"-all\"" >> "$POL_USER_ROOT/shortcuts/$NOMICONE_"
- echo "cd \"$POL_USER_ROOT/wineprefix/$1/drive_c/$binary_dir\"" >> "$POL_USER_ROOT/shortcuts/$NOMICONE_"
- echo "POL_Wine \"$Binaire\" $SpecialArg \$@" >> "$POL_USER_ROOT/shortcuts/$NOMICONE_"
- chmod +x "$POL_USER_ROOT/shortcuts/$NOMICONE_"
- if [ ! "$(POL_Config_Read NO_DESKTOP_ICON)" = "TRUE" ]
- then
- if [ "$POL_OS" = "Mac" ]
- then
- POL_SetupWindow_AutoApp "$3" "$1"
+ POL_Debug_Warning "Deprecated function! Use POL_Shortcut"
+ local PREFIX="$(POL_Wine_GetPrefixFromPath "$WINEPREFIX")"
+ if [ "$1" = "$PREFIX" ]; then
+ POL_Shortcut "$2" "$3" "$4" "$5"
else
- if [ -f "$POL_USER_ROOT/icones/full_size/$NOMICONE_" ]; then # L'icone existe...
- iconPath="$POL_USER_ROOT/icones/full_size/$NOMICONE_"
- else
- iconPath="$PLAYONLINUX/etc/playonlinux.png"
- fi
- make_desktop_shortcut "$iconPath" "$NOMICONE_" "$DESKTOP" "$PLAYONLINUX/playonlinux --run \"$NOMICONE_\""
- fi
+ # Are there real use cases?
+ POL_Debug_Warning "Temporarily set prefix to $1 as requested"
+ POL_Wine_SelectPrefix "$1"
+ POL_Shortcut "$2" "$3" "$4" "$5"
+ POL_Wine_SelectPrefix "$PREFIX"
fi
}
POL_SetupWindow_shortcut()
@@ -344,75 +276,6 @@ POL_SetupError()
-creer_lanceur_base ()
-{
- # Needed for POL_SetupWindow_make_shortcut
- # Usage: POL_SetupWindow_make_shortcut [Prefix name] [Program's directory] [Program's file] [POL Website icon] [Name of the sortcut] [Leave empty] [Argument]
-
- # 1 = Wineprefix
- # 2 = Repertoire
- # 3 = Binaire
- # 4 = Icone (png ou xpm)
- # 5 = Nom de l'icône
- # 6 = Ignoré (question de compatibilité avec les versions < 2.0)
- # 7 = Eventuel argument
-
- Binaire="$3"
- SpecialArg="$7"
-
- if [ "$5" = "" ]
- then
- NOMICONE_="$1"
- else
- NOMICONE_="$5"
- fi
-
- mkdir -p "$POL_USER_ROOT/icones/32"
- mkdir -p "$POL_USER_ROOT/icones/full_size"
-
- ICON_WEB_NAME="$4"
- ICON_OK=0
-
-
- # Création de l'icone.
-
- # Cas 1 : le nom de l'icone est donné.
- if [ -n "$ICON_WEB_NAME" ]; then
- if [ ! "$OFFLINE" = "1" ]; then # On peut le télécharger...
- $POL_WGET "$SITE/icones/$ICON_WEB_NAME" -O "$POL_USER_ROOT/icones/full_size/$NOMICONE_" # On prend l'icone full size
- fi
-
- if [ -f "$POL_USER_ROOT/icones/full_size/$NOMICONE_" ]; then
- convert -resize 32 "$POL_USER_ROOT/icones/full_size/$NOMICONE_" "$POL_USER_ROOT/icones/32/$NOMICONE_" # On fabrique l'icone 32*32
- ICON_OK=1
- fi
- elif [ "$ICON_OK" -ne 1 ]; then # Pas d'incone sur le web => Création à partir de l'exe...
- echo "No iternet icon..."
-
- mkdir -p "$POL_USER_ROOT/tmp/win32Icon"
- wrestool -x "$POL_USER_ROOT/wineprefix/$1/drive_c/$2/$Binaire" -o "$POL_USER_ROOT/tmp/win32Icon" -t14
-
- cd "$POL_USER_ROOT/tmp/win32Icon"
- win32IconName=$(ls -S *.ico | head -n 1)
- if [ -f "$win32IconName" ]; then # L'ico est créé
- convert ICO:"$win32IconName" -resize 32 PNG:"$POL_USER_ROOT/icones/32/$NOMICONE_" # On fabrique l'icone 32*32
- fi # Si non : icone play on linux.
-
- rm -r "$POL_USER_ROOT/tmp/win32Icon"
-
- # On ne crée pas d'icone "full_size", parce que les résolutions des icones windows ne sont pas suffisantes tout le temps.
- # Pour verifier la taille des icones, il faudrait utiliser "identify", mais ce programme n'est pas toujours fournis.
- fi
-
- echo "#!/bin/bash" > "$POL_USER_ROOT/shortcuts/$NOMICONE_"
- echo "[ \"\$PLAYONLINUX\" = \"\" ] && exit 0" >> "$POL_USER_ROOT/shortcuts/$NOMICONE_"
- echo "source \"\$PLAYONLINUX/lib/sources\"" >> "$POL_USER_ROOT/shortcuts/$NOMICONE_"
- echo "export WINEPREFIX=\"$POL_USER_ROOT/wineprefix/$1\"" >> "$POL_USER_ROOT/shortcuts/$NOMICONE_"
- echo "export WINEDEBUG=\"-all\"" >> "$POL_USER_ROOT/shortcuts/$NOMICONE_"
- echo "cd \"$POL_USER_ROOT/wineprefix/$1/drive_c/$2\"" >> "$POL_USER_ROOT/shortcuts/$NOMICONE_"
- echo "POL_Wine \"$Binaire\" $SpecialArg \$@" >> "$POL_USER_ROOT/shortcuts/$NOMICONE_"
- chmod +x "$POL_USER_ROOT/shortcuts/$NOMICONE_"
-}
POL_SetupWindow_get_local_icon ()
{
# Get a local icon (.local folder) and assign it to a shortcut
diff --git a/lib/playonlinux.lib b/lib/playonlinux.lib
index 9a520a1..00092c2 100755
--- a/lib/playonlinux.lib
+++ b/lib/playonlinux.lib
@@ -207,7 +207,7 @@ POL_Config_DosPrefixRead ()
POL_Notice_IsAck ()
{
# Check if some notice has been acknowledged
- grep -q -F "$1" "$POL_USER_ROOT/configurations/ack_notices" >&2
+ grep -q -F "$1" "$POL_USER_ROOT/configurations/ack_notices" 2> /dev/null
}
POL_Notice_Ack ()
{
diff --git a/lib/scripts.lib b/lib/scripts.lib
index 4d87171..64df6f7 100755
--- a/lib/scripts.lib
+++ b/lib/scripts.lib
@@ -767,13 +767,12 @@ POL_System_cpmv ()
local dest="$2"
local filename=`basename "$file"`
- #local szpid
case "$op" in
cp)
- POL_Debug_Message "Copying single file : \"$archive\", \"$file\", \"$dest\""
+ POL_Debug_Message "Copying single file : \"$file\", \"$dest\""
;;
mv)
- POL_Debug_Message "Moving single file : \"$archive\", \"$file\", \"$dest\""
+ POL_Debug_Message "Moving single file : \"$file\", \"$dest\""
;;
*)
POL_Debug_Fatal "POL_System_cpmv: bad operation `$op`"
diff --git a/lib/wine.lib b/lib/wine.lib
index 3152698..7414949 100755
--- a/lib/wine.lib
+++ b/lib/wine.lib
@@ -214,16 +214,15 @@ Set_SoundDriver ()
{
# Set the sound driver
# Usage: Set_SoundDriver [Driver]
+ # Use an empty string parameter to disable sound
# Disabled in Mac OS
POL_Debug_Message "Setting wine SoundDriver $@"
[ -z "$WINEPREFIX" ] && POL_Debug_Fatal "WINEPREFIX not set"
- if [ -n "$1" ]; then
- if [ "$POL_OS" = "Linux" ]; then
- POL_Wine_UpdateRegistryWinePair 'Drivers' 'Audio' "$1"
- else
- POL_Debug_Message "Set_SoundDriver disabled on $POL_OS"
- fi
+ if [ "$POL_OS" = "Linux" ]; then
+ POL_Wine_UpdateRegistryWinePair 'Drivers' 'Audio' "$1"
+ else
+ POL_Debug_Message "Set_SoundDriver disabled on $POL_OS"
fi
}
@@ -1078,6 +1077,34 @@ EOF
POL_Wine regedit "$POL_USER_ROOT/tmp/del-app-dll-override.reg"
rm "$POL_USER_ROOT/tmp/del-app-dll-override.reg"
}
+POL_Wine_RedirectDLL()
+{
+ # Redirect DLLs wine-staging feature
+ # https://github.com/wine-compholio/wine-staging/wiki/DLL-Redirects
+ local SOURCE="$1"
+ local TARGET="$2"
+ POL_Wine_UpdateRegistryWinePair 'DllRedirects' "$SOURCE" "$TARGET"
+}
+POL_Wine_DelRedirectDLL()
+{
+ local SOURCE="$1"
+ POL_Wine_UpdateRegistryWinePair 'DllRedirects' "$SOURCE" 'default'
+}
+POL_Wine_RedirectDLL_App()
+{
+ # App-specific DLL redirect
+ local APP="$1"
+ local SOURCE="$2"
+ local TARGET="$3"
+ POL_Wine_UpdateRegistryWinePair "AppDefaults\\$APP\\DllRedirects" "$SOURCE" "$TARGET"
+}
+POL_Wine_DelRedirectDLL_App()
+{
+ # App-specific DLL redirect
+ local APP="$1"
+ local SOURCE="$2"
+ POL_Wine_UpdateRegistryWinePair "AppDefaults\\$APP\\DllRedirects" "$SOURCE" 'default'
+}
POL_Wine_WaitBefore ()
{
# Lock bash commands until wine is exited
diff --git a/python/configure.py b/python/configure.py
index cd622b5..468b2a4 100755
--- a/python/configure.py
+++ b/python/configure.py
@@ -113,10 +113,6 @@ class Onglets(wx.Notebook):
def evt_winecfg(self, event):
self.winebash("winecfg")
- def evt_uninstall(self, event):
- wx.MessageBox(_("Warning:\n\nThis tool is for advanced users.\nTo uninstall cleanly a program with {0}, you must delete the virtual drive associated").format(os.environ["APPLICATION_TITLE"]),os.environ["APPLICATION_TITLE"])
- self.winebash("uninstaller")
-
def evt_regedit(self, event):
self.winebash("regedit")
@@ -142,7 +138,10 @@ class Onglets(wx.Notebook):
def evt_killall(self, event):
self.winebash("wineserver -k")
-
+
+ def evt_control(self, event):
+ self.winebash("control")
+
def evt_config(self, event):
subprocess.Popen(["bash", Variables.playonlinux_rep+"/configurations/configurators/"+self.s_title])
@@ -260,7 +259,6 @@ class Onglets(wx.Notebook):
self.updatep_texte.SetFont(self.caption_font)
-
self.cmd_image = wx.Image( Variables.playonlinux_env+"/resources/images/configure/console.png", wx.BITMAP_TYPE_ANY).ConvertToBitmap()
self.cmd = wx.BitmapButton(self.panelWine, id=103, bitmap=self.cmd_image,pos=(30, 196), size = (self.cmd_image.GetWidth()+5, self.cmd_image.GetHeight()+5))
self.cmd_texte = wx.StaticText(self.panelWine, -1, _("Command prompt"), (32,302), style=wx.ALIGN_CENTER)
@@ -283,12 +281,13 @@ class Onglets(wx.Notebook):
self.killall_texte.SetPosition((self.killall_texte.GetPosition()[0]+(105-self.killall_texte.GetSize()[0])/2,self.killall_texte.GetPosition()[1]))
self.killall_texte.SetFont(self.caption_font)
- self.uninstall_image = wx.Image( Variables.playonlinux_env+"/resources/images/configure/wine-uninstaller.png", wx.BITMAP_TYPE_ANY).ConvertToBitmap()
- self.uninstall = wx.BitmapButton(self.panelWine, id=108, bitmap=self.uninstall_image,pos=(438, 196), size = (self.wineboot_image.GetWidth()+5, self.uninstall_image.GetHeight()+5))
- self.uninstall_texte = wx.StaticText(self.panelWine, -1, _("Wine uninstaller"), (440,302), style=wx.ALIGN_CENTER)
- self.uninstall_texte.Wrap(110)
- self.uninstall_texte.SetPosition((self.uninstall_texte.GetPosition()[0]+(105-self.wineboot_texte.GetSize()[0])/2,self.uninstall_texte.GetPosition()[1]))
- self.uninstall_texte.SetFont(self.caption_font)
+ self.control_image = wx.Image( Variables.playonlinux_env+"/resources/images/configure/control.png", wx.BITMAP_TYPE_ANY).ConvertToBitmap()
+ self.control = wx.BitmapButton(self.panelWine, id=108, bitmap=self.control_image,pos=(438, 196), size = (self.control_image.GetWidth()+5, self.control_image.GetHeight()+5))
+ self.control_texte = wx.StaticText(self.panelWine, -1, _("Control panel"), (440,302), style=wx.ALIGN_CENTER)
+ self.control_texte.Wrap(110)
+ self.control_texte.SetPosition((self.control_texte.GetPosition()[0]+(105-self.control_texte.GetSize()[0])/2,self.control_texte.GetPosition()[1]))
+
+ self.control_texte.SetFont(self.caption_font)
wx.EVT_BUTTON(self, 100, self.evt_winecfg)
@@ -299,7 +298,7 @@ class Onglets(wx.Notebook):
wx.EVT_BUTTON(self, 105, self.evt_killall)
wx.EVT_BUTTON(self, 106, self.evt_config)
wx.EVT_BUTTON(self, 107, self.evt_rep)
- wx.EVT_BUTTON(self, 108, self.evt_uninstall)
+ wx.EVT_BUTTON(self, 108, self.evt_control)
def Packages(self, nom):
diff --git a/python/lib/Variables.py b/python/lib/Variables.py
index 3453182..a9470b7 100755
--- a/python/lib/Variables.py
+++ b/python/lib/Variables.py
@@ -16,7 +16,7 @@ except:
os.environ["POL_PORT"] = "0"
os.environ["PLAYONLINUX"] = os.path.realpath(os.path.realpath(__file__)+"/../../../")
os.environ["SITE"] = "http://repository.playonlinux.com"
-os.environ["VERSION"] = "4.2.9"
+os.environ["VERSION"] = "4.2.10"
os.environ["POL_ID"] = str(random.randint(1, 100000000))
os.environ["WINE_SITE"] = "http://wine.playonlinux.com/binaries"
os.environ["GECKO_SITE"] = "http://wine.playonlinux.com/gecko"
diff --git a/resources/images/configure/control.png b/resources/images/configure/control.png
new file mode 100644
index 0000000..8218483
Binary files /dev/null and b/resources/images/configure/control.png differ
diff --git a/resources/images/menu/extensions.png b/resources/images/menu/extensions.png
index 557bdaf..e5bc999 100644
Binary files a/resources/images/menu/extensions.png and b/resources/images/menu/extensions.png differ
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/playonlinux.git
More information about the Pkg-games-commits
mailing list