summaryrefslogtreecommitdiffstats
path: root/tools/linguist
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-11-04 01:14:49 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-11-04 01:14:49 (GMT)
commite042014961636d459dc84df93ad2cca96049e2d1 (patch)
tree483fac9c3e0e88d60527c9675fd0789253204fb4 /tools/linguist
parent25e7b091c44c1cff2f74551a0603e85b4c286260 (diff)
parent8caacf51667d4cf770b18a8b59e46f842861210e (diff)
downloadQt-e042014961636d459dc84df93ad2cca96049e2d1.zip
Qt-e042014961636d459dc84df93ad2cca96049e2d1.tar.gz
Qt-e042014961636d459dc84df93ad2cca96049e2d1.tar.bz2
Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declarativeui
Conflicts: configure.exe src/gui/graphicsview/qgraphicsitem_p.h
Diffstat (limited to 'tools/linguist')
-rw-r--r--tools/linguist/linguist/mainwindow.cpp1
-rw-r--r--tools/linguist/lupdate/cpp.cpp12
-rw-r--r--tools/linguist/phrasebooks/french.qph20
3 files changed, 28 insertions, 5 deletions
diff --git a/tools/linguist/linguist/mainwindow.cpp b/tools/linguist/linguist/mainwindow.cpp
index 9bc6641..7f09a1c 100644
--- a/tools/linguist/linguist/mainwindow.cpp
+++ b/tools/linguist/linguist/mainwindow.cpp
@@ -269,6 +269,7 @@ MainWindow::MainWindow()
m_editActiveModel(-1),
m_statistics(0)
{
+ setUnifiedTitleAndToolBarOnMac(true);
m_ui.setupUi(this);
#ifndef Q_WS_MAC
diff --git a/tools/linguist/lupdate/cpp.cpp b/tools/linguist/lupdate/cpp.cpp
index 6374912..4d89156 100644
--- a/tools/linguist/lupdate/cpp.cpp
+++ b/tools/linguist/lupdate/cpp.cpp
@@ -1896,25 +1896,26 @@ void CppParser::parseInternal(ConversionData &cd, QSet<QString> &inclusions)
prospectiveContext.clear();
}
break;
- case Tok_Comment:
+ case Tok_Comment: {
if (!tor)
goto case_default;
- if (yyWord.at(0) == QLatin1Char(':') && yyWord.at(1).isSpace()) {
+ const QChar *ptr = yyWord.unicode();
+ if (*ptr == QLatin1Char(':') && ptr[1].isSpace()) {
yyWord.remove(0, 2);
extracomment += yyWord;
extracomment.detach();
- } else if (yyWord.at(0) == QLatin1Char('=') && yyWord.at(1).isSpace()) {
+ } else if (*ptr == QLatin1Char('=') && ptr[1].isSpace()) {
yyWord.remove(0, 2);
msgid = yyWord.simplified();
msgid.detach();
- } else if (yyWord.at(0) == QLatin1Char('~') && yyWord.at(1).isSpace()) {
+ } else if (*ptr == QLatin1Char('~') && ptr[1].isSpace()) {
yyWord.remove(0, 2);
text = yyWord.trimmed();
int k = text.indexOf(QLatin1Char(' '));
if (k > -1)
extra.insert(text.left(k), text.mid(k + 1).trimmed());
text.clear();
- } else if (yyWord.at(0) == QLatin1Char('%') && yyWord.at(1).isSpace()) {
+ } else if (*ptr == QLatin1Char('%') && ptr[1].isSpace()) {
sourcetext.reserve(sourcetext.length() + yyWord.length() - 2);
ushort *ptr = (ushort *)sourcetext.data() + sourcetext.length();
int p = 2, c;
@@ -1977,6 +1978,7 @@ void CppParser::parseInternal(ConversionData &cd, QSet<QString> &inclusions)
}
yyTok = getToken();
break;
+ }
case Tok_Arrow:
yyTok = getToken();
if (yyTok == Tok_tr || yyTok == Tok_trUtf8)
diff --git a/tools/linguist/phrasebooks/french.qph b/tools/linguist/phrasebooks/french.qph
index d38da5a..9440345 100644
--- a/tools/linguist/phrasebooks/french.qph
+++ b/tools/linguist/phrasebooks/french.qph
@@ -1326,4 +1326,24 @@
<source>Close All Except %1</source>
<target>Fermer tout sauf %1</target>
</phrase>
+<phrase>
+ <source>Remove</source>
+ <target>Suppression</target>
+</phrase>
+<phrase>
+ <source>About...</source>
+ <target>À propos…</target>
+</phrase>
+<phrase>
+ <source>Minimize</source>
+ <target>Minimiser</target>
+</phrase>
+<phrase>
+ <source>Remove</source>
+ <target>Supprimer</target>
+</phrase>
+<phrase>
+ <source>Select All</source>
+ <target>Sélectionner tout</target>
+</phrase>
</QPH>