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_gl.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_gl.ts')
| -rw-r--r-- | translations/qt_gl.ts | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/translations/qt_gl.ts b/translations/qt_gl.ts index ec49477..f19210c 100644 --- a/translations/qt_gl.ts +++ b/translations/qt_gl.ts @@ -1099,11 +1099,6 @@ para <context> <name>QApplication</name> <message> - <source>QT_LAYOUT_DIRECTION</source> - <comment>Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout.</comment> - <translation>LTR</translation> - </message> - <message> <source>Activate</source> <translation>Activar</translation> </message> @@ -3105,6 +3100,14 @@ Desexa aínda así borralo?</translation> </message> </context> <context> + <name>QGuiApplication</name> + <message> + <source>QT_LAYOUT_DIRECTION</source> + <comment>Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout.</comment> + <translation>LTR</translation> + </message> +</context> +<context> <name>QHostInfo</name> <message> <source>No host name given</source> |