diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-20 07:23:43 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-20 07:23:43 (GMT) |
| commit | 67926b8e4d9e7463597ef113944d78ca326fd9ae (patch) | |
| tree | e24fa54e245a8c3b27cd1f740aaf5d296e05621b /translations/qvfb_untranslated.ts | |
| parent | 2c762f3b8b284a7c6dc0c499b7052013bad5b707 (diff) | |
| parent | 10194aafd10824fe1919aa44083224e8bea442ca (diff) | |
| download | Qt-67926b8e4d9e7463597ef113944d78ca326fd9ae.zip Qt-67926b8e4d9e7463597ef113944d78ca326fd9ae.tar.gz Qt-67926b8e4d9e7463597ef113944d78ca326fd9ae.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
src/gui/itemviews/qheaderview_p.h
Diffstat (limited to 'translations/qvfb_untranslated.ts')
| -rw-r--r-- | translations/qvfb_untranslated.ts | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/translations/qvfb_untranslated.ts b/translations/qvfb_untranslated.ts index 0f75227..cc18132 100644 --- a/translations/qvfb_untranslated.ts +++ b/translations/qvfb_untranslated.ts @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS><TS version="2.0"> +<!DOCTYPE TS> +<TS version="2.0"> <context> <name>AnimationSaveWidget</name> <message> - <location filename="../tools/qvfb/qvfb.cpp" line="+824"/> + <location filename="../tools/qvfb/qvfb.cpp" line="+850"/> <location line="+204"/> <source>Record</source> <translation type="unfinished"></translation> @@ -248,7 +249,7 @@ <context> <name>DeviceSkin</name> <message> - <location filename="../tools/shared/deviceskin/deviceskin.cpp" line="+49"/> + <location filename="../tools/shared/deviceskin/deviceskin.cpp" line="+79"/> <source>The image file '%1' could not be loaded.</source> <translation type="unfinished"></translation> </message> |