Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'mainline/4.6' into 4.6 | Oswald Buddenhagen | 2009-11-25 | 1 | -0/+36 |
|\ | |||||
| * | updates french phrasebook | Pierre Rossi | 2009-11-23 | 1 | -0/+36 |
| | | |||||
* | | Fix build on AIX: all of the .a file is linked into the program. | Oswald Buddenhagen | 2009-11-24 | 1 | -0/+7 |
|/ | | | | | | | | | The qlibraryinfo.cpp is only needed by lrelease. It has a hack for qmake_libraryInfoFile(), which doesn't work on AIX. So don't put qlibraryinfo.cpp in libbootstrap.a, but instead build directly for lrelease. Reviewed-by: thiago | ||||
* | don't use qWarning for things which are not really warnings | Oswald Buddenhagen | 2009-11-20 | 2 | -6/+15 |
| | | | | | | | | | ... so the tools are usable with QT_FATAL_WARNINGS. it may be sensible to "degrade" the c++ parser warnings to info messages. possibly later ... Task-number: QTBUG-5683 | ||||
* | fix crash on closing "rightmost" file | Oswald Buddenhagen | 2009-11-20 | 1 | -2/+4 |
| | | | | | | "This cannot happen" ... yeah, right. :} Task-number: QTBUG-5989 | ||||
* | fix encodings, take N | Oswald Buddenhagen | 2009-11-20 | 3 | -17/+21 |
| | | | | | Task-number: QTBUG-4499 Task-number: QTBUG-5276 | ||||
* | don't overwrite explicitly specified CODECFORTR on UTF-16 input | Oswald Buddenhagen | 2009-11-19 | 3 | -2/+3 |
| | |||||
* | fix potentially wrong output codec for UTF-16 input files | Oswald Buddenhagen | 2009-11-19 | 1 | -1/+1 |
| | | | | querying the actual codec before the file has been read is pointless | ||||
* | Merge oslo-staging-2/4.6 into upstream/4.6 | Olivier Goffart | 2009-11-19 | 4 | -18/+18 |
|\ | |||||
| * | Ran the script utils/normalize | Olivier Goffart | 2009-11-18 | 4 | -18/+18 |
| | | | | | | | | Over src/ tools/ examples/ and demos/ | ||||
* | | Updates the french translation of qt strings in qt_fr.ts | Pierre Rossi | 2009-11-18 | 1 | -2/+38 |
| | | | | | | | | | | | | | | Also took care of placing non breakable spaces before double punctuation characters. Reviewed-by: Benjamin Poulain | ||||
* | | fix linking following lrelease bootstrapping | Oswald Buddenhagen | 2009-11-13 | 1 | -0/+2 |
| | | | | | | | | qsettings_win needs advapi32 | ||||
* | | Merge remote branch 'mainline/4.6' into 4.6 | Oswald Buddenhagen | 2009-11-13 | 1 | -0/+20 |
|\ \ | |/ | |||||
| * | french translation of qt_help | Pierre Rossi | 2009-11-10 | 1 | -0/+20 |
| | | |||||
* | | build lrelease bootstrapped | Oswald Buddenhagen | 2009-11-10 | 6 | -11/+145 |
| | | | | | | | | | | | | | | | | needed for build-time qm generation in qt itself. the downsides are a) that the other bootstrapped tools grow by ~12kB (on x86) due to qdatastream being pulled in by qbytearray and qstring and b) that lrelease isn't l10n'd itself anymore (the latter could be fixed by building a non-qobject qtranslator). | ||||
* | | don't use qApp->arguments() | Oswald Buddenhagen | 2009-11-10 | 1 | -16/+15 |
|/ | | | | preparation work for bootstrapping | ||||
* | record id-based messages even if they have an empty source | Oswald Buddenhagen | 2009-11-06 | 3 | -20/+16 |
| | | | | | | this makes sense if one uses lupdate only for validation purposes, i.e. to find out if the code uses only ids which are defined in some external specification. | ||||
* | handle messages with ids (more) correctly | Oswald Buddenhagen | 2009-11-06 | 4 | -52/+138 |
| | | | | | when comparing two messages which both have ids, compare only the ids. this affects finding/reporting duplicates and merging. | ||||
* | kill TranslatorMessage::operator==() and qHash(TranslatorMessage) | Oswald Buddenhagen | 2009-11-06 | 5 | -29/+27 |
| | | | | preparation work ... | ||||
* | eliminate TranslatorMessagePtr from the Translator api | Oswald Buddenhagen | 2009-11-06 | 6 | -48/+51 |
| | |||||
* | improve ordered message insertion | Oswald Buddenhagen | 2009-11-06 | 1 | -1/+1 |
| | | | | | | | | | in a ts file, the top level categorization are the contexts, so it makes no sense to make messages adjoint by file when the context is different. a more clever algorithm which tries to order the entire contexts is conceivable. that would be advantageous for files which use multiple contexts subsequentially if each context appears in only one file. | ||||
* | eliminate Translator::contains() | Oswald Buddenhagen | 2009-11-06 | 3 | -11/+11 |
| | | | | replace the one use case with something more efficient | ||||
* | eliminate Translator::replace() | Oswald Buddenhagen | 2009-11-06 | 3 | -17/+3 |
| | |||||
* | use right method to record new messages | Oswald Buddenhagen | 2009-11-06 | 1 | -1/+1 |
| | | | | consistent with all other source parsers | ||||
* | do not consider plural source in comparisons | Oswald Buddenhagen | 2009-11-06 | 1 | -4/+0 |
| | | | | | | | | two messages with identical singular but different plural sources simply make no sense. this should be quite a bit faster, as it saves lots of QHash<QString,...> lookups. | ||||
* | remove unused TranslatorMessage::operator<() | Oswald Buddenhagen | 2009-11-06 | 2 | -12/+0 |
| | | | | it was once needed for QMap, but we don't use that any more | ||||
* | cut code dupe ... | Oswald Buddenhagen | 2009-11-06 | 1 | -12/+5 |
| | | | | ... with gotos :) | ||||
* | don't construct a new message for look-up purposes only | Oswald Buddenhagen | 2009-11-06 | 3 | -13/+5 |
| | |||||
* | add -markuntranslated option | Oswald Buddenhagen | 2009-11-04 | 3 | -16/+29 |
| | | | | maemo *really* want it, so pushing it in now ... | ||||
* | reshuffle command line parsing | Oswald Buddenhagen | 2009-11-04 | 1 | -16/+12 |
| | | | | | collect the files into a string list during the initial run instead of iterating the argument list twice. | ||||
* | construct ConversionData earlier | Oswald Buddenhagen | 2009-11-04 | 1 | -31/+21 |
| | | | | to avoid the insane number of function arguments in a few places | ||||
* | don't break on unterminated C comments | Oswald Buddenhagen | 2009-11-04 | 1 | -1/+1 |
| | |||||
* | introduce delayed resolution of aliases | Oswald Buddenhagen | 2009-11-04 | 1 | -16/+41 |
| | | | | | | | | this has two effects: - using-declarations which use forward-declared classes work without collecting the forward declarations, as the resolution happens at a place where the class definition must have been encountered already - it should be a bit faster | ||||
* | fix bogus "Class '<foo>' lacks Q_OBJECT macro" | Oswald Buddenhagen | 2009-11-04 | 1 | -3/+3 |
| | | | | | | the optimization not to look for parent definitions if we already knew that there would be none did not consider that we only know that the leaf node is missing, not any intermediate nodes. | ||||
* | namespaces can have parents, too | Oswald Buddenhagen | 2009-11-04 | 1 | -5/+10 |
| | |||||
* | Merge remote branch 'mainline/4.6' into 4.6 | Oswald Buddenhagen | 2009-11-02 | 1 | -0/+20 |
|\ | |||||
| * | Add a French translation to Assistant. Update the phrase book. | Benjamin Poulain | 2009-10-30 | 1 | -0/+20 |
| | | | | | | | | Reviewed-by: Pierre Rossi | ||||
* | | Make Linguist on Mac use the unified toolbar, like Assistant. | Daniel Molkentin | 2009-10-30 | 1 | -0/+1 |
|/ | | | | Reviewed-By: Oswald Buddenhagen | ||||
* | do not crash | Oswald Buddenhagen | 2009-10-29 | 1 | -5/+7 |
| | |||||
* | make magic comment parsing stricter | Oswald Buddenhagen | 2009-10-28 | 1 | -9/+9 |
| | | | | | | there must be a space after the //: and similar comments, otherwise harmless comments of the sort of //====== foo here ===== will be parsed as message ids, etc. | ||||
* | consider message id when comparing messages | Oswald Buddenhagen | 2009-10-22 | 1 | -2/+6 |
| | |||||
* | id-based: do not drop unfinished untranslated messages | Oswald Buddenhagen | 2009-10-22 | 1 | -1/+1 |
| | | | | otherwise the fallback to use the source string is rather pointless | ||||
* | id-based: use source strings instead of empty translations only for ↵ | Oswald Buddenhagen | 2009-10-22 | 1 | -3/+4 |
| | | | | unfinished messages | ||||
* | actually guess the target language from the file name | Oswald Buddenhagen | 2009-10-22 | 1 | -0/+2 |
| | | | | --help says it does, but it didn't really. | ||||
* | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6 | Simon Hausmann | 2009-10-01 | 2 | -9/+8 |
|\ | |||||
| * | make -{source,target}-language actually override values from files | Oswald Buddenhagen | 2009-10-01 | 1 | -4/+4 |
| | | | | | | | | -help says it does, and it kinda makes sense | ||||
| * | make -help reflect reality | Oswald Buddenhagen | 2009-10-01 | 1 | -5/+4 |
| | | |||||
* | | fix ts and qm targets for shadow builds and builds with -prefix | Oswald Buddenhagen | 2009-10-01 | 1 | -7/+9 |
| | | |||||
* | | remove *_untranslated.ts | Oswald Buddenhagen | 2009-10-01 | 1 | -1/+0 |
| | | | | | | | | | | | | | | with the current scheme of running "make ts" only when doing a particular translation and checking in only the relevant file, these files are never updated. lconvert can generate an empty template from any translation anyway. | ||||
* | | Merge branch '4.5' into 4.6 | Thiago Macieira | 2009-09-30 | 1 | -4/+11 |
|\ \ | |/ |