Directory or Folder? - krusader-i18n

6 messages - Collapse all

Giuseppe Bordoni

View profile

More options Feb 2 2009, 4:11 pm

From: Giuseppe Bordoni <geppo_nospam2...@geppozone.com>

Date: Mon, 02 Feb 2009 22:11:16 +0100

Local: Mon, Feb 2 2009 4:11 pm

Subject: Directory or Folder?

  Reply to author
  |
  Forward
  | Print
  | Individual message
  | Show original
  | Report this message
  | Find messages by this author
  

Hi all,

Directory or Folder? This is the question! :)

In Krusader there is a little bit of confusion with this terms. I prefer
"Directory" for filesystem and "Folder" for other contexts like
bookmark management.

What do you think about?

Bye,

Giuseppe

--
_ Giuseppe Bordoni .oOo. http://www.geppozone.com ( _)
(o)> ------------------------------------------------------- \\\'',)
//\ Al mondo esistono 10 tipi di persone: quelle che \/ \ ^
V_/_ conoscono la notazione binaria e quelle che la ignorano _\'_/_)

Reply to author Forward

Bruno Queiros

View profile

More options Feb 3 2009, 5:12 am

From: Bruno Queiros <bquei...@gmail.com>

Date: Tue, 3 Feb 2009 10:12:06 +0000

Local: Tues, Feb 3 2009 5:12 am

Subject: Re: [Krusader-i18n] Directory or Folder?

  Reply to author
  |
  Forward
  | Print
  | Individual message
  | Show original
  | Report this message
  | Find messages by this author
  

Hello

I agree with that. Directory should be used for filesystems and folder for
other stuff

2009/2/2 Giuseppe Bordoni <geppo_nospam2...@geppozone.com>

- Show quoted text -

Reply to author Forward

Frank Schoolmeesters

View profile

More options Feb 5 2009, 5:32 pm

From: Frank Schoolmeesters <frank.schoolmeest...@gmail.com>

Date: Thu, 5 Feb 2009 23:32:10 +0100

Local: Thurs, Feb 5 2009 5:32 pm

Subject: Re: [Krusader-i18n] Re: Directory or Folder?

  Reply to author
  |
  Forward
  | Print
  | Individual message
  | Show original
  | Report this message
  | Find messages by this author
  

Hi,

If directory is used when folder is better (or in reversed order) in
the Krusader source,
make a list of them (with the pot file) and send them to this list.
After the feature freeze is over (when the stable 2.0 is released) we
will fix them.

Thanks and bye,

Frank

- Show quoted text -

Reply to author Forward

Giuseppe Bordoni

View profile

More options Feb 26 2009, 5:42 pm

From: Giuseppe Bordoni <geppo_nospam2...@geppozone.com>

Date: Thu, 26 Feb 2009 23:42:05 +0100

Local: Thurs, Feb 26 2009 5:42 pm

Subject: Re: [Krusader-i18n] Re: Directory or Folder?

  Reply to author
  |
  Forward
  | Print
  | Individual message
  | Show original
  | Report this message
  | Find messages by this author
  

Frank Schoolmeesters wrote:
> If directory is used when folder is better (or in reversed order) in
> the Krusader source,
> make a list of them (with the pot file) and send them to this list.

Hi all,

in attachment I send you the updated italian translation and a list
of suggested fixes.

Greetings,

Giuseppe

[ it-2009_02_26.po 223K ]
# Translation of krusader.pot to Italian
#
# Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
# Copyright (C) 2004-2008, Krusader Krew
# This file is distributed under the same license as the Krusader package
#
#
# Luigi Curzi <luigi_cu...@yahoo.it>, 2006.
# Giuseppe Bordoni <ge...@geppozone.com>, 2003, 2004, 2005, 2006, 2007, 2009.
msgid ""
msgstr ""
"Project-Id-Version: krusader-2.0.0-beta2\n"
"Report-Msgid-Bugs-To: krusader-i18n@googlegroups.com\n"
"POT-Creation-Date: 2008-12-05 21:44+0100\n"
"PO-Revision-Date: 2009-02-26 22:44+0100\n"
"Last-Translator: Giuseppe Bordoni <ge...@geppozone.com>\n"
"Language-Team: Italian <kde-i18n...@lists.kde.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Lokalize 0.2\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#: GUI/dirhistorybutton.cpp:36 GUI/dirhistorybutton.cpp:37
#, kde-format
msgid "Open the directory history list"
msgstr "Apri la cronologia delle directory"

#: GUI/krusaderstatus.cpp:39
#, kde-format
msgid "Ready."
msgstr "Pronto."

#: GUI/profilemanager.cpp:48 GUI/profilemanager.cpp:68
#, kde-format
msgid "Profiles"
msgstr "Profili"

#: GUI/profilemanager.cpp:83
#, kde-format
msgid "Remove entry"
msgstr "Rimuovi elemento"

#: GUI/profilemanager.cpp:84
#, kde-format
msgid "Overwrite entry"
msgstr "Sovrascrivi elemento"

#: GUI/profilemanager.cpp:87
#, kde-format
msgid "Add new entry"
msgstr "Aggiungi nuovo elemento"

#: GUI/profilemanager.cpp:117
#, kde-format
msgid "Krusader::ProfileManager"
msgstr "Krusader::GestoreProfili"

#: GUI/profilemanager.cpp:117
#, kde-format
msgid "Enter the profile name:"
msgstr "Inserire il nome del profilo:"

#: GUI/krremoteencodingmenu.cpp:128
#, kde-format
msgid "Reload"
msgstr "Ricarica"

#: GUI/krremoteencodingmenu.cpp:132 Filter/generalfilter.cpp:290
#: Konfigurator/konfiguratoritems.cpp:555
#, kde-format
msgid "Default"
msgstr "Valori predefiniti"

#: GUI/mediabutton.cpp:59 GUI/mediabutton.cpp:60
#, kde-format
msgid "Open the available media list"
msgstr "Apri la lista dei dispositivi disponibili"

#: GUI/mediabutton.cpp:138 GUI/mediabutton.cpp:566
#, kde-format
msgid "Remote Share"
msgstr "Condivisione di rete"

#: GUI/mediabutton.cpp:159 GUI/mediabutton.cpp:162 VFS/kiojobwrapper.cpp:195
#, kde-format
msgid "Unknown"
msgstr "Sconosciuto"

#: GUI/mediabutton.cpp:177
#, kde-format
msgid "Floppy"
msgstr "Dischetto"

#: GUI/mediabutton.cpp:179
#, kde-format
msgid "CD/DVD-ROM"
msgstr "Lettore CD/DVD"

#: GUI/mediabutton.cpp:181
#, kde-format
msgid "USB pen drive"
msgstr "Penna USB"

#: GUI/mediabutton.cpp:183
#, kde-format
msgid "USB device"
msgstr "Periferica USB"

#: GUI/mediabutton.cpp:185
#, kde-format
msgid "Removable media"
msgstr "Dispositivi removibili"

#: GUI/mediabutton.cpp:187
#, kde-format
msgid "Hard Disk"
msgstr "Disco rigido"

#: GUI/mediabutton.cpp:189
#, kde-format
msgid "Camera"
msgstr "Macchina fotografica"

#: GUI/mediabutton.cpp:191
#, kde-format
msgid "Video CD/DVD-ROM"
msgstr "CD/DVD-ROM video"

#: GUI/mediabutton.cpp:193
#, kde-format
msgid "Audio CD/DVD-ROM"
msgstr "CD/DVD-ROM audio"

#: GUI/mediabutton.cpp:195
#, kde-format
msgid "Recordable CD/DVD-ROM"
msgstr "CD/DVD-ROM registrabile"

#: GUI/mediabutton.cpp:325 Panel/krpopupmenu.cpp:69
#: BookMan/krbookmarkhandler.cpp:557
#, kde-format
msgid "Open"
msgstr "Apri"

#: GUI/mediabutton.cpp:327 BookMan/krbookmarkhandler.cpp:559
#, kde-format
msgid "Open in a new tab"
msgstr "Apri in una nuova linguetta"

#: GUI/mediabutton.cpp:332 Panel/krpopupmenu.cpp:189
#: MountMan/kmountman.cpp:296 MountMan/kmountmangui.cpp:371
#, kde-format
msgid "Mount"
msgstr "Monta"

#: GUI/mediabutton.cpp:335 Panel/krpopupmenu.cpp:187
#: MountMan/kmountman.cpp:296 MountMan/kmountmangui.cpp:376
#, kde-format
msgid "Unmount"
msgstr "Smonta"

#: GUI/mediabutton.cpp:339 Panel/krpopupmenu.cpp:191
#: MountMan/kmountmangui.cpp:383
#, kde-format
msgid "Eject"
msgstr "Espelli"

#: GUI/mediabutton.cpp:423
#, kde-format
msgid "An error occurred while accessing '%1', the system responded: %2"
msgstr "Si Ã¨ verificato un errore accedendo a '%1', il sistema ha risposto: %2"

#: GUI/mediabutton.cpp:426
#, kde-format
msgid "An error occurred while accessing '%1'"
msgstr "Si Ã¨ verificato un errore accedendo a '%1'"

#: GUI/syncbrowsebutton.cpp:45 GUI/syncbrowsebutton.cpp:48
#, kde-format
msgid ""
"This button toggles the sync-browse mode.\n"
"When active, each directory change is performed in the\n"
"active and inactive panel - if possible."
msgstr ""
"Questo pulsante commuta la modalitÃ sincronizzazione navigazione.\n"
"Se attivo, ogni modifica alla directory Ã¨ eseguita nel\n"
"pannello attivo e, se possibile, in quello inattivo."

#. i18n: tag string
#. i18n: file ./ActionMan/actionproperty.ui line 414
#: GUI/kcmdmodebutton.cpp:48 ActionMan/ui_actionproperty.h:726 rc.cpp:122
#, kde-format
msgid "Execution mode"
msgstr "Modo di esecuzione"

#: GUI/kcmdline.cpp:66
#, kde-format
msgid "Name of directory where command will be processed."
msgstr "Nome della directory nella quale sarÃ eseguito il comando."

#: GUI/kcmdline.cpp:95
#, kde-format
msgid ""
"<qt>Well, it's actually quite simple: You type your command here and "
"Krusader obeys.Tip: Move within command line history with <"
"Up> and <Down> arrows.</qt>"
msgstr ""
"<qt>Dunque, questo Ã¨ davvero semplice: tu scrivi un comando qui, e "
"Krusader obbedisce.Consiglio:: Ci si puÃ² spostare nella "
"cronologia dei comandi con le frecce <Alto> e <Basso>.</qt>"

#. i18n: tag string
#. i18n: file ./ActionMan/actionproperty.ui line 303
#: GUI/kcmdline.cpp:103 ActionMan/ui_actionproperty.h:698 rc.cpp:92
#, kde-format
msgid "Add Placeholders for the selected files in the panel."
msgstr "Aggiungi Segnaposti per i file selezionati nel pannello."

#: GUI/kfnkeys.cpp:50
#, kde-format
msgid "F2 Term "
msgstr "F2 Term "

#: GUI/kfnkeys.cpp:51
#, kde-format
msgid ""
"Open terminal in current directory.The terminal can be defined in "
"Konfigurator, default is konsole."
msgstr ""
"Apre un terminale nella directory attuale.Si puÃ² definire il "
"terminale in Konfigurator; quello predefinito Ã¨ konsole."

#: GUI/kfnkeys.cpp:57
#, kde-format
msgid "F3 View "
msgstr "F3 Vista "

#: GUI/kfnkeys.cpp:58
#, kde-format
msgid "Open file in viewer."
msgstr "Apre il file nel visualizzatore."

#: GUI/kfnkeys.cpp:62
#, kde-format
msgid "F4 Edit "
msgstr "F4 Modifica "

#: GUI/kfnkeys.cpp:63
#, kde-format
msgid ""
"Edit file.The editor can be defined in Konfigurator, default is "
"internal editor."
msgstr ""
"Modifica il file.L'editor Ã¨ configurabile in Konfigurator; quello "
"predefinito Ã¨ internal editor."

#: GUI/kfnkeys.cpp:69
#, kde-format
msgid "F5 Copy "
msgstr "F5 Copia "

#: GUI/kfnkeys.cpp:70
#, kde-format
msgid "Copy file from one panel to the other."
msgstr "Copia file da un pannello all'altro."

#: GUI/kfnkeys.cpp:74
#, kde-format
msgid "F6 Move"
msgstr "F6 Sposta"

#: GUI/kfnkeys.cpp:75
#, kde-format
msgid "Move file from one panel to the other."
msgstr "Sposta file da un pannello all'altro."

#: GUI/kfnkeys.cpp:79
#, kde-format
msgid "F7 Mkdir "
msgstr "F7 CreaDir "

#: GUI/kfnkeys.cpp:80
#, kde-format
msgid "Create directory in current panel."
msgstr "Crea una directory nel pannello attuale."

#: GUI/kfnkeys.cpp:84
#, kde-format
msgid "F8 Delete"
msgstr "F8 Elimina"

#: GUI/kfnkeys.cpp:85
#, kde-format
msgid "Delete file, directory, etc."
msgstr "Elimina file, directory, ecc."

#: GUI/kfnkeys.cpp:89
#, kde-format
msgid "F9 Rename"
msgstr "F9 Rinomina"

#: GUI/kfnkeys.cpp:90
#, kde-format
msgid "Rename file, directory, etc."
msgstr "Rinomina file, directory, ecc."

#: GUI/kfnkeys.cpp:94
#, kde-format
msgid "F10 Quit "
msgstr "F10 Esci "

#: GUI/kfnkeys.cpp:95
#, kde-format
msgid "Quit Krusader."
msgstr "Chiude Krusader."

#: GUI/kfnkeys.cpp:121
#, kde-format
msgid " Term"
msgstr " Term"

#: GUI/kfnkeys.cpp:122
#, kde-format
msgid " View"
msgstr " Vista"

#: GUI/kfnkeys.cpp:123
#, kde-format
msgid " Edit"
msgstr " Modifica"

#: GUI/kfnkeys.cpp:124
#, kde-format
msgid " Copy"
msgstr " Copia"

#: GUI/kfnkeys.cpp:125
#, kde-format
msgid " Move"
msgstr " Sposta"

#: GUI/kfnkeys.cpp:126
#, kde-format
msgid " Mkdir"
msgstr " CreaDir"

#: GUI/kfnkeys.cpp:127
#, kde-format
msgid " Delete"
msgstr " Elimina"

#: GUI/kfnkeys.cpp:128
#, kde-format
msgid " Rename"
msgstr " Rinomina"

#: GUI/kfnkeys.cpp:129
#, kde-format
msgid " Quit"
msgstr " Esci"

#: VFS/ftp_vfs.cpp:157
#, kde-format
msgid ""
"Malformed URL:\n"
"%1"
msgstr ""
"URL non corretto:\n"
"%1"

#: VFS/ftp_vfs.cpp:160
#, kde-format
msgid ""
"Krusader doesn't support FTP access via HTTP.\n"
"If it is not the case, please check and change the Proxy settings in "
"kcontrol."
msgstr ""
"Krusader non supporta l'accesso FTP attraverso HTTP.\n"
"Se non Ã¨ questo il caso, per favore controllare e cambiare le impostazioni "
"Proxy nel centro di controllo KDE."

#: VFS/ftp_vfs.cpp:162
#, kde-format
msgid ""
"Protocol not supported by Krusader:\n"
"%1"
msgstr ""
"Protocollo non supportato da Krusader:\n"
"%1"

#: VFS/preserveattrcopyjob.cpp:334 VFS/virtualcopyjob.cpp:389
#, kde-format
msgctxt "@title job"
msgid "Moving"
msgstr "Spostamento file"

#: VFS/preserveattrcopyjob.cpp:335 VFS/preserveattrcopyjob.cpp:342
#: VFS/preserveattrcopyjob.cpp:349 VFS/preserveattrcopyjob.cpp:373
#: VFS/kiojobwrapper.cpp:221 VFS/virtualcopyjob.cpp:384
#: VFS/virtualcopyjob.cpp:390
#, kde-format
msgid "Source"
msgstr "Sorgente"

#: VFS/preserveattrcopyjob.cpp:336 VFS/preserveattrcopyjob.cpp:343
#: VFS/preserveattrcopyjob.cpp:350 VFS/preserveattrcopyjob.cpp:374
#: VFS/virtualcopyjob.cpp:385 VFS/virtualcopyjob.cpp:391
#, kde-format
msgid "Destination"
msgstr "Destinazione"

#: VFS/preserveattrcopyjob.cpp:341 VFS/preserveattrcopyjob.cpp:348
#: ...

read more »

[ suggested_fixes.txt 1K ]
-----------------------------------------------------
In my opinion it's needed to swap the words "directory"
and "folder" into following messages
-----------------------------------------------------

VFS/preserveattrcopyjob.cpp:793
Folder Already Exists

VFS/preserveattrcopyjob.cpp:1074
Already Exists as Folder

UserAction/expander.cpp:672
Copy a File/Folder...

UserAction/expander.cpp:708
Move/Rename a File/Folder...

Panel/krpopupmenu.cpp:231
Folder...

Dialogs/checksumdlg.cpp:234
and folders:

Konfigurator/kglookfeel.cpp:215
Show the icons for filenames and folders.

Konfigurator/kglookfeel.cpp:216
Load the user defined folder icons

Konfigurator/kglookfeel.cpp:216
Load the user defined folder icons (can cause decrease in performance).

Konfigurator/kglookfeel.cpp:400
If checked, pressing the spacebar while the current item is a folder, will
(except from selecting the folder) \n
calculate space occupied by the folder (recursively).

-----------------------------------------------------
Do it's possible to delete then member function name
"Expander::..." from following strings? IMHO they
aren't useful to users.
-----------------------------------------------------

UserAction/expander.cpp:1111
Error: unterminated % in Expander::expandCurrent

UserAction/expander.cpp:1141
Error: unrecognized %%%1%2%% in Expander::expand

UserAction/expander.cpp:1179
Error: missing ')' in Expander::separateParameter

Reply to author Forward

Frank Schoolmeesters

View profile

More options Feb 27 2009, 6:40 am

From: Frank Schoolmeesters <frank.schoolmeest...@gmail.com>

Date: Fri, 27 Feb 2009 12:40:56 +0100

Local: Fri, Feb 27 2009 6:40 am

Subject: Re: [Krusader-i18n] Re: Directory or Folder?

  Reply to author
  |
  Forward
  | Print
  | Individual message
  | Show original
  | Report this message
  | Find messages by this author
  

Hi Giuseppe,

I have committed it.po in SVN
http://krusader.svn.sourceforge.net/viewvc/krusader/trunk/krusader_kd...

I have created a bug report for the Folder-Directory consistency, so
that the changes don't get lost in many e-mails.
http://sourceforge.net/tracker2/?func=detail&aid=2645035&group_id=648...

Thanks and bye,

Frank

On Thu, Feb 26, 2009 at 11:42 PM, Giuseppe Bordoni

- Show quoted text -

Reply to author Forward

Frank Schoolmeesters

View profile

More options Aug 8 2009, 5:22 pm

From: Frank Schoolmeesters <frank.schoolmeest...@gmail.com>

Date: Sat, 8 Aug 2009 23:22:45 +0200

Local: Sat, Aug 8 2009 5:22 pm

Subject: Re: [Krusader-i18n] Re: Directory or Folder?

  Reply to author
  |
  Forward
  | Print
  | Individual message
  | Show original
  | Report this message
  | Find messages by this author
  

Hi Giuseppe,

I have fixed the folder/directory strings in KDE Extragear SVN.

For
---------------
Panel/krpopupmenu.cpp:231
Folder...
---------------
-> I have left it unchanged, If I take a look at the source code, I
think it's for creating a menu entry and it's not related to a file
system

I have fixed the "Expander::..." stuff.

More detailed information at below.

Sorry for the delay.

thanks and bye,

Frank

On Fri, Feb 27, 2009 at 1:40 PM, Frank

- Show quoted text -

http://sourceforge.net/tracker/?func=detail&aid=2645035&group_id=6488...
#############
String fixes: Folder-Directory consistency - ID: 2645035
Last Update: Tracker Item Submitted ( codeknight )
Details:

Suggestions for Folder-Directory consistency from Giuseppe Bordoni

Quote:
"Directory or Folder? This is the question! :)

In Krusader there is a little bit of confusion with this terms. I prefer
"Directory" for filesystem and "Folder" for other contexts like
bookmark management."

See also i18n mailing list for more info
http://groups.google.com/group/krusader-i18n/browse_thread/thread/233...
180bfa

Here is the list of suggestions:
####################

-----------------------------------------------------
In my opinion it's needed to swap the words "directory"
and "folder" into following messages
-----------------------------------------------------

VFS/preserveattrcopyjob.cpp:793
Folder Already Exists

VFS/preserveattrcopyjob.cpp:1074
Already Exists as Folder

UserAction/expander.cpp:672
Copy a File/Folder...

UserAction/expander.cpp:708
Move/Rename a File/Folder...

Panel/krpopupmenu.cpp:231
Folder...

Dialogs/checksumdlg.cpp:234
and folders:

Konfigurator/kglookfeel.cpp:215
Show the icons for filenames and folders.

Konfigurator/kglookfeel.cpp:216
Load the user defined folder icons

Konfigurator/kglookfeel.cpp:216
Load the user defined folder icons (can cause decrease in performance).

Konfigurator/kglookfeel.cpp:400
If checked, pressing the spacebar while the current item is a folder, will

(except from selecting the folder) \n
calculate space occupied by the folder (recursively).

UserAction/expander.cpp:1111
Error: unterminated % in Expander::expandCurrent

UserAction/expander.cpp:1141
Error: unrecognized %%%1%2%% in Expander::expand

UserAction/expander.cpp:1179
Error: missing ')' in Expander::separateParameter

##########################

- Show quoted text -

---------- Forwarded message ----------
From: Frank Schoolmeesters <codekni...@users.sourceforge.net>
Date: Sat, Aug 8, 2009 at 11:10 PM
Subject: extragear/utils/krusader/krusader
To: kde-comm...@kde.org

SVN commit 1008990 by frankschoolmeesters:

folder/directory consistency
This closes bug "Folder-Directory consistency" - ID: 2645035 at Sourceforge
http://sourceforge.net/tracker/?func=detail&aid=2645035&group_id=6488...
-------------
Panel/krpopupmenu.cpp:231
Folder...
-> I have left it unchanged, it's for creating a menu entry and not
related to a filesystem

M +1 -1 Dialogs/checksumdlg.cpp
M +3 -3 Konfigurator/kglookfeel.cpp
M +5 -5 UserAction/expander.cpp
M +2 -2 VFS/preserveattrcopyjob.cpp

--- trunk/extragear/utils/krusader/krusader/Dialogs/checksumdlg.cpp
#1008989:1008990
@@ -265,7 +265,7 @@
p->setPixmap(krLoader->loadIcon("binary", KIconLoader::Desktop, 32));
hlayout->addWidget(p);
QLabel *l1 = new QLabel(i18n("About to calculate checksum for the
following files") +
- (containFolders ? i18n(" and folders:") :
":"), widget);
+ (containFolders ? i18n(" and
directories:") : ":"), widget);
hlayout->addWidget(l1);
layout->addLayout(hlayout, row, 0, 1, 2, Qt::AlignLeft);
++row;
--- trunk/extragear/utils/krusader/krusader/Konfigurator/kglookfeel.cpp
#1008989:1008990
@@ -215,8 +215,8 @@
KONFIGURATOR_CHECKBOX_PARAM panelSettings[] =
// cfg_class cfg_name default text
restart tooltip
{
- {"Look&Feel", "With Icons", _WithIcons,
i18n("Use icons in the filenames"), true , i18n("Show the
icons for filenames and folders.") },
- {"Look&Feel", "Load User Defined Folder Icons",
_UserDefinedFolderIcons, i18n("Load the user defined folder icons"),
true , i18n("Load the user defined folder icons (can cause decrease
in performance).") },
+ {"Look&Feel", "With Icons", _WithIcons,
i18n("Use icons in the filenames"), true , i18n("Show the
icons for filenames and directories.") },
+ {"Look&Feel", "Load User Defined Folder Icons",
_UserDefinedFolderIcons, i18n("Load the user defined folder icons"),
true , i18n("Load the user defined directory icons (can cause
decrease in performance).") },
{"Look&Feel", "Human Readable Size",
_HumanReadableSize, i18n("Use human-readable file size"), true ,
i18n("File sizes are displayed in B, KB, MB and GB, not just in
bytes.") },
{"Look&Feel", "Show Hidden", _ShowHidden,
i18n("Show hidden files"), false, i18n("Display files
beginning with a dot.") },
{"Look&Feel", "Numeric permissions",
_NumericPermissions, i18n("Numeric Permissions"), true,
i18n("Show octal numbers (0755) instead of the standard permissions
(rwxr-xr-x) in the permission column.") },
@@ -398,7 +398,7 @@
i18n("If checked, pressing the spacebar will select the
current item and move down. \nOtherwise, current item is selected, but
remains the current item.") },
{"Custom Selection Mode", "Space Calc Space", _SpaceCalcSpace,
i18n("Spacebar calculates disk space"), true,
- i18n("If checked, pressing the spacebar while the current
item is a folder, will (except from selecting the folder) \ncalculate
space occupied by the folder (recursively).") },
+ i18n("If checked, pressing the spacebar while the current
item is a directory, will (except from selecting the directory)
\ncalculate space occupied of the directory (recursively).") },
{"Custom Selection Mode", "Insert Moves Down", _InsertMovesDown,
i18n("Insert moves down"), true,
i18n("If checked, pressing INSERT will select the current
item, and move down to the next item. \nOtherwise, current item is not
changed.") },
--- trunk/extragear/utils/krusader/krusader/UserAction/expander.cpp
#1008989:1008990
@@ -721,7 +721,7 @@
exp_Copy::exp_Copy()
{
_expression = "Copy";
- _description = i18n("Copy a File/Folder...");
+ _description = i18n("Copy a File/Directory...");
_needPanel = false;

addParameter(exp_parameter(i18n("What to copy:"), "__placeholder", true));
@@ -759,7 +759,7 @@
exp_Move::exp_Move()
{
_expression = "Move";
- _description = i18n("Move/Rename a File/Folder...");
+ _description = i18n("Move/Rename a File/Directory...");
_needPanel = false;

addParameter(exp_parameter(i18n("What to move/rename:"),
"__placeholder", true));
@@ -1181,7 +1181,7 @@
if ((begin = stringToExpand.indexOf('%', idx)) == -1) break;
if ((end = findEnd(stringToExpand, begin)) == -1) {
// xgettext:no-c-format
- setError(Error(Error::exp_S_FATAL, Error::exp_C_SYNTAX,
i18n("Error: unterminated % in Expander::expandCurrent")));
+ setError(Error(Error::exp_S_FATAL, Error::exp_C_SYNTAX,
i18n("Error: unterminated % in Expander")));
return QString();
}

@@ -1210,7 +1210,7 @@
break;
}
if (i == placeholderCount()) { // didn't find an expander
- setError(Error(Error::exp_S_FATAL,
Error::exp_C_SYNTAX, i18n("Error: unrecognized %%%1%2%% in
Expander::expand", panelIndicator, exp)));
+ setError(Error(Error::exp_S_FATAL,
Error::exp_C_SYNTAX, i18n("Error: unrecognized %%%1%2%% in Expander",
panelIndicator, exp)));
return QString();
}
} //else
@@ -1250,7 +1250,7 @@
int begin, end;
if ((begin = exp->indexOf('(')) != -1) {
if ((end = exp->lastIndexOf(')')) == -1) {
- setError(Error(Error::exp_S_FATAL, Error::exp_C_SYNTAX,
i18n("Error: missing ')' in Expander::separateParameter")));
+ setError(Error(Error::exp_S_FATAL, Error::exp_C_SYNTAX,
i18n("Error: missing ')' in Expander")));
return TagStringList();
}
result = exp->mid(begin + 1, end - begin - 1);
--- trunk/extragear/utils/krusader/krusader/VFS/preserveattrcopyjob.cpp
#1008989:1008990
@@ -740,7 +740,7 @@
QString newPath;
if (m_reportTimer)

...

read more »

Reply to author Forward

End of messages

« Back to Discussions

« Newer topic

Older topic »