Permalink
Browse files

Fix spelling errors (mostly in comments).

These are just the ones caught by krazy, but there don't seem to be too
many string changes.  The main one is that Ressources should be spelled
with one s, not two, and that does affect a few translated strings.
  • Loading branch information...
atomopawn authored and mattr- committed Aug 7, 2011
1 parent f23b0a7 commit d0504d5852512b40a724556e1d80a3b02c979405
View
@@ -1332,7 +1332,7 @@ msgid ""
msgstr ""
#: src/bnpview.cpp:1831
-msgid "Ressource not Found"
+msgid "Resource not Found"
msgstr ""
#: src/bnpview.cpp:1855 src/bnpview.cpp:1864
View
@@ -1472,7 +1472,7 @@ msgstr ""
"odstranit %5basketui.rc</p>"
#: src/bnpview.cpp:1831
-msgid "Ressource not Found"
+msgid "Resource not Found"
msgstr "Zdroj nenalezen"
#: src/bnpview.cpp:1855 src/bnpview.cpp:1864
View
@@ -1460,8 +1460,8 @@ msgstr ""
"havde en testversion af det, så forsøg at fjerne filen %5basketui.rc</p>"
#: src/bnpview.cpp:1831
-msgid "Ressource not Found"
-msgstr "Ressource ikke fundet"
+msgid "Resource not Found"
+msgstr "Resource ikke fundet"
#: src/bnpview.cpp:1855 src/bnpview.cpp:1864
msgid "Cannot add note."
View
@@ -1276,9 +1276,9 @@ msgstr ""
"sind, dass die Anwendung richtig installiert wurde, sollten Sie versuchen "
"die Datei %5basketui.rc zu entfernen.</p>"
-#: src/bnpview.cpp:1901
-msgid "Ressource not Found"
-msgstr "Ressource nicht gefunden"
+#: src/bnpview.cpp:1831
+msgid "Resource not Found"
+msgstr "Resource nicht gefunden"
#: src/bnpview.cpp:1925 src/bnpview.cpp:1934
msgid "Cannot add note."
View
@@ -1485,7 +1485,7 @@ msgstr ""
"el fichero %5basketui.rc</p>"
#: src/bnpview.cpp:1831
-msgid "Ressource not Found"
+msgid "Resource not Found"
msgstr "Recurso no encontrado"
#: src/bnpview.cpp:1855 src/bnpview.cpp:1864
View
@@ -1457,8 +1457,8 @@ msgstr ""
"essayez de supprimer le fichier %5basketui.rc</p>"
#: src/bnpview.cpp:1831
-msgid "Ressource not Found"
-msgstr "Ressource non trouvée"
+msgid "Resource not Found"
+msgstr "Resource non trouvée"
#: src/bnpview.cpp:1855 src/bnpview.cpp:1864
msgid "Cannot add note."
View
@@ -1468,7 +1468,7 @@ msgstr ""
"definitiva, prova a rimuovere il file %5basketui.rc</p>"
#: src/bnpview.cpp:1831
-msgid "Ressource not Found"
+msgid "Resource not Found"
msgstr "Risorsa non trovata"
#: src/bnpview.cpp:1855 src/bnpview.cpp:1864
View
@@ -1444,7 +1444,7 @@ msgstr ""
"合は、最後の手段として、ファイル %5basketui.rc を削除してみてください。</p>"
#: src/bnpview.cpp:1831
-msgid "Ressource not Found"
+msgid "Resource not Found"
msgstr "リソースが見つかりません"
#: src/bnpview.cpp:1855 src/bnpview.cpp:1864
View
@@ -1444,7 +1444,7 @@ msgid ""
msgstr ""
#: src/bnpview.cpp:1831
-msgid "Ressource not Found"
+msgid "Resource not Found"
msgstr ""
#: src/bnpview.cpp:1855 src/bnpview.cpp:1864
View
@@ -1470,7 +1470,7 @@ msgstr ""
"5basketui.rc».</p>"
#: src/bnpview.cpp:1831
-msgid "Ressource not Found"
+msgid "Resource not Found"
msgstr "Fann ikkje resurs"
#: src/bnpview.cpp:1855 src/bnpview.cpp:1864
View
@@ -1465,7 +1465,7 @@ msgstr ""
"5basketui.rg</p>"
#: src/bnpview.cpp:1831
-msgid "Ressource not Found"
+msgid "Resource not Found"
msgstr "Nie znaleziono zasobu"
#: src/bnpview.cpp:1855 src/bnpview.cpp:1864
View
@@ -1476,7 +1476,7 @@ msgstr ""
"5basketui.rc</p>"
#: src/bnpview.cpp:1831
-msgid "Ressource not Found"
+msgid "Resource not Found"
msgstr "Recurso não Encontrado"
#: src/bnpview.cpp:1855 src/bnpview.cpp:1864
View
@@ -1455,7 +1455,7 @@ msgstr ""
"случае, можно попробовать удалить файл %5basketui.rc</p>"
#: src/bnpview.cpp:1831
-msgid "Ressource not Found"
+msgid "Resource not Found"
msgstr "Не найден"
#: src/bnpview.cpp:1855 src/bnpview.cpp:1864
View
@@ -1436,7 +1436,7 @@ msgstr ""
"dosyasını silmeyi deneyin.</p>"
#: src/bnpview.cpp:1831
-msgid "Ressource not Found"
+msgid "Resource not Found"
msgstr "Kaynak Bulunamadı"
#: src/bnpview.cpp:1855 src/bnpview.cpp:1864
View
@@ -1372,7 +1372,7 @@ msgid ""
msgstr ""
#: src/bnpview.cpp:1831
-msgid "Ressource not Found"
+msgid "Resource not Found"
msgstr "文件源不存在"
#: src/bnpview.cpp:1855 src/bnpview.cpp:1864
View
@@ -1420,7 +1420,7 @@ msgid ""
msgstr ""
#: src/bnpview.cpp:1831
-msgid "Ressource not Found"
+msgid "Resource not Found"
msgstr ""
#: src/bnpview.cpp:1855 src/bnpview.cpp:1864
View
@@ -407,7 +407,7 @@ void Archive::open(const QString &path)
} else {
// We do not know what it is, and we do not care.
}
- // Analyse the Value, if Understood:
+ // Analyze the Value, if Understood:
}
file.close();
}
View
@@ -72,7 +72,7 @@ class OpaqueBackgroundEntry
* It get all image names with imageNames() to put them in eg. a QComboBox and then,
* when it's time to get the preview of an image it call preview() with the image name to get it.
* Preview are only computed on demand and then cached to fast the next demands (only the pointer will have to be returned).
- * Previews are scalled to fit in a rectangle of 100 by 75 pixels, and with a white background color.
+ * Previews are scaled to fit in a rectangle of 100 by 75 pixels, and with a white background color.
* They are also saved to files, so that the scalling/opaquification has not to be done later (they will be directly loaded from file).
* Previews are saved in Global::backgroundsFolder()+"previews/", so that emptying the folder is sufficient to remove them.
* BASIC FUNCTIONNING OF AN IMAGE REQUESTER:
View
@@ -314,7 +314,7 @@ void BackupDialog::restore()
}
// Note: The safety backup is not removed now because the code can has been wrong, somehow, or the user perhapse restored an older backup by error...
- // The restore process will not be called very often (it is possible it will only be called once or twice arround the world during the next years).
+ // The restore process will not be called very often (it is possible it will only be called once or twice around the world during the next years).
// So it is rare enough to force the user to remove the safety folder, but keep him in control and let him safely recover from restoration errors.
Backup::setFolderAndRestart(Global::savesFolder()/*No change*/, i18n("Your backup has been successfuly restored to <b>%1</b>. %2 is going to be restarted to take this change into account."));
@@ -330,7 +330,7 @@ void Backup::figureOutBinaryPath(const char *argv0, QApplication &app)
{
/*
The application can be launched by two ways:
- - Globaly (app.applicationFilePath() is good)
+ - Globally (app.applicationFilePath() is good)
- In KDevelop or with an absolute path (app.applicationFilePath() is wrong)
This function is called at the very start of main() so that the current directory has not been changed yet.
View
@@ -268,7 +268,7 @@ QPixmap BasketListViewItem::circledTextPixmap(const QString &text, int height, c
return pmScaled;
}
-QPixmap BasketListViewItem::foundCountPixmap(bool isLoading, int countFound, bool childsAreLoading, int countChildsFound, const QFont &font, int height)
+QPixmap BasketListViewItem::foundCountPixmap(bool isLoading, int countFound, bool childrenAreLoading, int countChildsFound, const QFont &font, int height)
{
if (isLoading)
return QPixmap();
@@ -277,7 +277,7 @@ QPixmap BasketListViewItem::foundCountPixmap(bool isLoading, int countFound, boo
boldFont.setBold(true);
QString text;
- if (childsAreLoading) {
+ if (childrenAreLoading) {
if (countChildsFound > 0)
text = i18n("%1+%2+", QString::number(countFound), QString::number(countChildsFound));
else
View
@@ -59,7 +59,7 @@ class BasketListViewItem : public QTreeWidgetItem
QString escapedName(const QString &string);
QPixmap circledTextPixmap(const QString &text, int height, const QFont &font, const QColor &color);
- QPixmap foundCountPixmap(bool isLoading, int countFound, bool childsAreLoading, int countChildsFound, const QFont &font, int height);
+ QPixmap foundCountPixmap(bool isLoading, int countFound, bool childrenAreLoading, int countChildsFound, const QFont &font, int height);
bool haveChildsLoading();
bool haveHiddenChildsLoading();
bool haveChildsLocked();
View
@@ -786,7 +786,7 @@ void BasketView::setDisposition(int disposition, int columnCount)
Note *column = firstNote();
m_columnsCount = 0; // Now, so relayoutNotes() will not relayout the free notes as if they were columns!
while (column) {
- // Move all childs on the first level:
+ // Move all children on the first level:
Note *nextColumn = column->next();
ungroupNote(column);
column = nextColumn;
@@ -1262,7 +1262,7 @@ void BasketView::contentsMousePressEvent(QMouseEvent *event)
// If user click the basket, focus it!
// The focus is delayed because if the click results in showing a popup menu,
// the interface flicker by showing the focused rectangle (as the basket gets focus)
- // and immediatly removing it (because the popup menu now have focus).
+ // and immediately removing it (because the popup menu now have focus).
if (!isDuringEdit())
QTimer::singleShot(0, this, SLOT(setFocusIfNotInPopupMenu()));
@@ -1482,7 +1482,7 @@ void BasketView::contentsMousePressEvent(QMouseEvent *event)
if (event->button() == Qt::LeftButton) {
m_selectionStarted = true;
m_selectionBeginPoint = event->pos();
- // We usualy invert the selection with the Ctrl key, but some environements (like GNOME or The Gimp) do it with the Shift key.
+ // We usually invert the selection with the Ctrl key, but some environements (like GNOME or The Gimp) do it with the Shift key.
// Since the Shift key has no specific usage, we allow to invert selection ALSO with Shift for Gimp people
m_selectionInvert = controlPressed || shiftPressed;
}
@@ -1717,7 +1717,7 @@ void BasketView::contentsDragMoveEvent(QDragMoveEvent *event)
} else
acceptDropEvent(event);*/
- // A workarround since QScrollView::dragAutoScroll seem to have no effect :
+ // A workaround since QScrollView::dragAutoScroll seem to have no effect :
// ensureVisible(event->pos().x() + contentsX(), event->pos().y() + contentsY(), 30, 30);
// QScrollView::dragMoveEvent(event);
}
@@ -2398,11 +2398,11 @@ void BasketView::unselectAll()
QTextCursor cursor = m_editor->textEdit()->textCursor();
cursor.clearSelection();
m_editor->textEdit()->setTextCursor(cursor);
- selectionChangedInEditor(); // THIS IS NOT EMITED BY Qt!!!
+ selectionChangedInEditor(); // THIS IS NOT EMITTED BY Qt!!!
} else if (m_editor->lineEdit())
m_editor->lineEdit()->deselect();
} else {
- if (countSelecteds() > 0) // Optimisation
+ if (countSelecteds() > 0) // Optimization
FOR_EACH_NOTE(note)
note->setSelectedRecursively(false);
}
@@ -3065,7 +3065,7 @@ void BasketView::recomputeBlankRects()
// See the drawing of blank areas in BasketView::drawContents()
if (hasBackgroundImage() && ! isTiledBackground())
- substractRectOnAreas(QRect(0, 0, backgroundPixmap()->width(), backgroundPixmap()->height()), m_blankAreas, false);
+ subtractRectOnAreas(QRect(0, 0, backgroundPixmap()->width(), backgroundPixmap()->height()), m_blankAreas, false);
}
void BasketView::addAnimatedNote(Note *note)
@@ -3450,7 +3450,7 @@ void BasketView::updateEditorAppearance()
palette.setColor(m_editor->widget()->foregroundRole(), m_editor->note()->textColor());
m_editor->widget()->setPalette(palette);
- // Uggly Hack arround Qt bugs: placeCursor() don't call any signal:
+ // Ugly Hack around Qt bugs: placeCursor() don't call any signal:
HtmlEditor *htmlEditor = dynamic_cast<HtmlEditor*>(m_editor);
if (htmlEditor) {
if (m_editor->textEdit()->textCursor().atStart()) {
@@ -3810,7 +3810,7 @@ NoteSelection* BasketView::selectedNotes()
for (NoteSelection *node = selection.firstChild; node; node = node->next)
node->parent = 0;
- // If the top-most groups are columns, export only childs of those groups
+ // If the top-most groups are columns, export only children of those groups
// (because user is not consciencious that columns are groups, and don't care: it's not what she want):
if (selection.firstChild->note->isColumn()) {
NoteSelection tmpSelection;
@@ -4295,7 +4295,7 @@ void BasketView::noteGroup()
note = nextNote;
}
- m_loaded = true; // Part 2 / 2 of the workarround!
+ m_loaded = true; // Part 2 / 2 of the workaround!
// Do cleanup:
unplugNote(fakeNote);
View
@@ -352,7 +352,7 @@ private slots:
return m_inserterGroup;
}
public slots:
- void doHoverEffects(Note *note, Note::Zone zone, const QPoint &pos = QPoint(0, 0)); /// << @p pos is optionnal and only used to show the link target in the statusbar
+ void doHoverEffects(Note *note, Note::Zone zone, const QPoint &pos = QPoint(0, 0)); /// << @p pos is optional and only used to show the link target in the statusbar
void doHoverEffects(const QPoint &pos);
void doHoverEffects(); // The same, but using the current cursor position
void mouseEnteredEditorWidget();
View
@@ -2035,7 +2035,7 @@ KMenu* BNPView::popupMenu(const QString &menuName)
"file %5basketui.rc</p>",
aboutData->programName(), aboutData->programName(),
stdDirs.saveLocation("data", "basket/"), stdDirs.saveLocation("data", "basket/"), stdDirs.saveLocation("data", "basket/")),
- i18n("Ressource not Found"), KMessageBox::AllowLink);
+ i18n("Resource not Found"), KMessageBox::AllowLink);
}
if (!isPart())
exit(1); // We SHOULD exit right now and abord everything because the caller except menu != 0 to not crash.
@@ -2670,7 +2670,7 @@ void BNPView::setActive(bool active)
if (active == isMainWindowActive())
return;
- kapp->updateUserTimestamp(); // If "activate on mouse hovering systray", or "on drag throught systray"
+ kapp->updateUserTimestamp(); // If "activate on mouse hovering systray", or "on drag through systray"
Global::systemTray->toggleActive();
}
View
@@ -38,8 +38,8 @@ class DesktopColorPicker : public QDesktopWidget
~DesktopColorPicker();
public slots:
/** Begin color picking.
- * This function returns immediatly, and pickedColor() is emitted if user has
- * choosen a color, and not canceled the process (by pressing Escape).
+ * This function returns immediately, and pickedColor() is emitted if user has
+ * chozen a color, and not canceled the process (by pressing Escape).
*/
void pickColor();
signals:
View
@@ -28,7 +28,7 @@ class QTextBrowser;
class QString;
class QCloseEvent;
-/**A simple window that display text through debuging messages.
+/**A simple window that display text through debugging messages.
*@author Sébastien Laoût
*/
View
@@ -60,7 +60,7 @@ void FocusedTextEdit::keyPressEvent(QKeyEvent *event)
KTextEdit::keyPressEvent(event);
- // Workaround (for ensuring the cursor to be visible): signal not emited when pressing those keys:
+ // Workaround (for ensuring the cursor to be visible): signal not emitted when pressing those keys:
if (event->key() == Qt::Key_Home
|| event->key() == Qt::Key_End
|| event->key() == Qt::Key_PageUp
View
@@ -111,7 +111,7 @@ void HTMLExporter::prepareExport(BasketView *basket, const QString &fullPath)
progress->setValue(0);
kapp->processEvents();
- // Remember the file path choosen by the user:
+ // Remember the file path chozen by the user:
filePath = fullPath;
fileName = KUrl(fullPath).fileName();
exportedBasket = basket;
@@ -448,15 +448,15 @@ void HTMLExporter::exportNote(Note *note, int indent)
}
stream << '\n' << spaces.fill(' ', indent) << "</table>\n" /*<< spaces.fill(' ', indent - 1)*/;
} else {
- // Additionnal class for the content (link, netword, color...):
- QString additionnalClasses = note->content()->cssClass();
- if (!additionnalClasses.isEmpty())
- additionnalClasses = " " + additionnalClasses;
+ // Additional class for the content (link, netword, color...):
+ QString additionalClasses = note->content()->cssClass();
+ if (!additionalClasses.isEmpty())
+ additionalClasses = " " + additionalClasses;
// Assign the style of each associted tags:
for (State::List::Iterator it = note->states().begin(); it != note->states().end(); ++it)
- additionnalClasses += " tag_" + (*it)->id();
+ additionalClasses += " tag_" + (*it)->id();
//stream << spaces.fill(' ', indent);
- stream << "<table class=\"note" << additionnalClasses << "\"" << freeStyle << "><tr>";
+ stream << "<table class=\"note" << additionalClasses << "\"" << freeStyle << "><tr>";
if (note->emblemsCount() > 0) {
stream << "<td class=\"tags\"><nobr>";
for (State::List::Iterator it = note->states().begin(); it != note->states().end(); ++it)
View
@@ -49,7 +49,7 @@ class HTMLExporter
QString copyFile(const QString &srcPath, bool createIt);
public:
- // Absolute path of the file name the user choosen:
+ // Absolute path of the file name the user chozen:
QString filePath; // eg.: "/home/seb/foo.html"
QString fileName; // eg.: "foo.html"
Oops, something went wrong.

0 comments on commit d0504d5

Please sign in to comment.