Hello community, here is the log from the commit of package yast2-ftp-server for openSUSE:Factory checked in at 2012-03-30 14:21:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-ftp-server (Old) and /work/SRC/openSUSE:Factory/.yast2-ftp-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-ftp-server", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-ftp-server/yast2-ftp-server.changes 2011-10-04 18:01:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-ftp-server.new/yast2-ftp-server.changes 2012-03-30 14:21:10.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Mar 29 14:56:18 CEST 2012 - [email protected] + +- merged proofed texts +- confirmed license +- 2.22.0 + +------------------------------------------------------------------- Old: ---- yast2-ftp-server-2.21.1.tar.bz2 New: ---- yast2-ftp-server-2.22.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ftp-server.spec ++++++ --- /var/tmp/diff_new_pack.kNgKGh/_old 2012-03-30 14:21:11.000000000 +0200 +++ /var/tmp/diff_new_pack.kNgKGh/_new 2012-03-30 14:21:11.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-ftp-server # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,54 +15,54 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: yast2-ftp-server -Version: 2.21.1 +Version: 2.22.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ftp-server-2.21.1.tar.bz2 - -Prefix: /usr +Source0: yast2-ftp-server-%{version}.tar.bz2 -Group: System/YaST -License: GPL-2.0+ # Wizard::SetDesktopTitleAndIcon Requires: yast2 >= 2.21.22 Requires: yast2-inetd -BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-inetd yast2-testsuite +BuildRequires: perl-XML-Writer +BuildRequires: update-desktop-files +BuildRequires: yast2 +BuildRequires: yast2-devtools +BuildRequires: yast2-inetd +BuildRequires: yast2-testsuite BuildArch: noarch Summary: YaST2 - FTP configuration +License: GPL-2.0 +Group: System/YaST %description This package contains the YaST2 component for FTP configuration. It can configure two daemons: pure-ftpd and vsftpd. %prep -%setup -n yast2-ftp-server-2.21.1 +%setup -n yast2-ftp-server-%{version} %build -%{prefix}/bin/y2tool y2autoconf -%{prefix}/bin/y2tool y2automake +%{_prefix}/bin/y2tool y2autoconf +%{_prefix}/bin/y2tool y2automake autoreconf --force --install export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" -%{?suse_update_config:%{suse_update_config -f}} -./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} +./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) # so that RPM_OPT_FLAGS check works make %{?jobs:-j%jobs} V=1 %install make install DESTDIR="$RPM_BUILD_ROOT" -[ -e "%{prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT" -for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name "*.desktop"` ; do +[ -e "%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT" +for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/ -name "*.desktop"` ; do d=${f##*/} %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} done @@ -77,9 +77,9 @@ /usr/share/YaST2/clients/ftp-server.ycp /usr/share/YaST2/clients/ftp-server_*.ycp /usr/share/YaST2/modules/FtpServer.* -%{prefix}/share/applications/YaST2/ftp-server.desktop +%{_prefix}/share/applications/YaST2/ftp-server.desktop /usr/share/YaST2/schema/autoyast/rnc/ftp-server.rnc /usr/share/YaST2/scrconf/*.scr -%doc %{prefix}/share/doc/packages/yast2-ftp-server +%doc %{_prefix}/share/doc/packages/yast2-ftp-server %changelog ++++++ yast2-ftp-server-2.21.1.tar.bz2 -> yast2-ftp-server-2.22.0.tar.bz2 ++++++ ++++ 2794 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ftp-server-2.21.1/Makefile.am new/yast2-ftp-server-2.22.0/Makefile.am --- old/yast2-ftp-server-2.21.1/Makefile.am 2011-09-26 11:17:12.000000000 +0200 +++ new/yast2-ftp-server-2.22.0/Makefile.am 2012-03-29 14:57:57.000000000 +0200 @@ -20,7 +20,6 @@ IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) COPYRIGHT_files_gpl = README COPYING @@ -155,7 +154,7 @@ $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ done -package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local +package: check-up-to-date check-tagversion check-textdomain package-local TAGVERSION = $(Y2TOOL) tagversion @@ -185,21 +184,6 @@ check-parse: @echo "Not running parseycp." -check-all-packages: - @if [ ! -e "$(ALL_PACKAGES)" ]; then \ - echo ERROR: "Can't find $(ALL_PACKAGES)"; false; \ - fi - @if ! grep -q "^$(RPMNAME)[[:space:]]" $(ALL_PACKAGES); then \ - echo ERROR: "$(RPMNAME) not in $(ALL_PACKAGES)"; false; \ - fi - @if grep -q "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); then \ - echo ERROR: "$(RPMNAME) info in $(ALL_PACKAGES) contains some unknown (?) fields:"; \ - echo; \ - grep "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); \ - echo; \ - false; \ - fi - check-textdomain: $(Y2TOOL) check-textdomain $(srcdir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ftp-server-2.21.1/VERSION new/yast2-ftp-server-2.22.0/VERSION --- old/yast2-ftp-server-2.21.1/VERSION 2011-09-26 11:16:58.000000000 +0200 +++ new/yast2-ftp-server-2.22.0/VERSION 2012-03-29 14:57:55.000000000 +0200 @@ -1 +1 @@ -2.21.1 +2.22.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ftp-server-2.21.1/configure.in new/yast2-ftp-server-2.22.0/configure.in --- old/yast2-ftp-server-2.21.1/configure.in 2011-09-26 11:17:11.000000000 +0200 +++ new/yast2-ftp-server-2.22.0/configure.in 2012-03-29 14:57:56.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-ftp-server dnl -dnl -- This file is generated by y2autoconf 2.21.0 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.21.8 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-ftp-server, 2.21.1, http://bugs.opensuse.org/, yast2-ftp-server) +AC_INIT(yast2-ftp-server, 2.22.0, http://bugs.opensuse.org/, yast2-ftp-server) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.21.1" +VERSION="2.22.0" RPMNAME="yast2-ftp-server" MAINTAINER="YaST2 Maintainers <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ftp-server-2.21.1/src/FtpServer.ycp new/yast2-ftp-server-2.22.0/src/FtpServer.ycp --- old/yast2-ftp-server-2.21.1/src/FtpServer.ycp 2011-09-26 11:16:59.000000000 +0200 +++ new/yast2-ftp-server-2.22.0/src/FtpServer.ycp 2012-03-29 14:56:08.000000000 +0200 @@ -890,8 +890,8 @@ if ((vsftpd_installed)&&(pureftpd_installed)) { if (CommandLine::Interactive()) { CommandLine::Print(String::UnderlinedHeader(_("You have installed both daemons:"), 0)); - CommandLine::Print(_("Please choose one of them for configuration.")); - CommandLine::Print(_("Do you want to configure vsftpd? Alternatively choose pure-ftpd")); + CommandLine::Print(_("Choose one of them for configuration.")); + CommandLine::Print(_("Do you want to configure vsftpd? Alternatively choose pure-ftpd.")); CommandLine::Print(""); if (CommandLine::YesNo()) vsftpd_edit = true; @@ -980,7 +980,7 @@ if (PollAbort()) return false; Progress::NextStage (); // write settings for starting daemon - if (!WriteUpload ()) Report::Error (_("Cannot create upload directory for anonymous connections!")); + if (!WriteUpload ()) Report::Error (_("Cannot create upload directory for anonymous connections.")); sleep(sl); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ftp-server-2.21.1/src/complex.ycp new/yast2-ftp-server-2.22.0/src/complex.ycp --- old/yast2-ftp-server-2.21.1/src/complex.ycp 2011-09-26 11:16:59.000000000 +0200 +++ new/yast2-ftp-server-2.22.0/src/complex.ycp 2012-03-29 14:56:08.000000000 +0200 @@ -79,9 +79,9 @@ UI::OpenDialog( `RadioButtonGroup(`id("IntstallFTPd"), `VBox( - `Heading (_("No server package installed")), - `Left(`Label(_("Please choose an ftp daemon."))), - `Left(`Label(_("Press Cancel to cancel the configuration of the ftp."))), + `Heading (_("No server package installed.")), + `Left(`Label(_("Choose an FTP daemon."))), + `Left(`Label(_("Press Cancel to cancel FTP configuration."))), `Left(`RadioButton(`id(0), `opt(`notify), _("&vsftpd"), true)), `Left(`RadioButton(`id(1), `opt(`notify), _("&pure-ftpd"))), `HBox( @@ -142,11 +142,11 @@ vsftpd_init_count = vsftpd_init_count + 1; } } else if (result == false) { - Popup::Error(_("Package for ftp is not available.")); + Popup::Error(_("Package for FTP is not available.")); y2milestone("[ftp-server] Package for ftp is not available"); return false; } else if (result == nil) { - Popup::Error(_("Package not found")); + Popup::Error(_("Package not found.")); y2milestone("[ftp-server] Package was not found"); return false; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ftp-server-2.21.1/src/dialogs.ycp new/yast2-ftp-server-2.22.0/src/dialogs.ycp --- old/yast2-ftp-server-2.21.1/src/dialogs.ycp 2011-09-26 11:16:59.000000000 +0200 +++ new/yast2-ftp-server-2.22.0/src/dialogs.ycp 2012-03-29 14:56:08.000000000 +0200 @@ -75,8 +75,8 @@ map<string,any> StartStop () { map<string,any> result = $[]; result["service_id"] = "vsftpd"; - result["service_running_label"] = _("ftp is running"); - result["service_not_running_label"] = _("ftp is not running"); + result["service_running_label"] = _("FTP is running"); + result["service_not_running_label"] = _("FTP is not running"); result["start_now_button"] = _("&Start FTP Now"); result["stop_now_button"] = _("S&top FTP Now"); result["save_now_action"] = SaveAndRestartVsftpd; @@ -85,11 +85,11 @@ result["stop_now_action"] = StopNowVsftpd; result["help"] = sformat (CWMServiceStart::StartStopHelpTemplate (true), // part of help text - push button label, NO SHORTCUT!!! - _("Start FTP daemon Now"), + _("Start FTP Daemon Now"), // part of help text - push button label, NO SHORTCUT!!! - _("Stop FTP daemon Now"), + _("Stop FTP Daemon Now"), // part of help text - push button label, NO SHORTCUT!!! - _("Save Settings and Restart FTP daemon Now")); + _("Save Settings and Restart FTP Daemon Now")); return result; } @@ -104,8 +104,8 @@ map<string,any> StartStopPure () { map<string,any> result = $[]; result["service_id"] = "pure-ftpd"; - result["service_running_label"] = _("ftp is running"); - result["service_not_running_label"] = _("ftp is not running"); + result["service_running_label"] = _("FTP is running"); + result["service_not_running_label"] = _("FTP is not running"); result["start_now_button"] = _("&Start FTP Now"); result["stop_now_button"] = _("S&top FTP Now"); result["save_now_action"] = SaveAndRestartPure; @@ -114,11 +114,11 @@ result["stop_now_action"] = StopNowPure; result["help"] = sformat (CWMServiceStart::StartStopHelpTemplate (true), // part of help text - push button label, NO SHORTCUT!!! - _("Start FTP daemon Now"), + _("Start FTP Daemon Now"), // part of help text - push button label, NO SHORTCUT!!! - _("Stop FTP daemon Now"), + _("Stop FTP Daemon Now"), // part of help text - push button label, NO SHORTCUT!!! - _("Save Settings and Restart FTP daemon Now")); + _("Save Settings and Restart FTP Daemon Now")); return result; } @@ -319,7 +319,7 @@ map<string,any> FtpDirAnon () { map<string,any> result = $[]; - result["label"] = _("Ftp Directory for Anon&ymous Users"); + result["label"] = _("FTP Directory for Anon&ymous Users"); result["widget"] = `textentry; result["opt"] = [`notify]; result["init"] = InitFtpDirAnon; @@ -364,7 +364,7 @@ map<string,any> FtpDirLocal () { map<string,any> result = $[]; - result["label"] = _("&Ftp Directory for Authenticated Users"); + result["label"] = _("&FTP Directory for Authenticated Users"); result["widget"] = `textentry; result["opt"] = [`notify]; result["init"] = InitFtpDirLocal; @@ -798,7 +798,7 @@ map<string,any> CertFile () { map<string,any> result = $[]; - result["label"] = _("D&SA Certificate to Use for SSL Encrypted Connections"); + result["label"] = _("D&SA Certificate to Use for SSL-encrypted Connections"); result["widget"] = `textentry; result["init"] = InitCertFile; result["validate_type"] = `function; @@ -908,7 +908,7 @@ `VStretch () ); // TRANSLATORS: part of dialog caption - result["caption"] = _("FTP Start-Up"); + result["caption"] = _("FTP Start-up"); // TRANSLATORS: tree menu item result["tree_item_label"] = _("Start-Up"); result["widget_names"] = ["StartMode", "StartStop", "RBVsPureFTPd", "StartStopRestart"]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ftp-server-2.21.1/src/ftp-server.ycp new/yast2-ftp-server-2.22.0/src/ftp-server.ycp --- old/yast2-ftp-server-2.21.1/src/ftp-server.ycp 2011-09-26 11:16:59.000000000 +0200 +++ new/yast2-ftp-server-2.22.0/src/ftp-server.ycp 2012-03-29 14:56:08.000000000 +0200 @@ -44,14 +44,14 @@ //start-up settings CommandLine::PrintNoCR(_("Start-Up:")); if (GetStartedViaXinetd ()) { - CommandLine::Print(_("Ftp daemon is started via xinetd")); + CommandLine::Print(_("FTP daemon is started via xinetd.")); } else { if (GetEnableService()) { // TRANSLATORS: CommandLine informative text - CommandLine::Print(_("Ftp daemon is enabled in the boot process")); + CommandLine::Print(_("FTP daemon is enabled in the boot process.")); } else { // TRANSLATORS: CommandLine informative text - CommandLine::Print(_("Ftp daemon needs manual starting")); + CommandLine::Print(_("FTP daemon needs manual starting.")); } } //logging settings @@ -80,7 +80,7 @@ CommandLine::Print(FtpServer::EDIT_SETTINGS["UmaskAnon"]:nil); } else { CommandLine::PrintNoCR(_("Umask for Anonymous:")); - CommandLine::Print(_("Option is not set now!")); + CommandLine::Print(_("Option is not set now.")); } if (FtpServer::EDIT_SETTINGS["UmaskLocal"]:nil != "") { CommandLine::PrintNoCR(_("Umask for Authenticated Users: ")); @@ -88,7 +88,7 @@ //CommandLine::Print(""); } else { CommandLine::PrintNoCR(_("Umask for Authenticated Users: ")); - CommandLine::Print(_("Option is not set now!")); + CommandLine::Print(_("Option is not set now.")); //CommandLine::Print(""); } } else { @@ -98,7 +98,7 @@ //CommandLine::Print(""); } else { CommandLine::PrintNoCR(_("Umask: ")); - CommandLine::Print(_("Option is not set now!")); + CommandLine::Print(_("Option is not set now.")); //CommandLine::Print(""); } } // end of if (FtpServer::vsftpd_edit) @@ -109,7 +109,7 @@ if (FtpServer::EDIT_SETTINGS["FtpDirLocal"]:nil != "") { CommandLine::Print(FtpServer::EDIT_SETTINGS["FtpDirLocal"]:nil); } else { - CommandLine::Print(_("Option is not set now!")); + CommandLine::Print(_("Option is not set now.")); } @@ -119,7 +119,7 @@ if (FtpServer::EDIT_SETTINGS["FtpDirAnon"]:nil != "") { CommandLine::Print(FtpServer::EDIT_SETTINGS["FtpDirAnon"]:nil); } else { - CommandLine::Print(_("Option is not set now!")); + CommandLine::Print(_("Option is not set now.")); } // port range CommandLine::PrintNoCR(_("Port Range: ")); @@ -128,7 +128,7 @@ CommandLine::PrintNoCR(_(" - ")); CommandLine::Print(FtpServer::EDIT_SETTINGS["PasMaxPort"]:nil); } else { - CommandLine::Print(_("Option is not set now!")); + CommandLine::Print(_("Option is not set now.")); } // idle time @@ -136,7 +136,7 @@ if (FtpServer::EDIT_SETTINGS["MaxIdleTime"]:nil!="0") { CommandLine::Print(FtpServer::EDIT_SETTINGS["MaxIdleTime"]:nil); } else { - CommandLine::Print(_("Option is not set now!")); + CommandLine::Print(_("Option is not set now.")); } // maximum clients per IP @@ -144,7 +144,7 @@ if (FtpServer::EDIT_SETTINGS["MaxClientsPerIP"]:nil!="0") { CommandLine::Print(FtpServer::EDIT_SETTINGS["MaxClientsPerIP"]:nil); } else { - CommandLine::Print(_("Option is not set now!")); + CommandLine::Print(_("Option is not set now.")); } // maximum clients @@ -152,7 +152,7 @@ if (FtpServer::EDIT_SETTINGS["MaxClientsNumber"]:nil!="0") { CommandLine::Print(FtpServer::EDIT_SETTINGS["MaxClientsNumber"]:nil); } else { - CommandLine::Print(_("Option is not set now!")); + CommandLine::Print(_("Option is not set now.")); } // max rate for authenticated users @@ -160,7 +160,7 @@ if (FtpServer::EDIT_SETTINGS["LocalMaxRate"]:nil!="0") { CommandLine::Print(FtpServer::EDIT_SETTINGS["LocalMaxRate"]:nil); } else { - CommandLine::Print(_("Option is not set now!")); + CommandLine::Print(_("Option is not set now.")); } // max rate for anonymous users @@ -168,7 +168,7 @@ if (FtpServer::EDIT_SETTINGS["AnonMaxRate"]:nil!="0") { CommandLine::Print(FtpServer::EDIT_SETTINGS["AnonMaxRate"]:nil); } else { - CommandLine::Print(_("Option is not set now!")); + CommandLine::Print(_("Option is not set now.")); } // general settings for access @@ -180,7 +180,7 @@ } else if (FtpServer::EDIT_SETTINGS["AnonAuthen"]:nil == "0") { CommandLine::Print(_("Anonymous and Authenticated Users")); } else { - CommandLine::Print(_("Option has wrong value!")); + CommandLine::Print(_("Option has wrong value.")); } // access permissions for anonymous users @@ -202,7 +202,7 @@ if (FtpServer::EDIT_SETTINGS["Banner"]:nil != "") { CommandLine::Print(FtpServer::EDIT_SETTINGS["Banner"]:nil); } else { - CommandLine::Print(_("Option is not set now!")); + CommandLine::Print(_("Option is not set now.")); } //CommandLine::PrintNoCR(_("Security settings: ")); @@ -266,7 +266,7 @@ CommandLine::Print(String::UnderlinedHeader(_("Start-Up:"), 0)); CommandLine::Print(""); // TRANSLATORS: CommandLine progress information - CommandLine::Print(_("Enabling ftp daemon in the boot process...")); + CommandLine::Print(_("Enabling FTP daemon in the boot process...")); CommandLine::Print(""); SetEnableService(true); } else if (options["manual"]:nil!=nil) { @@ -275,7 +275,7 @@ CommandLine::Print(String::UnderlinedHeader(_("Start-Up:"), 0)); CommandLine::Print(""); // TRANSLATORS: CommandLine progress information - CommandLine::Print(_("Removing ftp daemon from the boot process...")); + CommandLine::Print(_("Removing FTP daemon from the boot process...")); CommandLine::Print(""); SetEnableService(false); } else if (options["xinetd"]:nil!=nil) { @@ -284,7 +284,7 @@ CommandLine::Print(String::UnderlinedHeader(_("Start-Up:"), 0)); CommandLine::Print(""); // TRANSLATORS: CommandLine progress information - CommandLine::Print(_("Start ftp daemon via xinetd")); + CommandLine::Print(_("Start FTP daemon via xinetd")); CommandLine::Print(""); SetStartedViaXinetd(true); if (options["startxinetd"]:nil == nil) { @@ -341,12 +341,12 @@ FtpServer::EDIT_SETTINGS["UmaskAnon"] = temp[0]:nil; FtpServer::EDIT_SETTINGS["UmaskLocal"] = temp[1]:nil; } else { - CommandLine::Error(_("Entered umask is not valid!")); + CommandLine::Error(_("Entered umask is not valid.")); CommandLine::Print(_("Example of correct umask <local users>:<anonymous> (177:077)")); CommandLine::Print(""); } } else { - CommandLine::Error(_("Entered umask is not valid!")); + CommandLine::Error(_("Entered umask is not valid.")); CommandLine::Print(_("Example of correct umask <local users>:<anonymous> (177:077)")); CommandLine::Print(""); } @@ -362,7 +362,7 @@ CommandLine::Print(""); FtpServer::EDIT_SETTINGS["Umask"] = value; } else { - CommandLine::Error(_("Entered umask is not valid!")); + CommandLine::Error(_("Entered umask is not valid.")); CommandLine::Print(_("Example of correct umask <files>:<dirs> (set_umask=177:077)")); CommandLine::Print(""); } @@ -442,12 +442,12 @@ CommandLine::Print(""); } else { // TRANSLATORS: CommandLine error message - CommandLine::Error(_("Please enter minimal port < maximal port.")); + CommandLine::Error(_("Enter minimal port < maximal port.")); CommandLine::Print(""); } } else { // TRANSLATORS: CommandLine error message - CommandLine::Error(_("Please enter correct numbers.")); + CommandLine::Error(_("Enter correct numbers.")); CommandLine::Print(""); } } else { @@ -480,7 +480,7 @@ } } else { // TRANSLATORS: CommandLine error message - CommandLine::Error(_("Only 1 parameter is allowed.")); + CommandLine::Error(_("Only one parameter is allowed.")); CommandLine::Print(""); return false; } @@ -542,7 +542,7 @@ CommandLine::Print(""); } else { // TRANSLATORS: CommandLine error message - CommandLine::Error(_("Only 1 parameter is allowed.")); + CommandLine::Error(_("Only one parameter is allowed.")); CommandLine::Print(""); return false; } @@ -571,7 +571,7 @@ } } else { // TRANSLATORS: CommandLine error message - CommandLine::Error(_("Only 1 or 2 parameters are allowed.")); + CommandLine::Error(_("Only one or two parameters are allowed.")); CommandLine::Print(""); return false; } @@ -602,7 +602,7 @@ } } else { // TRANSLATORS: CommandLine error message - CommandLine::Error(_("Only 1 parameter is allowed.")); + CommandLine::Error(_("Only one parameter is allowed.")); CommandLine::Print(""); CommandLine::Print(_("Example of correct input: welcome_message=\"Hello everybody\"")); CommandLine::Print(""); @@ -645,13 +645,13 @@ } else { // TRANSLATORS: CommandLine error message - CommandLine::Error(_("Wrong option!")); + CommandLine::Error(_("Wrong option.")); CommandLine::Print(""); return false; } } else { // TRANSLATORS: CommandLine error message - CommandLine::Error(_("Only 1 parameter is allowed.")); + CommandLine::Error(_("Only one parameter is allowed.")); CommandLine::Print(""); name_option_EDIT_SETTINGS = "Example of correct using: " + name_option_EDIT_SETTINGS + " enable/disable"; CommandLine::Print(name_option_EDIT_SETTINGS); @@ -716,13 +716,13 @@ } else { // TRANSLATORS: CommandLine error message - CommandLine::Error(_("Wrong option!")); + CommandLine::Error(_("Wrong option.")); CommandLine::Print(""); return false; } } else { // TRANSLATORS: CommandLine error message - CommandLine::Error(_("Only 1 parameter is allowed.")); + CommandLine::Error(_("Only one parameter is allowed.")); CommandLine::Print(""); CommandLine::Print(_("Example of correct input: SSL_TLS enable/disable/only")); CommandLine::Print(""); @@ -734,7 +734,7 @@ map cmdline_description = $[ "id" : "ftp-server", /* Command line help text for the Xftpd module */ - "help" : _("Configuration of ftp server"), + "help" : _("Configuration of FTP server"), "guihandler" : FtpdSequence, "initialize" : FtpServer::Read, "finish" : FtpServer::Write, @@ -800,7 +800,7 @@ "authen_dir" : $[ "handler" : FTPdCMDAuthenDir, // TRANSLATORS: CommandLine help - "help" : _("Enter the existing directory for authenticated users (pure-ftpd only)"), + "help" : _("Enter the existing directory for authenticated users (pure-ftpd only)."), "example" : [ "authen_dir set_authen_dir=/srv/ftp", ], @@ -863,7 +863,7 @@ "access" : $[ "handler" : FTPdCMDAccess, // TRANSLATORS: CommandLine help - "help" : _("The access permissions"), + "help" : _("Access permissions"), "example" : [ "access anon_only", "access authen_only", @@ -874,7 +874,7 @@ "anon_access" : $[ "handler" : FTPdCMDAnonAccess, // TRANSLATORS: CommandLine help - "help" : _("The access permissions for anonymous users"), + "help" : _("Access permissions for anonymous users"), "example" : [ "access anon_only", "access authen_only", @@ -886,7 +886,7 @@ "welcome_message" : $[ "handler" : FTPdCMDWelMessage, // TRANSLATORS: CommandLine help - "help" : _("Welcome message is text to display when someone connects to the server (vsftpd only)"), + "help" : _("Welcome message is the text to display when someone connects to the server (vsftpd only)."), "example" : [ "welcome_message=\"hello everybody\"", ], @@ -896,7 +896,7 @@ "SSL" : $[ "handler" : FTPdCMDSSL, // TRANSLATORS: CommandLine help - "help" : _("vsftpd support secure connections via SSL (vsftpd only)"), + "help" : _("vsftpd supports secure connections via SSL (vsftpd only)."), "example" : [ "SSL enable", "SSL disable", @@ -907,7 +907,7 @@ "SSLv2" : $[ "handler" : FTPdCMDSSLv2, // TRANSLATORS: CommandLine help - "help" : _("If enabled, this option will permit SSL v2 protocol connections (vsftpd only)"), + "help" : _("If enabled, this option will permit SSL v2 protocol connections (vsftpd only)."), "example" : [ "SSLv2 enable", "SSLv2 disable", @@ -918,7 +918,7 @@ "SSLv3" : $[ "handler" : FTPdCMDSSLv3, // TRANSLATORS: CommandLine help - "help" : _("If enabled, this option will permit SSL v3 protocol connections (vsftpd only)"), + "help" : _("If enabled, this option will permit SSL v3 protocol connections (vsftpd only)."), "example" : [ "SSLv3 enable", "SSLv3 disable", @@ -929,7 +929,7 @@ "TLS" : $[ "handler" : FTPdCMDTLS, // TRANSLATORS: CommandLine help - "help" : _("vsftpd support connections via TLS (vsftpd only)"), + "help" : _("vsftpd supports connections via TLS (vsftpd only)."), "example" : [ "TLS enable", "TLS disable", @@ -941,7 +941,7 @@ "antiwarez" : $[ "handler" : FTPdCMDAntiwarez, // TRANSLATORS: CommandLine help - "help" : _("Disallow downloading of files that were uploaded but not validated by a local admin (pure-ftpd only)"), + "help" : _("Disallow downloading of files that were uploaded but not validated by a local admin (pure-ftpd only)."), "example" : [ "antiwarez enable", "antiwarez disable", @@ -972,19 +972,19 @@ "options" : $[ "atboot" : $[ // TRANSLATORS: CommandLine help - "help" : _("Start ftp daemon in the boot process"), + "help" : _("Start FTP daemon in the boot process."), ], "manual" : $[ // TRANSLATORS: CommandLine help - "help" : _("Start ftp daemon manually"), + "help" : _("Start FTP daemon manually."), ], "xinetd": $[ // TRANSLATORS: CommandLine help - "help" : _("Start ftp daemon via xinetd"), + "help" : _("Start FTP daemon via xinetd"), ], "startxinetd": $[ // TRANSLATORS: CommandLine help - "help" : _("Start xinetd if it is not running"), + "help" : _("Start xinetd if it is not running."), ], "enable": $[ @@ -1018,19 +1018,19 @@ "set_min_port":$[ "type" : "integer", // TRANSLATORS: CommandLine help - "help" : _("The minimum value for port range for passive connection replies."), + "help" : _("The minimum value for port range for passive connection replies"), ], "set_max_port":$[ "type" : "integer", // TRANSLATORS: CommandLine help - "help" : _("The maximum value for port range for passive connection replies."), + "help" : _("The maximum value for port range for passive connection replies"), ], "set_idle_time":$[ "type" : "integer", // TRANSLATORS: CommandLine help - "help" : _("Maximum Idle Time (in minutes)."), + "help" : _("Maximum Idle Time (in minutes)"), ], @@ -1044,7 +1044,7 @@ "set_max_rate":$[ "type" : "integer", // TRANSLATORS: CommandLine help - "help" : _("The maximum data transfer rate for ftp users (KB/s)."), + "help" : _("The maximum data transfer rate for ftp users (KB/s)"), ], "anon_only": $[ @@ -1064,18 +1064,18 @@ "can_upload": $[ // TRANSLATORS: CommandLine help - "help" : _("Anonymous users can upload"), + "help" : _("Anonymous users can upload."), ], "create_dirs": $[ // TRANSLATORS: CommandLine help - "help" : _("Anonymous users can create directories"), + "help" : _("Anonymous users can create directories."), ], //only vsftd "set_message": $[ "type" : "string", // TRANSLATORS: CommandLine help - "help" : _("Welcome message is text to display when someone connects to the server"), + "help" : _("Welcome message is the text to display when someone connects to the server."), ], //only vsftd @@ -1093,7 +1093,7 @@ //only vsftd "only": $[ // TRANSLATORS: CommandLine help - "help" : _("Refuse connections that do not use SSL/TLS security mechanisms"), + "help" : _("Refuse connections that do not use SSL/TLS security mechanisms."), ], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ftp-server-2.21.1/src/helps.ycp new/yast2-ftp-server-2.22.0/src/helps.ycp --- old/yast2-ftp-server-2.21.1/src/helps.ycp 2011-09-26 11:16:59.000000000 +0200 +++ new/yast2-ftp-server-2.22.0/src/helps.ycp 2012-03-29 14:56:08.000000000 +0200 @@ -18,7 +18,7 @@ /* Read dialog help 1/2 */ "read" : _("<p><b><big>Initializing FTP Server Configuration</big></b><br> -Please wait...<br></p> +</p> ") + /* Read dialog help 2/2 */ @@ -28,7 +28,7 @@ /* Write dialog help 1/2 */ "write" : _("<p><b><big>Saving FTP Server Configuration</big></b><br> -Please wait...<br></p> +</p> ") + @@ -47,9 +47,10 @@ /*Start widget switching daemons help 1/1 */ "selected_services": _("<p><b>Selected Service</b><br> - Frame shows which daemon is currently configured: <b>vsftpd, pure-ftpd, + The frame shows which daemon is currently configured: <b>vsftpd, pure-ftpd, </b>. If you have installed both daemons you can switch between them. -</p>"), +</p> +"), /** *-----------================= GENERAL SCREEN =============---------- @@ -58,7 +59,7 @@ /* general welcome message help 1/1 */ "Banner": _("<p><b>Welcome Message</b><br> -This option is the name of a file containing +Specify the name of a file containing the text to display when someone connects to the server. </p> "), @@ -69,14 +70,14 @@ When enabled, local users will be (by default) placed in a chroot() jail in their home directory after login. <b>Warning:</b> This option has security implications, -especially if the users have upload permission, -or shell access. Only enable if you know what you are doing. +especially if users have upload permission +or shell access. Only enable Chroot if you know what you are doing. </p> "), /* general logging help 1/1 */ "VerboseLogging": _("<p><b>Verbose Logging</b><br> -When enabled, all ftp requests and responses are logged. +When enabled, all FTP requests and responses are logged. </p> "), @@ -89,7 +90,7 @@ /* general umask for anonymous help - only vsftpd 1/1 */ "UmaskAnon": _("<p><b>Umask for Anonymous:</b><br> -The value that the umask for file creation is set to for anonymous users. +The value to which the umask for file creation is set for anonymous users. If you want to specify octal values, remember the \"0\" prefix, otherwise the value will be treated as a base 10 integer. </p> @@ -97,7 +98,7 @@ /* general umask for authenticated users help - only vsftpd 1/1 */ "UmaskLocal": _("<p><b>Umask for Authenticated Users:</b><br> -The value that the umask for file creation is set to for authenticated users. +The value to which the umask for file creation is set for authenticated users. If you want to specify octal values, remember the \"0\" prefix, otherwise the value will be treated as a base 10 integer. </p> @@ -105,16 +106,16 @@ /* general FTP dir for anonymous help 1/1 */ "FtpDirAnon": _("<p><b>FTP Directory for Anonymous Users:</b><br> -Here you can specify a directory which is used for ftp anonymous users. -By pressing <b>Browse</b> you can select a directory from the local filesystem. +Specify a directory which is used for FTP anonymous users. +Press <b>Browse</b> to select a directory from the local filesystem. </p> "), /* general FTP dir for authenticated help 1/1 */ "FtpDirLocal": _("<p><b>FTP Directory for Authenticated Users:</b><br> -You can specify a directory which is used for ftp authenticated users. -By pressing <b>Browse</b> you can select a directory from the local filesystem. +Specify a directory which is used for FTP authenticated users. +Press <b>Browse</b> to select a directory from the local filesystem. </p> "), @@ -127,22 +128,24 @@ /* performance Max Idle Time help 1/1 */ "MaxIdleTime": _("<p><b>Max Idle Time:</b><br> The maximum time (timeout) a remote client -may spend between ftp commands. +may wait between FTP commands. </p> "), /* performance max clients per IP help 1/1 */ "MaxClientsPerIP": _("<p><b>Max Clients for One IP:</b><br> -This is the maximum number of clients which may be connected +The maximum number of clients allowed to connect from the same source internet address. -</p>"), +</p> +"), /* performance max clients help 1/1 */ "MaxClientsNumber": _("<p><b>Max Clients:</b><br> -This is the maximum number of clients which may be connected. -Any additional clients connecting will get an error message. -</p>"), +The maximum number of clients allowed to connect. +Any additional clients trying to connect will get an error message. +</p> +"), /* performance local max rate help 1/1 */ "LocalMaxRate": _("<p><b>Local Max Rate:</b><br> @@ -163,16 +166,16 @@ /* authentication Enable/Disable Anonymous and Local help 1/1 */ "AnonAuthen": _("<p><b>Enable/Disable Anonymous and Local Users</b><br> -<b>Anonymous Only</b> If enabled only anonymous logins are permitted. -<b>Authenticated Users Only</b> If enabled only authenticated users are permitted. -<b>Both</b> If enabled authenticated users and anonymous users are permitted. +<b>Anonymous Only</b>: If enabled, only anonymous logins are permitted. +<b>Authenticated Users Only</b>: If enabled, only authenticated users are permitted. +<b>Both</b> If enabled, authenticated users and anonymous users are permitted. </p> "), /* authentication Enable Upload help 1/1 */ "EnableUpload": _("<p><b>Enable Upload</b><br> -If enabled ftp users can upload. To allow anonymous users -to upload enable <b>Anonymous Can Upload</b> +If enabled, FTP users can upload. To allow anonymous users +to upload, enable <b>Anonymous Can Upload</b>. </p> "), @@ -187,9 +190,9 @@ /* authentication Anonymous Can Create Dirs help 1/1 */ "AnonCreatDirs": _("<p><b>Anonymous Can Create Dirs</b><br> -If enabled anonymous users can create directories. -<i>vsftpd only: </i>If you want that anonymous users can create directories you -need existing directory with allowed writing in home directory after login.</p> +If enabled, anonymous users can create directories. +<i>vsftpd only:</i> If you want to allow anonymous users to create directories, +you need an existing directory with write permission in the home directory after login.</p> "), @@ -201,7 +204,7 @@ /* expert settings Enable Passive Mode help 1/1 */ "PassiveMode": _("<p><b>Enable Passive Mode</b><br> -If enabled the ftp server will allow passive mode for connections. +If enabled, the FTP server will allow passive mode for connections. </p> "), @@ -221,36 +224,41 @@ /* expert settings Enable SSL help 1/1 */ "SSLEnable": _("<p><b>Enable SSL</b><br> -If enabled SSL connections are allowed. -</p>"), +If enabled, SSL connections are allowed. +</p> +"), /* expert settings Enable SSL v2 help 1/1 */ "SSLv2": _("<p><b>Enable SSL v2</b><br> -If enabled SSL version 2 connections are allowed. -</p>"), +If enabled, SSL version 2 connections are allowed. +</p> +"), /* expert settings Enable SSL v3 help 1/1 */ "SSLv3": _("<p><b>Enable SSL v3</b><br> -If enabled SSL version 3 connections are allowed. -</p>"), +If enabled, SSL version 3 connections are allowed. +</p> +"), /* expert settings Enable TLS help 1/1 */ "TLS": _("<p><b>Enable TLS</b><br> -If enabled TLS connections are allowed. -</p>"), +If enabled, TLS connections are allowed. +</p> +"), /* expert settings DSA Certificate to Use for SSL Encrypted Connections help 1/1 */ -"CertFile": _("<p><b>DSA Certificate to Use for SSL Encrypted Connections</b><br> +"CertFile": _("<p><b>DSA Certificate to Use for SSL-encrypted Connections</b><br> This option specifies the location of the DSA certificate to -use for SSL encrypted connections. You can select a file by pressing <b>Browse</b> +use for SSL-encrypted connections. Select a file by pressing <b>Browse</b>. </p> "), /* expert settings Disable Downloading Unvalidated Data help 1/1 */ "AntiWarez": _("<p><b>Disable Downloading Unvalidated Data</b><br> Disallow downloading of files that were uploaded -but not validated by a local admin -</p>"), +but not validated by a local admin. +</p> +"), /* expert settings Security Settings help 1/1 */ @@ -268,13 +276,13 @@ /* Summary dialog help 1/3 */ "summary" : _("<p><b><big>FTP Server Configuration</big></b><br> -Configure the ftp server here.<br></p> +Configure the FTP server.<br></p> ")+ /* Summary dialog help 2/3 */ _("<p><b><big>Adding an FTP Server:</big></b><br> -Choose an ftp server from the list of detected ftp servers. -If your ftp server was not detected, use <b>Other (not detected)</b>. +Choose an FTP server from the list of detected FTP servers. +If your FTP server was not detected, use <b>Other (not detected)</b>. Then press <b>Configure</b>.</p> ") + @@ -286,19 +294,20 @@ /* Ovreview dialog help 1/3 */ "overview" : _("<p><b><big>FTP Server Configuration Overview</big></b><br> -Obtain an overview of the installed ftp servers. Additionally, +Obtain an overview of the installed FTP servers. Additionally, edit their configurations.<br></p> ") + /* Ovreview dialog help 2/3 */ _("<p><b><big>Adding a FTP Server</big></b><br> -Press <b>Add</b> to configure a ftp server.</p> +Press <b>Add</b> to configure a FTP server.</p> ") + /* Ovreview dialog help 3/3 */ _("<p><b><big>Editing or Deleting</big></b><br> -Choose a ftp server to change or remove. -Then press <b>Edit</b> or <b>Delete</b>, respectively.</p>\n"), +Choose a FTP server to change or remove. +Then press <b>Edit</b> or <b>Delete</b> respectively.</p> +"), ]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ftp-server-2.21.1/src/wid_functions.ycp new/yast2-ftp-server-2.22.0/src/wid_functions.ycp --- old/yast2-ftp-server-2.21.1/src/wid_functions.ycp 2011-09-26 11:16:59.000000000 +0200 +++ new/yast2-ftp-server-2.22.0/src/wid_functions.ycp 2012-03-29 14:56:09.000000000 +0200 @@ -172,7 +172,7 @@ if (FtpServer::WriteStartViaXinetd(true,true) && result) { FtpServer::vsftp_xinetd_running = true; FtpServer::pure_ftp_xinetd_running = false; - UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("ftp is running"))); + UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("FTP is running"))); UI::ChangeWidget (`id ("_cwm_start_service_now"), `Enabled, false); UI::ChangeWidget (`id ("_cwm_stop_service_now"), `Enabled, true); result = true; @@ -207,7 +207,7 @@ FtpServer::stop_daemon_xinetd = true; if (FtpServer::WriteStartViaXinetd(true,true)) { FtpServer::vsftp_xinetd_running = false; - UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("ftp is not running"))); + UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("FTP is not running"))); UI::ChangeWidget (`id ("_cwm_start_service_now"), `Enabled, true); UI::ChangeWidget (`id ("_cwm_stop_service_now"), `Enabled, false); result = true; @@ -247,7 +247,7 @@ FtpServer::stop_daemon_xinetd = false; if (FtpServer::WriteStartViaXinetd(true,false) && result) { FtpServer::vsftp_xinetd_running = true; - UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("ftp is running"))); + UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("FTP is running"))); UI::ChangeWidget (`id ("_cwm_start_service_now"), `Enabled, false); UI::ChangeWidget (`id ("_cwm_stop_service_now"), `Enabled, true); result = true; @@ -292,7 +292,7 @@ if (FtpServer::WriteStartViaXinetd(true,true) && result) { FtpServer::pure_ftp_xinetd_running = true; FtpServer::vsftp_xinetd_running = false; - UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("ftp is running"))); + UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("FTP is running"))); UI::ChangeWidget (`id ("_cwm_start_service_now"), `Enabled, false); UI::ChangeWidget (`id ("_cwm_stop_service_now"), `Enabled, true); result = true; @@ -328,7 +328,7 @@ FtpServer::stop_daemon_xinetd = true; if (FtpServer::WriteStartViaXinetd(true,true)) { FtpServer::pure_ftp_xinetd_running = false; - UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("ftp is not running"))); + UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("FTP is not running"))); UI::ChangeWidget (`id ("_cwm_start_service_now"), `Enabled, true); UI::ChangeWidget (`id ("_cwm_stop_service_now"), `Enabled, false); result = true; @@ -366,7 +366,7 @@ FtpServer::stop_daemon_xinetd = false; if (FtpServer::WriteStartViaXinetd(true,false) && result) { FtpServer::pure_ftp_xinetd_running = true; - UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("ftp is running"))); + UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("FTP is running"))); UI::ChangeWidget (`id ("_cwm_start_service_now"), `Enabled, false); UI::ChangeWidget (`id ("_cwm_stop_service_now"), `Enabled, true); result = true; @@ -445,14 +445,14 @@ void InitStartStopRestart (string key) { if ((FtpServer::pure_ftp_xinetd_running) && (!FtpServer::vsftpd_edit)) { - UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("ftp is running"))); + UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("FTP is running"))); UI::ChangeWidget (`id ("_cwm_start_service_now"), `Enabled, false); UI::ChangeWidget (`id ("_cwm_stop_service_now"), `Enabled, true); } if ((FtpServer::vsftp_xinetd_running) && (FtpServer::vsftpd_edit)) { - UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("ftp is running"))); + UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("FTP is running"))); UI::ChangeWidget (`id ("_cwm_start_service_now"), `Enabled, false); UI::ChangeWidget (`id ("_cwm_stop_service_now"), `Enabled, true); } @@ -677,7 +677,7 @@ symbol HandleBrowseAnon (string key, map event) { any button = event["ID"]:nil; if (button == "BrowseAnon") { - string val = UI::AskForExistingDirectory ("/",_("Please select directory...")); + string val = UI::AskForExistingDirectory ("/",_("Select directory")); UI::ChangeWidget(`id( "FtpDirAnon" ), `Value, val); } return nil; @@ -708,7 +708,7 @@ symbol HandleBrowseLocal (string key, map event) { any button = event["ID"]:nil; if (button == "BrowseLocal") { - string val = UI::AskForExistingDirectory ("/",_("Please select directory...")); + string val = UI::AskForExistingDirectory ("/",_("Select directory")); UI::ChangeWidget(`id( "FtpDirLocal" ), `Value, val); } return nil; @@ -915,7 +915,7 @@ yesno_question = _("Do you want to change permissions for ") + FtpServer::anon_homedir +_("Upload (allow writing)?"); - yesno_comment = _("If you want anonymous users to be able to upload, you need a directory with write access. + yesno_comment = _("To allow anonymous users to upload, you need a directory with write access. "); yesno_comment = yesno_comment + FtpServer::anon_homedir + _(" is a home directory after the login of anonymous users."); @@ -928,7 +928,7 @@ if (((button == "AnonCreatDirs") || (anon_create_dirs) && (check_upload)) && (ask_again)) { if (!FtpServer::create_upload_dir) { yesno_question = _("Do you want to create a directory?\n") + FtpServer::anon_homedir +_("Upload with write access?"); - yesno_comment = _("If you want anonymous users to be able to create directories, + yesno_comment = _("If you want to allow anonymous users to create directories, you have to create a directory with write access. "); @@ -1364,7 +1364,7 @@ symbol HandleBrowseCertFile (string key, map event) { any button = event["ID"]:nil; if (button == "BrowseCertFile") { - string val = UI::AskForExistingFile ("/","*.*",_("Please Select File")); + string val = UI::AskForExistingFile ("/","*.*",_("Select File")); UI::ChangeWidget(`id( "CertFile" ), `Value, val); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ftp-server-2.21.1/src/write_load.ycp new/yast2-ftp-server-2.22.0/src/write_load.ycp --- old/yast2-ftp-server-2.21.1/src/write_load.ycp 2011-09-26 11:16:59.000000000 +0200 +++ new/yast2-ftp-server-2.22.0/src/write_load.ycp 2011-12-08 10:47:08.000000000 +0100 @@ -55,6 +55,11 @@ y2milestone("----------------------------------------------------"); //bnc#597842 Yast2-ftp-server module losses the chroot everyone (chroot-local-user) setting + //the problem appears to be that after vsftpd settings are parsed, + //the correct values are overwritten by parsing the (meaningless) + //settings for pure-ftpd. + + if ((FtpServer::vsftpd_edit) || (size(pure_ftpd_xinet_conf) == 0)) { y2milestone("skip SettingsXinetdPure() -> vsftpd is used or pure_ftpd_xinet_conf is empty"); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
