diff options
| author | Jan Arve Saether <jan-arve.saether@theqtcompany.com> | 2015-02-04 11:23:55 +0100 |
|---|---|---|
| committer | Jan Arve Sæther <jan-arve.saether@theqtcompany.com> | 2015-02-06 10:00:22 +0000 |
| commit | dc511a947ab16429682e4887f95f94fc8bcb6fd2 (patch) | |
| tree | 619ccd9e31e1bd4c01172e966809c6af09670596 | |
| parent | 22680333bd6748106afce258255e1201ae5493f8 (diff) | |
| download | qttranslations-dc511a947ab16429682e4887f95f94fc8bcb6fd2.tar.gz | |
Fix regression from Qt4 with layout direction
In order to resolve Right-to-Left layout from the translation file, we
used to check if the result of QApplication::tr("QT_LAYOUT_DIRECTION")
was the string "RTL".
During modularization this changed context (using the wrong
QCoreApplication::tr()), but the translation files didn't change.
It turns out that it didn't make much sense to use that context,
since the layout direction can only be changed on the QGuiApplication.
We therefore have changed the context to QGuiApplication (in qtbase),
and we must therefore update the relevant translation files.
Change-Id: Iacea23da32a3d4128c259d7e8aad1823801dfd5f
Task-number: QTBUG-43447
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| -rw-r--r-- | translations/qtbase_ca.ts | 13 | ||||
| -rw-r--r-- | translations/qtbase_cs.ts | 13 | ||||
| -rw-r--r-- | translations/qtbase_de.ts | 13 | ||||
| -rw-r--r-- | translations/qtbase_fi.ts | 13 | ||||
| -rw-r--r-- | translations/qtbase_hu.ts | 19 | ||||
| -rw-r--r-- | translations/qtbase_it.ts | 13 | ||||
| -rw-r--r-- | translations/qtbase_ja.ts | 13 | ||||
| -rw-r--r-- | translations/qtbase_ru.ts | 13 | ||||
| -rw-r--r-- | translations/qtbase_sk.ts | 13 | ||||
| -rw-r--r-- | translations/qtbase_uk.ts | 13 |
10 files changed, 80 insertions, 56 deletions
diff --git a/translations/qtbase_ca.ts b/translations/qtbase_ca.ts index 19912a8..7326dd8 100644 --- a/translations/qtbase_ca.ts +++ b/translations/qtbase_ca.ts @@ -368,11 +368,6 @@ Premeu Esc per cancel·lar</translation> <comment>QSystemSemaphore</comment> <translation>%1: ha fallat el «ftok»</translation> </message> - <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>QCupsJobWidget</name> @@ -1401,6 +1396,14 @@ El voleu suprimir igualment?</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> diff --git a/translations/qtbase_cs.ts b/translations/qtbase_cs.ts index 669bcc4..b160d64 100644 --- a/translations/qtbase_cs.ts +++ b/translations/qtbase_cs.ts @@ -371,11 +371,6 @@ Stiskněte Esc pro zrušení</translation> <comment>QSystemSemaphore</comment> <translation>%1: Vyvolání ftok se nezdařilo</translation> </message> - <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>QCupsJobWidget</name> @@ -1497,6 +1492,14 @@ Přesto chcete soubor smazat?</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> diff --git a/translations/qtbase_de.ts b/translations/qtbase_de.ts index 746acc9..9eb3278 100644 --- a/translations/qtbase_de.ts +++ b/translations/qtbase_de.ts @@ -368,11 +368,6 @@ Drücken Sie ESC, um abzubrechen</translation> <comment>QSystemSemaphore</comment> <translation>%1: ftok-Aufruf ist fehlgeschlagen</translation> </message> - <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>QCupsJobWidget</name> @@ -1406,6 +1401,14 @@ Möchten Sie die Datei trotzdem löschen?</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> diff --git a/translations/qtbase_fi.ts b/translations/qtbase_fi.ts index 8f3ccfe..e6dec09 100644 --- a/translations/qtbase_fi.ts +++ b/translations/qtbase_fi.ts @@ -368,11 +368,6 @@ Peru painamalla ESC</translation> <comment>QSystemSemaphore</comment> <translation>%1: ftok epäonnistui</translation> </message> - <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>QCupsJobWidget</name> @@ -1401,6 +1396,14 @@ Haluatko silti poistaa sen?</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> diff --git a/translations/qtbase_hu.ts b/translations/qtbase_hu.ts index cdded86..b1d8401 100644 --- a/translations/qtbase_hu.ts +++ b/translations/qtbase_hu.ts @@ -2075,11 +2075,6 @@ erre: <translation type="obsolete">Aktiválás</translation> </message> <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 type="obsolete">LTR</translation> - </message> - <message> <source>Activates the program's main window</source> <translation type="obsolete">Aktívvá teszi a program főablakát</translation> </message> @@ -2239,12 +2234,6 @@ erre: <translation type="unfinished">%1: ftok hibát adott vissza</translation> </message> <message> - <location filename="../../qtbase/src/gui/kernel/qguiapplication.cpp" line="+166"/> - <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 type="unfinished">LTR</translation> - </message> - <message> <source>%1: permission denied</source> <comment>QSystemSemaphore</comment> <translation type="obsolete">%1: hozzáférés megtagadva</translation> @@ -4040,6 +4029,14 @@ Ellenőrizze, hogy jól adta-e meg a fájl nevét</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> <location filename="../../qtbase/src/network/kernel/qhostinfo.cpp" line="+169"/> diff --git a/translations/qtbase_it.ts b/translations/qtbase_it.ts index 3eea30c..d9a0f4d 100644 --- a/translations/qtbase_it.ts +++ b/translations/qtbase_it.ts @@ -352,11 +352,6 @@ Premi ESC per annullare</translation> <comment>QSystemSemaphore</comment> <translation>%1: ftok non riuscito</translation> </message> - <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>QCupsJobWidget</name> @@ -1481,6 +1476,14 @@ Vuoi eliminarlo comunque?</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> diff --git a/translations/qtbase_ja.ts b/translations/qtbase_ja.ts index 2098047..4089c50 100644 --- a/translations/qtbase_ja.ts +++ b/translations/qtbase_ja.ts @@ -368,11 +368,6 @@ Press ESC to cancel</source> <comment>QSystemSemaphore</comment> <translation>%1: ftok に失敗しました</translation> </message> - <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>QCupsJobWidget</name> @@ -1401,6 +1396,14 @@ Do you want to delete it anyway?</source> </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> diff --git a/translations/qtbase_ru.ts b/translations/qtbase_ru.ts index bb3fe4c..ee6e30a 100644 --- a/translations/qtbase_ru.ts +++ b/translations/qtbase_ru.ts @@ -374,11 +374,6 @@ Press ESC to cancel</source> <comment>QSystemSemaphore</comment> <translation>%1: ошибка ftok</translation> </message> - <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>QCupsJobWidget</name> @@ -1412,6 +1407,14 @@ Do you want to delete it anyway?</source> </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> diff --git a/translations/qtbase_sk.ts b/translations/qtbase_sk.ts index 74341db..4284b92 100644 --- a/translations/qtbase_sk.ts +++ b/translations/qtbase_sk.ts @@ -218,11 +218,6 @@ <comment>QSystemSemaphore</comment> <translation>%1: ftok zlyhal</translation> </message> - <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>QDB2Driver</name> @@ -1151,6 +1146,14 @@ Chcete ho aj tak zmazať?</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> diff --git a/translations/qtbase_uk.ts b/translations/qtbase_uk.ts index a1544a5..58187e8 100644 --- a/translations/qtbase_uk.ts +++ b/translations/qtbase_uk.ts @@ -1011,11 +1011,6 @@ Press ESC to cancel</source> <comment>QSystemSemaphore</comment> <translation>%1: збій ftok</translation> </message> - <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>QCupsJobWidget</name> @@ -2147,6 +2142,14 @@ Do you want to delete it anyway?</source> </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> |