diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-19 08:56:21 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-19 08:56:21 +0200 |
| commit | 64f3b105fb67d813512b287be6fdaec409d6d943 (patch) | |
| tree | ebb3dabd685587794d9765edff1fc4c1309f5926 /translations/qt_ru.ts | |
| parent | 154f6a90b0fe0726138de8aba1dc23bea0d45232 (diff) | |
| parent | 38d6c3fe848487970640068ec12fc0c87a2938ee (diff) | |
| download | qttranslations-64f3b105fb67d813512b287be6fdaec409d6d943.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into 5.8v5.8.0-beta1v5.8.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I3bd0be818ed7f363da3b1da2c3a78a78180a9d18
Diffstat (limited to 'translations/qt_ru.ts')
| -rw-r--r-- | translations/qt_ru.ts | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/translations/qt_ru.ts b/translations/qt_ru.ts index 344bfc0..e9353c9 100644 --- a/translations/qt_ru.ts +++ b/translations/qt_ru.ts @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0" language="ru"> +<TS version="2.1" language="ru"> <dependencies> - <dependency catalog="qtbase_ru"/> - <dependency catalog="qtscript_ru"/> - <dependency catalog="qtquick1_ru"/> - <dependency catalog="qtmultimedia_ru"/> - <dependency catalog="qtxmlpatterns_ru"/> +<dependency catalog="qtbase_ru"/> +<dependency catalog="qtscript_ru"/> +<dependency catalog="qtquick1_ru"/> +<dependency catalog="qtmultimedia_ru"/> +<dependency catalog="qtxmlpatterns_ru"/> </dependencies> </TS> |