diff options
| author | Vladimir Minenko <vladimir.minenko@nokia.com> | 2011-05-26 13:56:47 (GMT) |
|---|---|---|
| committer | Vladimir Minenko <vladimir.minenko@nokia.com> | 2011-05-26 13:56:47 (GMT) |
| commit | aff6cbac0eeaa0f1184cfa6f69818827b71cb222 (patch) | |
| tree | 93b579a4879a8c9d33dbcdbafffe8fb363d71c78 /translations/qt_uk.ts | |
| parent | 4ec80735d3e8bdbc4e38288c974426e77eedcd00 (diff) | |
| parent | 0f8eddaf60e3854aeda4c5d16cd740cc510ca941 (diff) | |
| download | Qt-aff6cbac0eeaa0f1184cfa6f69818827b71cb222.zip Qt-aff6cbac0eeaa0f1184cfa6f69818827b71cb222.tar.gz Qt-aff6cbac0eeaa0f1184cfa6f69818827b71cb222.tar.bz2 | |
Merge remote-tracking branch 'origin/master'
Conflicts:
doc/src/external-resources.qdoc
doc/src/getting-started/how-to-learn-qt.qdoc
"external-resources.qdoc" manually merged
"how-to-learn-qt.qdoc" was unchanged, so it was updated to a new, reworked version from the working area
Diffstat (limited to 'translations/qt_uk.ts')
| -rw-r--r-- | translations/qt_uk.ts | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/translations/qt_uk.ts b/translations/qt_uk.ts index 52e70a2..c3cfec0 100644 --- a/translations/qt_uk.ts +++ b/translations/qt_uk.ts @@ -1721,10 +1721,6 @@ to <translation>Властивість-псевдонім виходить за межі псевдоніму</translation> </message> <message> - <source>Invalid alias reference. An alias reference must be specified as <id> or <id>.<property></source> - <translation type="obsolete">Неправильне посилання на псевдонім. Посилання на псевдонім має бути вказане, як <id> або <id>.<property></translation> - </message> - <message> <source>Invalid alias reference. Unable to find id "%1"</source> <translation>Неправильне посилання на псевдонім. Неможливо знайти id "%1"</translation> </message> |