summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/network/network.pm27
1 files changed, 15 insertions, 12 deletions
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm
index cc6286f07..7e69b5b23 100644
--- a/perl-install/network/network.pm
+++ b/perl-install/network/network.pm
@@ -337,19 +337,22 @@ sub proxy_configure {
chmod 0755, "$::prefix/etc/profile.d/proxy.csh";
#- KDE proxy settings
- my $kde_config_file = "$::prefix/usr/share/config/kioslaverc";
- update_gnomekderc($kde_config_file,
- undef,
- PersistentProxyConnection => "false"
- );
- update_gnomekderc($kde_config_file,
- "Proxy Settings",
- AuthMode => 0,
- ProxyType => $u->{http_proxy} || $u->{ftp_proxy} ? 4 : 0,
- ftpProxy => "ftp_proxy",
- httpProxy => "http_proxy",
- httpsProxy => "http_proxy"
+ my $kde_config_dir = "$::prefix/usr/share/config";
+ my $kde_config_file = "$kde_config_dir/kioslaverc";
+ if (-d $kde_config_dir) {
+ update_gnomekderc($kde_config_file,
+ undef,
+ PersistentProxyConnection => "false"
+ );
+ update_gnomekderc($kde_config_file,
+ "Proxy Settings",
+ AuthMode => 0,
+ ProxyType => $u->{http_proxy} || $u->{ftp_proxy} ? 4 : 0,
+ ftpProxy => "ftp_proxy",
+ httpProxy => "http_proxy",
+ httpsProxy => "http_proxy"
);
+ }
#- Gnome proxy settings
if (-d "$::prefix/etc/gconf/2/") {
pan='5' class='logmsg'> * - Fix some stringsAhmad Samir2011-04-241-9/+9 | * replace Mageia Linux by MageiaAnne Nicolas2011-04-2471-800/+800 | * Update translation files.Anssi Hannula2011-04-1771-9404/+9386 | * - fixed header so msgfmt wont give any errorsOliver Burger2011-04-161-4/+3 | * - any.pm: make it easier for rebranding by using %s magicAhmad Samir2011-04-0771-780/+1142 | | | | | - update po/pot files * - s/Ldap/LDAP/ in the po/pot files manually so as not to fuzzy the strings ↵Ahmad Samir2011-04-0771-174/+174 | | | | unnecessarily * - s/can not/cannot/ manually in the po/pot files so as not the make the stringsAhmad Samir2011-04-0771-923/+923 | | | | | unnecessarily fuzzy (from Thierry Vignaud) * - revert 's,/boot partition,separate /boot partition,', .po/pot files shouldn'tAhmad Samir2011-04-0571-214/+214 | | | | | | be changed this way as this changes the meaning of the string and translators need to adapt the .po files themselves * - 's!Just select your tv card parameters!Just select your TV card parameters!'Ahmad Samir2011-04-0471-72/+72 | * - s/api/API/Ahmad Samir2011-04-0471-171/+171 | * - perl -pi -e 's!trouble shoot!troubleshoot!'Ahmad Samir2011-04-0471-143/+143 | * - perl -pi -e 's!you can pick one in the above list!you can pick one from ↵Ahmad Samir2011-04-0471-71/+71 | | | | the above list!' * - perl -pi -e 's!For this, create a partition!To accomplish this, create a ↵Ahmad Samir2011-04-0471-71/+71 | | | | partition!' * - perl -pi -e 's!"Search new servers"!"Search for new servers"!'Ahmad Samir2011-04-0471-71/+71 | * - perl -pi -e 's!Something bad is happening on your drive!Something bad is ↵Ahmad Samir2011-04-0471-71/+71 | | | | happening on your hard disk drive!' * - perl -pi -e 's!"Activate ethernet cards promiscuity check."!"Activate ↵Ahmad Samir2011-04-0471-71/+71 | | | | Ethernet cards promiscuity check."!' * - perl -pi -e 's!Posix!POSIX!'Ahmad Samir2011-04-0471-87/+87 | * - perl -pi -e 's!Hard drive!Hard disk drive!' (except install/steps_list.pm)Ahmad Samir2011-04-0471-71/+71 | * - perl -pi -e 's!need to reboot before the modification can take ↵Ahmad Samir2011-04-0471-142/+142 | | | | | | | place"!"need to reboot before the modification can take effect"!' - perl -pi -e 's!"You need to reboot for the partition table modifications to take place"!"You need to reboot for the partition table modifications to take effect"!' * - perl -pi -e 's!"All data on this partition should be backed-up"!"All data ↵Ahmad Samir2011-04-0471-71/+71 | | | | on this partition should be backed up"!' * - perl -pi -e 's!"Check bad blocks\?"!"Check for bad blocks\?"!'Ahmad Samir2011-04-0471-71/+71 | * - perl -pi -e 's!"Do you want to save /etc/fstab modifications"!"Do you want ↵Ahmad Samir2011-04-0471-71/+71 | | | | to save the /etc/fstab modifications?"!' * - perl -pi -e 's!mountpoint!mount point!'Ahmad Samir2011-04-0471-71/+71 | * - perl -pi -e 's!hard drive!hard disk drive!'Ahmad Samir2011-04-0471-302/+302 | * String changes: perl -pi -e 's!file system!filesystem!'Ahmad Samir2011-04-0471-717/+717 | * String changes: perl -pi -e 's!"Password should resist to basic ↵Ahmad Samir2011-04-0471-71/+71 | | | | attacks"!"Password should be resistant to basic attacks"!' * - string changes: perl -pi -e 's!Can not!Cannot!'Ahmad Samir2011-04-0471-285/+285 | * - string changes: perl -pi -e 's!/boot partition!separate /boot partition!'Ahmad Samir2011-04-0471-214/+214 | * - update the .po filesAhmad Samir2011-04-0270-53090/+48564 | * - modify a string in partitioning_wizard.pm to be more grammatically correctAhmad Samir2011-04-021-672/+608 | | | | | (spotted by Sigrid Carrera, on mageia-i18n ML) * Fix pot fileDexter Morgan2011-03-3071-151/+239 | * correct and remove google licenseAnne Nicolas2011-02-1170-4609/+5247 | * Synthesized commit during git-svn import combining previous Mandriva history ↵Mageia SVN-Git Migration2011-02-06