Change wording of Directory to Folder.

diff --git a/src/main.cpp b/src/main.cpp
index 0bbae97fc5a9d46bae73eb7fb0f00fbe4639a760..8987d351f058d5b02a67c982ca51c937edc89ecf 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -100,7 +100,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
     aboutData.setupCommandLine(&parser);
 
     // command line options
     aboutData.setupCommandLine(&parser);
 
     // command line options

-    parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("select"), i18nc("@info:shell", "The files and directories passed as arguments "
+    parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("select"), i18nc("@info:shell", "The files and folders passed as arguments "

                                                                                         "will be selected.")));
     parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("split"), i18nc("@info:shell", "Dolphin will get started with a split view.")));
     parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("daemon"), i18nc("@info:shell", "Start Dolphin Daemon (only required for DBus Interface)")));
                                                                                         "will be selected.")));
     parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("split"), i18nc("@info:shell", "Dolphin will get started with a split view.")));
     parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("daemon"), i18nc("@info:shell", "Start Dolphin Daemon (only required for DBus Interface)")));

diff --git a/src/settings/dolphin_generalsettings.kcfg b/src/settings/dolphin_generalsettings.kcfg
index de7390bbd26161296725de64f72d8d56249d6008..12f158541187bd8d8e1359c589c1c99be6ae07a8 100644 (file)
--- a/src/settings/dolphin_generalsettings.kcfg
+++ b/src/settings/dolphin_generalsettings.kcfg
@@ -43,7 +43,7 @@
             <default>false</default>
         </entry>
         <entry name="GlobalViewProps" type="Bool">
             <default>false</default>
         </entry>
         <entry name="GlobalViewProps" type="Bool">

-            <label>Should the view properties be used for all directories</label>
+            <label>Should the view properties be used for all folders</label>

             <default>false</default>
         </entry>
         <entry name="BrowseThroughArchives" type="Bool">
             <default>false</default>
         </entry>
         <entry name="BrowseThroughArchives" type="Bool">