i18n style guide fixes

svn path=/trunk/KDE/kdebase/apps/; revision=650575

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index e825a5a618e15c52872e257b48b2cb77a3548236..5d0bd4adb45b27b6e654b98240e1cff6d8617058 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -160,10 +160,10 @@ void DolphinContextMenu::openItemContextMenu()
 
     popup->addSeparator();
 
-    // insert 'Bookmark this folder' entry if exactly one item is selected
+    // insert 'Bookmark This Folder' entry if exactly one item is selected
     QAction* bookmarkAction = 0;
     if (m_fileInfo->isDir() && (m_selectedUrls.count() == 1)) {
-        bookmarkAction = popup->addAction(KIcon("bookmark-folder"), i18n("Bookmark folder"));
+        bookmarkAction = popup->addAction(KIcon("bookmark-folder"), i18n("Bookmark Folder..."));
     }
 
     // Insert 'Open With...' sub menu
@@ -183,7 +183,7 @@ void DolphinContextMenu::openItemContextMenu()
 
     if ((bookmarkAction!= 0) && (activatedAction == bookmarkAction)) {
         const KUrl selectedUrl(m_fileInfo->url());
-        KBookmark bookmark = EditBookmarkDialog::getBookmark(i18n("Add folder as bookmark"),
+        KBookmark bookmark = EditBookmarkDialog::getBookmark(i18n("Add Folder as Bookmark"),
                                                              selectedUrl.fileName(),
                                                              selectedUrl,
                                                              "bookmark");
@@ -247,10 +247,10 @@ void DolphinContextMenu::openViewportContextMenu()
     popup->addMenu(viewModeMenu);
     popup->addSeparator();
 
-    QAction* bookmarkAction = popup->addAction(KIcon("bookmark-folder"), i18n("Bookmark this folder"));
+    QAction* bookmarkAction = popup->addAction(KIcon("bookmark-folder"), i18n("Bookmark This Folder..."));
     popup->addSeparator();
 
-    QAction* propertiesAction = popup->addAction(i18n("Properties..."));
+    QAction* propertiesAction = popup->addAction(i18n("Properties"));
 
     QAction* activatedAction = popup->exec(QCursor::pos());
     if (activatedAction == propertiesAction) {
@@ -258,7 +258,7 @@ void DolphinContextMenu::openViewportContextMenu()
     }
     else if (activatedAction == bookmarkAction) {
         const KUrl& url = m_mainWindow->activeView()->url();
-        KBookmark bookmark = EditBookmarkDialog::getBookmark(i18n("Add folder as bookmark"),
+        KBookmark bookmark = EditBookmarkDialog::getBookmark(i18n("Add Folder as Bookmark"),
                                                              url.fileName(),
                                                              url,
                                                              "bookmark");

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 9ff5c502449df371511d8c4d9b84f220a3b9636b..dc23b5573840a10141cd44c10ebde7802a4ce2d4 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -1061,7 +1061,7 @@ void DolphinMainWindow::setupActions()
     // setup 'File' menu
     m_newMenu = new DolphinNewMenu(this);
     KMenu* menu = m_newMenu->menu();
-    menu->setTitle(i18n("Create New..."));
+    menu->setTitle(i18n("Create New"));
     menu->setIcon(KIcon("document-new"));
     connect(menu, SIGNAL(aboutToShow()),
             this, SLOT(updateNewMenu()));
@@ -1073,7 +1073,7 @@ void DolphinMainWindow::setupActions()
     connect(newWindow, SIGNAL(triggered()), this, SLOT(openNewMainWindow()));
 
     QAction* rename = actionCollection()->addAction("rename");
-    rename->setText(i18n("Rename"));
+    rename->setText(i18n("Rename..."));
     rename->setShortcut(Qt::Key_F2);
     connect(rename, SIGNAL(triggered()), this, SLOT(rename()));
 

diff --git a/src/generalsettingspage.cpp b/src/generalsettingspage.cpp
index e7e8b23fb3883e6f8f9350970685da0fbc5b06e6..2961cf0d6743747398ac2971b0e5a6eb74c2ab18 100644 (file)
--- a/src/generalsettingspage.cpp
+++ b/src/generalsettingspage.cpp
@@ -54,7 +54,7 @@ GeneralSettingsPage::GeneralSettingsPage(DolphinMainWindow* mainWin,QWidget* par
     vBox->setSpacing(spacing);
 
     // create 'Home URL' editor
-    QGroupBox* homeBox = new QGroupBox(i18n("Home folder"), vBox);
+    QGroupBox* homeBox = new QGroupBox(i18n("Home Folder"), vBox);
 
     KHBox* homeUrlBox = new KHBox(homeBox);
     homeUrlBox->setSpacing(spacing);
@@ -69,10 +69,10 @@ GeneralSettingsPage::GeneralSettingsPage(DolphinMainWindow* mainWin,QWidget* par
     KHBox* buttonBox = new KHBox(homeBox);
     buttonBox->setSpacing(spacing);
 
-    QPushButton* useCurrentButton = new QPushButton(i18n("Use current location"), buttonBox);
+    QPushButton* useCurrentButton = new QPushButton(i18n("Use Current Location"), buttonBox);
     connect(useCurrentButton, SIGNAL(clicked()),
             this, SLOT(useCurrentLocation()));
-    QPushButton* useDefaultButton = new QPushButton(i18n("Use default location"), buttonBox);
+    QPushButton* useDefaultButton = new QPushButton(i18n("Use Default Location"), buttonBox);
     connect(useDefaultButton, SIGNAL(clicked()),
             this, SLOT(useDefaultLocation()));
 

diff --git a/src/generalviewsettingspage.cpp b/src/generalviewsettingspage.cpp
index 5a9b3a9a6b0d3b88fd8f10f69fe364827119bc2e..4f496246b1d2e5ebaff200819c08834785b07e4e 100644 (file)
--- a/src/generalviewsettingspage.cpp
+++ b/src/generalviewsettingspage.cpp
@@ -56,8 +56,8 @@ GeneralViewSettingsPage::GeneralViewSettingsPage(DolphinMainWindow* mainWindow,
 
     QGroupBox* propsBox = new QGroupBox(i18n("View Properties"), this);
 
-    m_localProps = new QRadioButton(i18n("Remember view properties for each folder."), propsBox);
-    m_globalProps = new QRadioButton(i18n("Use common view properties for all folders."), propsBox);
+    m_localProps = new QRadioButton(i18n("Remember view properties for each folder"), propsBox);
+    m_globalProps = new QRadioButton(i18n("Use common view properties for all folders"), propsBox);
     if (settings->globalViewProps()) {
         m_globalProps->setChecked(true);
     }

diff --git a/src/iconsizedialog.cpp b/src/iconsizedialog.cpp
index 4b4eb48deb864049b754c3d69f03b5a37437f055..d7d248819ada3c91615c05dc40def6e71d941763 100644 (file)
--- a/src/iconsizedialog.cpp
+++ b/src/iconsizedialog.cpp
@@ -50,7 +50,7 @@ IconSizeDialog::IconSizeDialog(QWidget* parent) :
 
     const int spacing = KDialog::spacingHint();
 
-    setCaption(i18n("Change Icon and Preview Size"));
+    setCaption(i18n("Change Icon & Preview Size"));
     setButtons(Ok|Cancel);
     setDefaultButton(Ok);
 

diff --git a/src/iconsviewsettingspage.cpp b/src/iconsviewsettingspage.cpp
index 54155da506832f20f66735913aa90490c06b6596..3492b3a651bb7467004e2f8c188844ec81f57e13 100644 (file)
--- a/src/iconsviewsettingspage.cpp
+++ b/src/iconsviewsettingspage.cpp
@@ -64,7 +64,7 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinMainWindow* mainWindow,
     m_iconSize = settings->iconSize();
     m_previewSize = settings->previewSize();
 
-    m_iconSizeButton = new QPushButton(i18n("Change icon and preview size..."), this);
+    m_iconSizeButton = new QPushButton(i18n("Change Icon && Preview Size..."), this);
     connect(m_iconSizeButton, SIGNAL(clicked()),
             this, SLOT(openIconSizeDialog()));
 
@@ -120,8 +120,8 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinMainWindow* mainWindow,
 
     QLabel* arrangementLabel = new QLabel(i18n("Arrangement:"), gridGroup);
     m_arrangementBox = new QComboBox(gridGroup);
-    m_arrangementBox->addItem(i18n("Left to right"));
-    m_arrangementBox->addItem(i18n("Top to bottom"));
+    m_arrangementBox->addItem(i18n("Left to Right"));
+    m_arrangementBox->addItem(i18n("Top to Bottom"));
     m_arrangementBox->setCurrentIndex(leftToRightArrangement ? 0 : 1);
 
     QLabel* gridSpacingLabel = new QLabel(i18n("Grid spacing:"), gridGroup);

diff --git a/src/treeviewcontextmenu.cpp b/src/treeviewcontextmenu.cpp
index cdb1afedad8edd01c01fae8f820e8d04c0ffa610..48d75b5bcaf5fc9f6f64994ff4aacf4c48957d4d 100644 (file)
--- a/src/treeviewcontextmenu.cpp
+++ b/src/treeviewcontextmenu.cpp
@@ -69,7 +69,7 @@ void TreeViewContextMenu::open()
     popup->addSeparator();
 
     // insert 'Rename'
-    QAction* renameAction = new QAction(i18n("Rename"), this);
+    QAction* renameAction = new QAction(i18n("Rename..."), this);
     connect(renameAction, SIGNAL(triggered()), this, SLOT(rename()));
     popup->addAction(renameAction);
 

diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp
index a65c6c2d9513078193ca29ac1a500341d0b9cadf..faaffc6cc1ebeba0819430b6067e58796a4ff583 100644 (file)
--- a/src/viewpropertiesdialog.cpp
+++ b/src/viewpropertiesdialog.cpp
@@ -156,8 +156,8 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     // Only show the following settings if the view properties are remembered
     // for each directory:
     if (!useGlobalViewProps) {
-        // create 'Apply view properties to:' group
-        QGroupBox* applyBox = new QGroupBox(i18n("Apply view properties to:"), main);
+        // create 'Apply View Properties To' group
+        QGroupBox* applyBox = new QGroupBox(i18n("Apply View Properties To"), main);
 
         m_applyToCurrentFolder = new QRadioButton(i18n("Current folder"), applyBox);
         m_applyToCurrentFolder->setChecked(true);