"directory" -> "folder" as discussed on kde-i18n-doc and kde-core-devel

svn path=/trunk/kdebase/kcontrol/konq/; revision=260930
This commit is contained in:
Craig Drummond 2003-10-21 23:19:22 +00:00
parent 176f583ffc
commit 7b7c26bfd0
4 changed files with 10 additions and 10 deletions

View file

@ -59,9 +59,9 @@ KBehaviourOptions::KBehaviourOptions(KConfig *config, QString group, QWidget *pa
// ----
cbNewWin = new QCheckBox(i18n("Open directories in separate &windows"), vbox);
cbNewWin = new QCheckBox(i18n("Open folders in separate &windows"), vbox);
QWhatsThis::add( cbNewWin, i18n("If this option is checked, Konqueror will open a new window when "
"you open a directory, rather than showing that directory's contents in the current window."));
"you open a folder, rather than showing that folders's contents in the current window."));
connect(cbNewWin, SIGNAL(clicked()), this, SLOT(changed()));
connect(cbNewWin, SIGNAL(toggled(bool)), SLOT(updateWinPixmap(bool)));
@ -119,14 +119,14 @@ KBehaviourOptions::KBehaviourOptions(KConfig *config, QString group, QWidget *pa
homeURL = new KURLRequester(this);
homeURL->setMode(KFile::Directory);
homeURL->setCaption(i18n("Select Home Directory"));
homeURL->setCaption(i18n("Select Home Folder"));
hlay->addWidget( homeURL );
connect(homeURL, SIGNAL(textChanged(const QString &)), this, SLOT(changed()));
label->setBuddy(homeURL);
QString homestr = i18n("This is the URL (e.g. a directory or a web page) where "
QString homestr = i18n("This is the URL (e.g. a folder or a web page) where "
"Konqueror will jump to when the \"Home\" button is pressed. "
"This usually is your home directory, symbolized by a 'tilde' (~).");
"This usually is your home folder, symbolized by a 'tilde' (~).");
QWhatsThis::add( label, homestr );
QWhatsThis::add( homeURL, homestr );
@ -135,7 +135,7 @@ KBehaviourOptions::KBehaviourOptions(KConfig *config, QString group, QWidget *pa
bg->layout()->setSpacing( KDialog::spacingHint() );
QWhatsThis::add( bg, i18n("This option tells Konqueror whether to ask"
" for a confirmation when you \"delete\" a file."
" <ul><li><em>Move To Trash:</em> moves the file to your trash directory,"
" <ul><li><em>Move To Trash:</em> moves the file to your trash folder,"
" from where it can be recovered very easily.</li>"
" <li><em>Delete:</em> simply deletes the file.</li>"
" <li><em>Shred:</em> not only deletes the file, but overwrites"

View file

@ -83,8 +83,8 @@
<string>Alt+H</string>
</property>
<property name="whatsThis" stdset="0">
<string>&lt;p&gt;If you check this option, any files in your desktop directory that begin with a period (.) will be shown. Usually, such files contain configuration information, and remain hidden from view.&lt;/p&gt;
&lt;p&gt;For example, files which are named ".directory" are plain text files which contain information for Konqueror, such as the icon to use in displaying a directory, the order in which files should be sorted, etc. You should not change or delete these files unless you know what you are doing!&lt;/p&gt;</string>
<string>&lt;p&gt;If you check this option, any files in your desktop folder that begin with a period (.) will be shown. Usually, such files contain configuration information, and remain hidden from view.&lt;/p&gt;
&lt;p&gt;For example, files which are named ".directory" are plain text files which contain information for Konqueror, such as the icon to use in displaying a folder, the order in which files should be sorted, etc. You should not change or delete these files unless you know what you are doing!&lt;/p&gt;</string>
</property>
</widget>
<widget class="KListView" row="6" column="1">

View file

@ -103,7 +103,7 @@
</size>
</property>
<property name="title">
<string>Scan Directories</string>
<string>Scan Folders</string>
</property>
<grid>
<property name="name">

View file

@ -347,7 +347,7 @@ extern "C"
void KPluginOptions::dirInit()
{
m_widget->dirEdit->setCaption(i18n("Select Plugin Scan Directory"));
m_widget->dirEdit->setCaption(i18n("Select Plugin Scan Folder"));
connect( m_widget->dirNew, SIGNAL(clicked()), SLOT(dirNew()));
connect( m_widget->dirRemove, SIGNAL(clicked()), SLOT(dirRemove()));
connect( m_widget->dirUp, SIGNAL(clicked()), SLOT(dirUp()));