From dc511a947ab16429682e4887f95f94fc8bcb6fd2 Mon Sep 17 00:00:00 2001 From: Jan Arve Saether Date: Wed, 4 Feb 2015 11:23:55 +0100 Subject: 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 --- translations/qtbase_ca.ts | 13 ++++++++----- translations/qtbase_cs.ts | 13 ++++++++----- translations/qtbase_de.ts | 13 ++++++++----- translations/qtbase_fi.ts | 13 ++++++++----- translations/qtbase_hu.ts | 19 ++++++++----------- translations/qtbase_it.ts | 13 ++++++++----- translations/qtbase_ja.ts | 13 ++++++++----- translations/qtbase_ru.ts | 13 ++++++++----- translations/qtbase_sk.ts | 13 ++++++++----- 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 QSystemSemaphore %1: ha fallat el «ftok» - - QT_LAYOUT_DIRECTION - 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. - LTR - QCupsJobWidget @@ -1400,6 +1395,14 @@ El voleu suprimir igualment? Tanca sense desar + + QGuiApplication + + QT_LAYOUT_DIRECTION + 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. + LTR + + QHostInfo 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í QSystemSemaphore %1: Vyvolání ftok se nezdařilo - - QT_LAYOUT_DIRECTION - 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. - LTR - QCupsJobWidget @@ -1496,6 +1491,14 @@ Přesto chcete soubor smazat? Zavřít bez uložení + + QGuiApplication + + QT_LAYOUT_DIRECTION + 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. + LTR + + QHostInfo 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 QSystemSemaphore %1: ftok-Aufruf ist fehlgeschlagen - - QT_LAYOUT_DIRECTION - 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. - LTR - QCupsJobWidget @@ -1405,6 +1400,14 @@ Möchten Sie die Datei trotzdem löschen? Schließen ohne zu Speichern + + QGuiApplication + + QT_LAYOUT_DIRECTION + 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. + LTR + + QHostInfo 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 QSystemSemaphore %1: ftok epäonnistui - - QT_LAYOUT_DIRECTION - 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. - LTR - QCupsJobWidget @@ -1400,6 +1395,14 @@ Haluatko silti poistaa sen? Sulje tallentamatta + + QGuiApplication + + QT_LAYOUT_DIRECTION + 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. + LTR + + QHostInfo 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 @@ -2074,11 +2074,6 @@ erre: Activate Aktiválás - - QT_LAYOUT_DIRECTION - 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. - LTR - Activates the program's main window Aktívvá teszi a program főablakát @@ -2238,12 +2233,6 @@ erre: QSystemSemaphore %1: ftok hibát adott vissza - - - QT_LAYOUT_DIRECTION - 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. - LTR - %1: permission denied QSystemSemaphore @@ -4039,6 +4028,14 @@ Ellenőrizze, hogy jól adta-e meg a fájl nevét Nem lehet lejátszani: %1 + + QGuiApplication + + QT_LAYOUT_DIRECTION + 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. + LTR + + QHostInfo 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 QSystemSemaphore %1: ftok non riuscito - - QT_LAYOUT_DIRECTION - 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. - LTR - QCupsJobWidget @@ -1480,6 +1475,14 @@ Vuoi eliminarlo comunque? Chiudi senza salvare + + QGuiApplication + + QT_LAYOUT_DIRECTION + 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. + LTR + + QHostInfo 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 QSystemSemaphore %1: ftok に失敗しました - - QT_LAYOUT_DIRECTION - 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. - LTR - QCupsJobWidget @@ -1400,6 +1395,14 @@ Do you want to delete it anyway? 保存せずに閉じる + + QGuiApplication + + QT_LAYOUT_DIRECTION + 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. + LTR + + QHostInfo 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 QSystemSemaphore %1: ошибка ftok - - QT_LAYOUT_DIRECTION - 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. - LTR - QCupsJobWidget @@ -1411,6 +1406,14 @@ Do you want to delete it anyway? Закрыть без сохранения + + QGuiApplication + + QT_LAYOUT_DIRECTION + 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. + LTR + + QHostInfo 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 @@ QSystemSemaphore %1: ftok zlyhal - - QT_LAYOUT_DIRECTION - 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. - LTR - QDB2Driver @@ -1150,6 +1145,14 @@ Chcete ho aj tak zmazať? Spojenie ukončené + + QGuiApplication + + QT_LAYOUT_DIRECTION + 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. + LTR + + QHostInfo 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 QSystemSemaphore %1: збій ftok - - QT_LAYOUT_DIRECTION - 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. - LTR - QCupsJobWidget @@ -2146,6 +2141,14 @@ Do you want to delete it anyway? Закрити без збереження + + QGuiApplication + + QT_LAYOUT_DIRECTION + 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. + LTR + + QHostInfo -- cgit v1.2.1