Skip to content

Commit

Permalink
Fix several typos
Browse files Browse the repository at this point in the history
corss-platform -> cross-platform
performace -> performance
Resum -> Resume
unknow -> unknown
  • Loading branch information
felixonmars committed Dec 17, 2015
1 parent 35db808 commit 7909a9f
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions examples/QMLPlayer/i18n/QMLPlayer_zh_CN.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</message>
<message>
<location filename="../qml/QMLPlayer/About.qml" line="22"/>
<source>QtAV is a corss-platform, high performace multimedia playback framework</source>
<source>QtAV is a cross-platform, high performance multimedia playback framework</source>
<translation>QtAV是跨平台的高性能多媒体播放框架</translation>
</message>
<message>
Expand Down Expand Up @@ -65,7 +65,7 @@
</message>
<message>
<location filename="../qml/QMLPlayer/About.qml" line="31"/>
<source>Pause/Resum</source>
<source>Pause/Resume</source>
<translation>暂停/恢复</translation>
</message>
<message>
Expand Down
4 changes: 2 additions & 2 deletions examples/QMLPlayer/qml/QMLPlayer/About.qml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Page {
onContentHeightChanged: parent.height = contentHeight + 2*anchors.margins
onLinkActivated: Qt.openUrlExternally(link)
text: "<h3>QMLPlayer for " + Qt.platform.os + " " + qsTr("based on") + " QtAV 1.9.0</h3>"
+ "<p>" + qsTr("QtAV is a corss platform, high performace multimedia framework") + "</p>"
+ "<p>" + qsTr("QtAV is a cross platform, high performance multimedia framework") + "</p>"
+ "<p>Distributed under the terms of LGPLv2.1 or later.</p>"
+ "<p>Copyright (C) 2012-2015 Wang Bin (aka. Lucas Wang) <a href='mailto:[email protected]'>[email protected]</a></p>"
+ "<p>Home page: <a href='http://qtav.org'>http://qtav.org</a></p>"
Expand All @@ -30,7 +30,7 @@ Page {
"\n<h3>" + qsTr("Shortcut") + ":</h3>"
+ "<table><tr><td>M: " + qsTr("Mute") + " . </td><td>F: " + qsTr("Fullscreen") + " . </td></tr><tr><td>" + qsTr("Up/Down") + ": " + qsTr("Volume")
+ "+/- . </td><td> " + qsTr("Left/Right") + "/" + qsTr("Swipe") +": " + qsTr("Seek backward/forward") + " . </td></tr><tr><td>"
+ qsTr("Space") + ": " + qsTr("Pause/Resum") + " . </td><td>Q: " + qsTr("Quit") + " . </td></tr><tr><td>"
+ qsTr("Space") + ": " + qsTr("Pause/Resume") + " . </td><td>Q: " + qsTr("Quit") + " . </td></tr><tr><td>"
+ qsTr("Rotate") + "</td><td>A: " + qsTr("Aspect ratio") + "</td></tr></table>")
}
Button {
Expand Down
10 changes: 5 additions & 5 deletions examples/common/qoptions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -231,11 +231,11 @@ bool QOptions::parse(int argc, const char *const*argv)
}
}
if (it_list == mOptions.end()) {
qWarning() << "unknow option: " << *it;
qWarning() << "unknown option: " << *it;
result = false;
++it;
}
//handle unknow option
//handle unknown option
} else if (it->startsWith(QLatin1Char('-'))) {
for (it_list = mOptions.begin(); it_list != mOptions.end(); ++it_list) {
QString sname = it_list->shortName();
Expand All @@ -262,13 +262,13 @@ bool QOptions::parse(int argc, const char *const*argv)
}
}
if (it_list==mOptions.end()) {
qWarning() << "unknow option: " << *it;
qWarning() << "unknown option: " << *it;
result = false;
++it;
}
//handle unknow option
//handle unknown option
} else {
qWarning() << "unknow option: " << *it;
qWarning() << "unknown option: " << *it;
++it;
}
}
Expand Down

0 comments on commit 7909a9f

Please sign in to comment.