diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-03-10 10:32:26 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-03-10 10:32:26 +0100 |
| commit | 5d1463745aa4389c8ab1940e9b2d523decc9e22d (patch) | |
| tree | 8431c7ed516ea3cc282d27105bb8645e53c985b2 /share/qtcreator/translations/qtcreator_ru.ts | |
| parent | 7828bb811c969ee9991d5efe04e1093ce200882f (diff) | |
| parent | 05cf6ff47aa144412dc8196afa26103320cdc03a (diff) | |
| download | qt-creator-5d1463745aa4389c8ab1940e9b2d523decc9e22d.tar.gz | |
Merge remote branch 'origin/1.3'
Conflicts:
share/qtcreator/translations/qtcreator_ru.ts
Diffstat (limited to 'share/qtcreator/translations/qtcreator_ru.ts')
| -rw-r--r-- | share/qtcreator/translations/qtcreator_ru.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index 7a97d78455..26d71e74b3 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -12317,7 +12317,7 @@ to version control (%2)?</source> <message> <location filename="../../../src/plugins/qt4projectmanager/qt4nodes.cpp" line="+80"/> <source>Headers</source> - <translation>Заговолочные</translation> + <translation>Заголовочные</translation> </message> <message> <location line="+3"/> |