Author: jsmeix Date: Tue Jan 18 16:51:59 2011 New Revision: 63205 URL: http://svn.opensuse.org/viewcvs/yast?rev=63205&view=rev Log: Using right poper names "Active Directory (R)" and "Windows (R)", see bnc#661845#c19 Modified: trunk/printer/src/connectionwizard.ycp trunk/printer/src/helps.ycp Modified: trunk/printer/src/connectionwizard.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/connectionwizard.ycp?rev=63205&r1=63204&r2=63205&view=diff ============================================================================== --- trunk/printer/src/connectionwizard.ycp (original) +++ trunk/printer/src/connectionwizard.ycp Tue Jan 18 16:51:59 2011 @@ -1324,7 +1324,7 @@ // readlink is in the coreutils RPM so that it is available in any case. Printerlib::ExecuteBashCommand( "readlink " + Printerlib::result["stdout"]:"" + " | tr -d '[:space:]'" ); // Only if /usr/lib[64]/cups/backend/smb -> /usr/bin/get_printing_ticket - // there is support for Windows Active Directory: + // there is support for Active Directory (R): if( "/usr/bin/get_printing_ticket" == Printerlib::result["stdout"]:"" ) { active_directory_support = true; } @@ -1365,11 +1365,6 @@ // TRANSLATORS: Text entry for samba domain _("&Workgroup (Domain Name)"), [ URIpercentDecoding( domain ) ] - //), - //PushButton - //( `id(`scan_domain), - // _("Scan for Windows Share Domains") - //) ) ) ), @@ -1411,8 +1406,8 @@ ( `CheckBox ( `id(`active_directory_check_box), `opt(`notify), - // A CheckBox to support Windows Active Directory: - _("Support for &Windows Active Directory"), + // A CheckBox to support Active Directory (R): + _("Support for &Active Directory (R)"), active_directory_support ) ) @@ -1962,7 +1957,7 @@ _("Print Via Print Server Machine"), true, [ // TRANSLATORS: Tree widget item - `item( `id(`smb), _("Microsoft Windows/SAMBA (SMB/CIFS)") ), + `item( `id(`smb), _("Windows (R) or Samba (SMB/CIFS)") ), // TRANSLATORS: Tree widget item `item( `id(`lpr), _("Traditional UNIX Server (LPR/LPD)") ), // `item( `id(`iprint), _("iPrint (Novell OES)") ), @@ -2670,8 +2665,8 @@ boolean active_directory = (boolean)UI::QueryWidget( `active_directory_check_box, `Value ); if( active_directory ) { if( ! Popup::ContinueCancel( // Body of a Popup::ContinueCancel when testing a SMB connection is not possible - // because there is authentication via Windows Active Directory required: - _("This is only a generic test which may untruly report failures\nif authentication via Windows Active Directory is required.\nIn this case a particular user who is allowed to print via Active Directory\nshould log in and test by himself if he can print from Gnome or KDE.") + // because there is authentication via Active Directory (R) required: + _("This is only a generic test which may untruly report failures\nif authentication via Active Directory (R) is required.\nIn this case a user who is allowed to print via Active Directory (R)\nshould log in and test by himself if he can print from Gnome or KDE.") ) ) { return true; @@ -2869,7 +2864,7 @@ { // The active_directory_check_box is checked: if( ! Printerlib::TestAndInstallPackage( "samba-krb-printing", "installed" ) ) { // Install samba-krb-printing when it is not installed: - if( Popup::ContinueCancel( _("To support Windows Active Directory, the RPM package samba-krb-printing must be installed.") ) ) + if( Popup::ContinueCancel( _("To support Active Directory (R), the RPM package samba-krb-printing must be installed.") ) ) { Printerlib::TestAndInstallPackage( "samba-krb-printing", "install" ); } } @@ -2888,10 +2883,10 @@ { // The active_directory_check_box is not checked: Printerlib::ExecuteBashCommand( smb_backend_link_target_commandline ); if( "/usr/bin/get_printing_ticket" == Printerlib::result["stdout"]:"" ) - { // Currently there is support for Windows Active Directory. + { // Currently there is support for Active Directory (R). // Show a user notification before it gets disabled: - Popup::Warning( // Popup::Warning message before Windows Active Directory support gets disabled: - _("Windows Active Directory support will be disabled for all SMB print queues.") + Popup::Warning( // Popup::Warning message before Active Directory (R) support gets disabled: + _("Active Directory (R) support will be disabled for all SMB print queues.") ); } // Regardless if samba-krb-printing is installed or not, @@ -2901,7 +2896,7 @@ } // Detremine and set the actually right state of the active_directory_check_box: // Only if the /usr/lib[64]/cups/backend/smb link points to /usr/bin/get_printing_ticket - // there is support for Windows Active Directory for SMB print queues. + // there is support for Active Directory (R) for SMB print queues. Printerlib::ExecuteBashCommand( smb_backend_link_target_commandline ); if( "/usr/bin/get_printing_ticket" == Printerlib::result["stdout"]:"" ) { UI::ChangeWidget( `id(`active_directory_check_box), `Value, true ); Modified: trunk/printer/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/helps.ycp?rev=63205&r1=63204&r2=63205&view=diff ============================================================================== --- trunk/printer/src/helps.ycp (original) +++ trunk/printer/src/helps.ycp Tue Jan 18 16:51:59 2011 @@ -583,7 +583,7 @@ Access happens via various different network protocols. Ask your network administrator what which print server machine provides in your particular network:<br> -<b>Microsoft Windows/SAMBA (SMB/CIFS)</b><br> +<b>Windows (R) or Samba (SMB/CIFS)</b><br> To access a SMB printer share, the RPM package samba-client must be installed. The package provides the CUPS backend 'smb' which is a link to the <tt>/usr/bin/smbspool</tt> program which actually sends the data @@ -594,7 +594,7 @@ Have in mind that spaces and special characters in those values must be percent-encoded (see above).<br> By default CUPS runs backends (here smbspool) as user 'lp'. -When printing in a Windows Active Directory (AD) environment +When printing in an Active Directory (R) environment (AD) the user 'lp' is not allowed to print in this environment so that the traditional way to print via smbspool as user 'lp' would not work.<br> @@ -759,11 +759,12 @@ </p>") + // PrintingViaNetworkDialog help 4/4: _("<p> -If there is no CUPS server in your network or if you must additionally use -another kind of print server (e.g. print via a Windows/SMB server -or print via a traditional Unix LPR server) or if you must access -a network printer directly, you have to set up an appropriate print queue -on your host. +You have to set up an appropriate print queue on your host +if there is no CUPS server in your network, +or when you must access a network printer directly, +or when you use another kind of print server +e.g. when printing via a Windows (R) or Samba server +or when printing via a traditional Unix server. </p>"), "sharing_dialog" : -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org