[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: playground/utils/gwenrename/src
From: Andrew Coles <andrew_coles () yahoo ! co ! uk>
Date: 2009-11-13 15:10:04
Message-ID: 1258125004.784772.30785.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1048573 by coles:
Proof-reading and fixing plural form usage. In general, avoid exclamation points, \
put full-stops at end of sentences, and house-style is to write do not instead of \
don't.
M +8 -8 main.cpp
M +8 -8 rename.cpp
M +1 -1 rename.ui
--- trunk/playground/utils/gwenrename/src/main.cpp #1048572:1048573
@@ -139,7 +139,7 @@
if(fInfo.isDir()){
if(!fInfo.isWritable()){
- QString m=i18n("Directory '%1' can not be renamed\nYou don't have write \
permission to this directory", tmp ); + QString m=i18n("Directory '%1' cannot be \
renamed.\nYou do not have write permission to this directory.", tmp ); \
KMessageBox::error(0,m,"",KMessageBox::AllowLink); args->clear();
return 0;
@@ -177,13 +177,13 @@
if(!f.canRename()){
for(int y=0;y<f.numOfFiles;y++){
if(!f.files[y].exists()){
- QString m=i18n("File '%1' does not exist\nPlease check your selection and try \
again", f.files[y].filePath() ); + QString m=i18n("File '%1' does not \
exist.\nPlease check your selection and try again.", f.files[y].filePath() ); \
KMessageBox::error(0,m,"",KMessageBox::AllowLink); args->clear();
return 0;
}
if(!f.files[y].isWritable()){
- QString m=i18n("File '%1' can not be renamed\nYou don't have write permission \
to this file", f.files[y].filePath() ); + QString m=i18n("File '%1' cannot be \
renamed.\nYou do not have write permission to this file.", f.files[y].filePath() ); \
KMessageBox::error(0,m,"",KMessageBox::AllowLink); args->clear();
return 0;
@@ -192,23 +192,23 @@
}
f.getType();
if(f.Type==0){
- KMessageBox::error(0,i18n("Invalid file type selected\nYou can rename normal \
files or directories"),0); + KMessageBox::error(0,i18n("Invalid file type \
selected.\nYou can rename normal files or directories."),0); args->clear();
return 0;
}else if(f.Type==-1){
- KMessageBox::error(0,i18n("Invalid selection\nYou can not mix files and \
directories in the same renaming function"),0); \
+ KMessageBox::error(0,i18n("Invalid selection.\nYou can not mix files and \
directories in the same renaming function."),0); args->clear();
return 0;
}
if(!f.samePath()){
- KMessageBox::error(0,i18n("Invalid selection\nThe files must be in the same \
directory"),0); + KMessageBox::error(0,i18n("Invalid selection.\nThe files must be \
in the same directory."),0); args->clear();
return 0;
}
if(f.Type==2){
for(int i=0;i<f.items();i++){
if((f.files[i].filePath()==f.files[i].absolutePath()+"/.") || \
(f.files[i].filePath()==f.files[i].absolutePath()+"/..")){
- KMessageBox::error(0,i18n("Invalid selection\nYou can't rename the current or \
parent directory"),0); + KMessageBox::error(0,i18n("Invalid selection.\nYou \
cannot rename the current or parent directory."),0); args->clear();
return 0;
}
@@ -243,7 +243,7 @@
}else{
g.setPath(askDir,spec,iSpec);
if(g.numOfFiles<=0){
- KMessageBox::error(0,i18n("<p>Folder <b>%1</b> is empty!!!</p>",askDir),0);
+ KMessageBox::error(0,i18n("<p>Folder <b>%1</b> is empty.</p>",askDir),0);
return 0;
}
if(f.reSetItems(g.numOfFiles)==-1){
--- trunk/playground/utils/gwenrename/src/rename.cpp #1048572:1048573
@@ -268,7 +268,7 @@
readConfig();
- lSelected->setText(i18n("%1/%2 items selected",f.items(),g.numOfFiles));
+ lSelected->setText(i18np("%2/%1 item selected","%2/%1 items \
selected",g.numOfFiles,f.items())); if(f.Type==2){
rShuffle->setEnabled(true);
}else{
@@ -1037,7 +1037,7 @@
}
if(g.numOfSlectedItems()==0){
rShow->setChecked(true);
- lSelected->setText(i18n("%1/%2 items selected",0,g.numOfFiles));
+ lSelected->setText(i18np("%2/%1 item selected","%2/%1 items \
selected",g.numOfFiles,0)); rShowClicked(1);
}else{
if(rShow->isChecked() && rShow->isEnabled()) rShowClicked(1);
@@ -1380,9 +1380,9 @@
// done(1);
}else if(errorMsg==2)
- KMessageBox::error(0,i18n("Icon not found\n\nThe program could not find an icon \
that's necessary for its execution. Please check your installation"),0); \
+ KMessageBox::error(0,i18n("Icon not found.\n\nThe program could not find an icon \
necessary for its execution. Please check your installation."),0); else \
if(errorMsg==3)
- KMessageBox::error(0,i18n("Icons not found\n\nThe program could not find some \
icons that are necessary for its execution. Please check your installation"),0); \
+ KMessageBox::error(0,i18n("Icons not found.\n\nThe program could not find some \
icons that are necessary for its execution. Please check your installation."),0); }
//================================
@@ -2947,7 +2947,7 @@
itemsSkipped++;
if(itemsSkipped<=SHOW_ITEMS_TO_LIST_PROBLEM)
// It cannot be renamed; inform the user
- msg->append("<li>"+i18n("Item <b>%1</b> is of wrong type",readName)+"</li>");
+ msg->append("<li>"+i18n("Item <b>%1</b> is of the wrong \
type.",readName)+"</li>"); setNewFileData(found,false);
}
}else{
@@ -2995,10 +2995,10 @@
if(!msg->isEmpty()){
if(itemsSkipped>=SHOW_ITEMS_TO_LIST_PROBLEM){
msg->prepend("<p>"+i18n("The following problems occurred:")+"</p><ul>");
- msg->append("</ul><p>"+i18n("(not displaying %1 more \
problems)",itemsSkipped-SHOW_ITEMS_TO_LIST_PROBLEM)+"<br><br>"+i18n("Items present in \
this list will not be available for renaming!!!")+"</p>"); \
+ msg->append("</ul><p>"+i18np("(not displaying 1 more problem)","(not displaying \
%1 more problems)",itemsSkipped-SHOW_ITEMS_TO_LIST_PROBLEM)+"<br><br>"+i18n("Items \
present in this list will not be available for renaming.")+"</p>"); }else{
msg->prepend("<p>"+i18n("The following problems occurred:")+"</p><ol>");
- msg->append("</ol><p>"+i18n("Items present in this list will not be available for \
renaming!!!")+"</p>"); + msg->append("</ol><p>"+i18n("Items present in this list \
will not be available for renaming.")+"</p>"); }
KMessageBox::information(this,*msg,"","",KMessageBox::AllowLink);
// msg="<p>"+i18n("The following problems \
occurred:")+"</p><ul>"+msg+"</ul><p>"+QString(i18n("(not displaying %1 more \
problems)").arg(itemsToManipulate-10))+"<br><br>"+i18n("Items present in this list \
will not be available for renaming!!!")+"</p>"; @@ -3044,7 +3044,7 @@
sortToggled(sort->isChecked());
for(int k=0;k<g.numOfFiles;k++)
if(g.ren[k].selected) allSelected++;
- lSelected->setText(i18n("%1/%2 items selected",allSelected,g.numOfFiles));
+ lSelected->setText(i18np("%2/%1 item selected","%2/%1 items \
selected",g.numOfFiles,allSelected)); if(allSelected==0) filesSelectedType=-2;
if(allSelected==g.numOfFiles) rShow->setEnabled(false);
else rShow->setEnabled(true);
--- trunk/playground/utils/gwenrename/src/rename.ui #1048572:1048573
@@ -1107,7 +1107,7 @@
</property>
<property name="toolTip">
<string><p><b>'Relaxed' numbering</b></p>
-<p>When this option is enabled, the program will find the files that match the \
renaming cretiria but are not selected for renaming, and adjust the starting value of \
the counter so that the resulting filenames will follow the last existing file. This \
means that the starting value of the counter may be different than the one defined by \
the user.</p></string> +<p>When this option is enabled, the program will \
find the files that match the renaming criteria but are not selected for renaming, \
and adjust the starting value of the counter so that the resulting filenames will \
follow the last existing file. This means that the starting value of the counter may \
be different than the one defined by the user.</p></string> </property>
<property name="text">
<string>Use 'relaxed' numbering</string>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic