mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-20 08:51:24 +00:00
"directory" -> "folder" as discussed on kde-i18n-doc and kde-core-devel
svn path=/trunk/kdebase/kate/app/kwritemain.cpp; revision=260923
This commit is contained in:
parent
9cf4b54238
commit
176f583ffc
|
@ -668,7 +668,7 @@ extern "C" int kdemain(int argc, char **argv)
|
|||
Kate::Document::setOpenErrorDialogsActivated (true);
|
||||
}
|
||||
else
|
||||
KMessageBox::sorry( t, i18n("The file '%1' could not be opened, it is not a normal file, it is a directory!").arg(args->url(z).url()) );
|
||||
KMessageBox::sorry( t, i18n("The file '%1' could not be opened, it is not a normal file, it is a folder!").arg(args->url(z).url()) );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -349,7 +349,7 @@ void KonqOperations::doDrop( const KFileItem * destItem, const KURL & dest, QDro
|
|||
// The event source may be the view or an item (icon)
|
||||
// Note: ev->source() can be 0L! (in case of kdesktop) (Simon)
|
||||
if ( !ev->source() || ev->source() != parent && ev->source()->parent() != parent )
|
||||
KMessageBox::sorry( parent, i18n("You can't drop a directory onto itself") );
|
||||
KMessageBox::sorry( parent, i18n("You can't drop a folder onto itself") );
|
||||
kdDebug(1203) << "Dropped on itself" << endl;
|
||||
ev->accept(false);
|
||||
return; // do nothing instead of displaying kfm's annoying error box
|
||||
|
@ -824,8 +824,8 @@ void KonqOperations::newDir( QWidget * parent, const KURL & baseURL )
|
|||
}
|
||||
}
|
||||
|
||||
name = KInputDialog::getText ( i18n( "New Directory" ),
|
||||
i18n( "Enter directory name:" ), name, &ok, parent );
|
||||
name = KInputDialog::getText ( i18n( "New Folder" ),
|
||||
i18n( "Enter Folder name:" ), name, &ok, parent );
|
||||
if ( ok )
|
||||
{
|
||||
name = KIO::encodeFileName( name );
|
||||
|
|
|
@ -398,7 +398,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
|
|||
{
|
||||
if (d->m_itemFlags & KParts::BrowserExtension::ShowCreateDirectory)
|
||||
{
|
||||
KAction *actNewDir = new KAction( i18n( "Create Director&y..." ), "folder_new", 0, this, SLOT( slotPopupNewDir() ), &m_ownActions, "newdir" );
|
||||
KAction *actNewDir = new KAction( i18n( "Create &Folder..." ), "folder_new", 0, this, SLOT( slotPopupNewDir() ), &m_ownActions, "newdir" );
|
||||
addAction( actNewDir );
|
||||
addSeparator();
|
||||
}
|
||||
|
@ -470,7 +470,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
|
|||
caption = i18n("&Bookmark This Location");
|
||||
}
|
||||
else if (S_ISDIR(mode))
|
||||
caption = i18n("&Bookmark This Directory");
|
||||
caption = i18n("&Bookmark This Folder");
|
||||
else if (bIsLink)
|
||||
caption = i18n("&Bookmark This Link");
|
||||
else
|
||||
|
|
|
@ -242,7 +242,7 @@ QString KonqUndoManager::undoText() const
|
|||
else if ( t == KonqCommand::MOVE )
|
||||
return i18n( "Und&o: Move" );
|
||||
else if ( t == KonqCommand::MKDIR )
|
||||
return i18n( "Und&o: Create Directory" );
|
||||
return i18n( "Und&o: Create Folder" );
|
||||
else
|
||||
assert( false );
|
||||
/* NOTREACHED */
|
||||
|
|
Loading…
Reference in a new issue