diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AdvancedSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AdvancedSection.qml index f88defbff56..1b626623ead 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AdvancedSection.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AdvancedSection.qml @@ -33,7 +33,7 @@ Section { PropertyLabel { text: qsTr("Smooth") - tooltip: qsTr("Toggles if the smoothing is performed using linear interpolation method. Keeping it unchecked would follow non-smooth method using nearest neighbor. It is mostly applicable on image based items. ") + tooltip: qsTr("Toggles if the smoothing is performed using linear interpolation method. Keeping it unchecked would follow non-smooth method using nearest neighbor. It is mostly applicable on image based items.") blockedByTemplate: !backendValues.smooth.isAvailable } diff --git a/share/qtcreator/translations/qtcreator_da.ts b/share/qtcreator/translations/qtcreator_da.ts index 43f21468465..3a5e39b5c9d 100644 --- a/share/qtcreator/translations/qtcreator_da.ts +++ b/share/qtcreator/translations/qtcreator_da.ts @@ -24002,52 +24002,36 @@ Brug det kun hvis du prototyper. Du kan ikke oprette et fuldt program med dette. Page med typeId'et "%1" har ugyldigt "index". - Path "%1" does not exist when checking Json wizard search paths. - - Stien "%1" findes ikke under tjek af Json-assistentens søgestier. - + Path "%1" does not exist when checking Json wizard search paths. + Stien "%1" findes ikke under tjek af Json-assistentens søgestier. - Checking "%1" for %2. - - Tjekker "%1" for %2. - + Checking "%1" for %2. + Tjekker "%1" for %2. - * Failed to parse "%1":%2:%3: %4 - - * Kunne ikke parse "%1":%2:%3: %4 - + * Failed to parse "%1":%2:%3: %4 + * Kunne ikke parse "%1":%2:%3: %4 - * Did not find a JSON object in "%1". - - * Fandt ikke et JSON-objekt i "%1". - + * Did not find a JSON object in "%1". + * Fandt ikke et JSON-objekt i "%1". - * Configuration found and parsed. - - * Konfiguration fundet og parset. - + * Configuration found and parsed. + * Konfiguration fundet og parset. - * Version %1 not supported. - - * Version %1 understøttes ikke. - + * Version %1 not supported. + * Version %1 understøttes ikke. - * Failed to create: %1 - - * Kunne ikke oprette: %1 - + * Failed to create: %1 + * Kunne ikke oprette: %1 - JsonWizard: "%1" not found - - JsonWizard: "%1" ikke fundet - + JsonWizard: "%1" not found. + JsonWizard: "%1" ikke fundet. key not found. diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index a9323af3f93..44e58da11fa 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -140,7 +140,7 @@ Erweitert - Toggles if the smoothing is performed using linear interpolation method. Keeping it unchecked would follow non-smooth method using nearest neighbor. It is mostly applicable on image based items. + Toggles if the smoothing is performed using linear interpolation method. Keeping it unchecked would follow non-smooth method using nearest neighbor. It is mostly applicable on image based items. @@ -16942,8 +16942,8 @@ Stellen Sie sicher, dass der Wert der CMAKE_BUILD_TYPE-Variable derselbe wie der Aktuelle ClangFormat-Version: %1. - Warning: - Warnung: + Warning: + Warnung: The current ClangFormat (C++ > Code Style > ClangFormat) settings are not valid. Are you sure you want to apply them? @@ -34486,8 +34486,8 @@ Möchten Sie sie überschreiben? Geben Sie die entsprechenden Argumente für das Erstellkommando ein. - Make sure the build command's multi-job parameter value is large enough (such as -j200 for the JOM or Make build tools) - Stellen Sie sicher, dass der Wert für die Anzahl paralleler Jobs im Erstellkommando groß genug ist (wie zum Beispiel -j200 für JOM oder Make) + Make sure the build command's multi-job parameter value is large enough (such as -j200 for the JOM or Make build tools). + Stellen Sie sicher, dass der Wert für die Anzahl paralleler Jobs im Erstellkommando groß genug ist (wie zum Beispiel -j200 für JOM oder Make). Keep original jobs number: @@ -34606,16 +34606,16 @@ Möchten Sie sie überschreiben? IncrediBuilds Kopfzeile in der Ausgabe verstecken: - Suppresses IncrediBuild's header in the build output - Unterdrückt die Kopfzeile von IncrediBuild in der Ausgabe der Kompilierung + Suppresses IncrediBuild's header in the build output. + Unterdrückt die Kopfzeile von IncrediBuild in der Ausgabe der Kompilierung. Internal IncrediBuild logging level: Stufe der internen IncrediBuild-Protokollierung: - Overrides the internal Incredibuild logging level for this build. Does not affect output or any user accessible logging. Used mainly to troubleshoot issues with the help of IncrediBuild support - Überschreibt die Stufe der internen Protokollierung von IncrediBuild für diese Kompilierung. Beeinflusst weder die Ausgabe noch die dem Benutzer zugängliche Protokollierung. Wird hauptsächlich zur Fehlerbehebung mit Hilfe des Supports von IncrediBuild verwendet + Overrides the internal Incredibuild logging level for this build. Does not affect output or any user accessible logging. Used mainly to troubleshoot issues with the help of IncrediBuild support. + Überschreibt die Stufe der internen Protokollierung von IncrediBuild für diese Kompilierung. Beeinflusst weder die Ausgabe noch die dem Benutzer zugängliche Protokollierung. Wird hauptsächlich zur Fehlerbehebung mit Hilfe des Supports von IncrediBuild verwendet. Miscellaneous @@ -34634,16 +34634,16 @@ Möchten Sie sie überschreiben? Bei Fehler anhalten: - When specified, the execution will stop as soon as an error is encountered. This is the default behavior in "Visual Studio" builds, but not the default for "Make and Build tools" or "Dev Tools" builds - Wenn angegeben, wird die Ausführung angehalten sobald ein Fehler auftritt. Dies ist das voreingestellte Verhalten bei Kompilierungen mit "Visual Studio", aber nicht für Kompilierungen mit "Make and Build tools" oder "Dev Tools" + When specified, the execution will stop as soon as an error is encountered. This is the default behavior in "Visual Studio" builds, but not the default for "Make and Build tools" or "Dev Tools" builds. + Wenn angegeben, wird die Ausführung angehalten sobald ein Fehler auftritt. Dies ist das voreingestellte Verhalten bei Kompilierungen mit "Visual Studio", aber nicht für Kompilierungen mit "Make and Build tools" oder "Dev Tools". Additional Arguments: Zusätzliche Argumente: - Add additional buildconsole arguments manually. The value of this field will be concatenated to the final buildconsole command line - Fügt zusätzliche Argumente für buildconsole manuell hinzu. Der Inhalt dieses Eingabefelds wird an die finale Kommandozeile für buildconsole angefügt + Add additional buildconsole arguments manually. The value of this field will be concatenated to the final buildconsole command line. + Fügt zusätzliche Argumente für buildconsole manuell hinzu. Der Inhalt dieses Eingabefelds wird an die finale Kommandozeile für buildconsole angefügt. Open Build Monitor: @@ -42651,46 +42651,32 @@ Sie sollten nicht mehrere Test-Frameworks im selben Projekt mischen.Page mit typeId "%1" hat ungültigen "index". - Path "%1" does not exist when checking Json wizard search paths. - - Pfad "%1" existiert nicht in Json-Wizard Suchpfaden. - + Path "%1" does not exist when checking Json wizard search paths. + Pfad "%1" existiert nicht in Json-Wizard Suchpfaden. - Checking "%1" for %2. - - Prüfe "%1" für %2. - + Checking "%1" for %2. + Prüfe "%1" für %2. - * Failed to parse "%1":%2:%3: %4 - - * Konnte "%1" nicht auswerten: %2:%3: %4 - + * Failed to parse "%1":%2:%3: %4 + * Konnte "%1" nicht auswerten: %2:%3: %4 - * Did not find a JSON object in "%1". - - * Kein JSON-Objekt in "%1" gefunden. - + * Did not find a JSON object in "%1". + * Kein JSON-Objekt in "%1" gefunden. - * Configuration found and parsed. - - * Konfiguration gefunden und ausgewertet. - + * Configuration found and parsed. + * Konfiguration gefunden und ausgewertet. - * Version %1 not supported. - - * Version %1 nicht unterstützt. - + * Version %1 not supported. + * Version %1 nicht unterstützt. - * Failed to create: %1 - - * Erstellen fehlgeschlagen: %1 - + * Failed to create: %1 + * Erstellen fehlgeschlagen: %1 The platform selected for the wizard. @@ -42721,10 +42707,8 @@ Sie sollten nicht mehrere Test-Frameworks im selben Projekt mischen.Bilddatei "%1" nicht gefunden. - JsonWizard: "%1" not found - - JsonWizard: "%1" nicht gefunden - + JsonWizard: "%1" not found. + JsonWizard: "%1" nicht gefunden. key not found. @@ -43565,8 +43549,8 @@ Was soll %1 tun? Das Build-Verzeichnis enthält das möglicherweise problematische Zeichen "%1". - This warning can be suppressed <a href="dummy">here</a>. - Diese Warnung kann <a href="dummy">hier</a> unterdrückt werden. + This warning can be suppressed <a href="dummy">here</a>. + Diese Warnung kann <a href="dummy">hier</a> unterdrückt werden. The project is currently being parsed. @@ -44605,8 +44589,8 @@ fails because Clang does not understand the target architecture. Pfad zum Python-Interpreter - No Python interpreter set for kit "%1" - Kein Python-Interpreter für das Kit "%1" eingerichtet + No Python interpreter set for kit "%1". + Kein Python-Interpreter für das Kit "%1" eingerichtet. @@ -49578,10 +49562,8 @@ Zusätzlich wird die Verbindung zum Gerät getestet. Verbinde zu Gerät... - Connected. Now doing extended checks. - - Verbunden. Führe erweiterte Überprüfungen aus. - + Connected. Now doing extended checks. + Verbunden. Führe erweiterte Überprüfungen aus. Basic connectivity test failed, device is considered unusable. @@ -50078,8 +50060,8 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e Verwende Standardmethode. Dies könnte langsam sein. - Unknown error occurred while trying to create remote directories - Beim Erstellen von entfernten Verzeichnissen ist ein unbekannter Fehler aufgetreten + Unknown error occurred while trying to create remote directories. + Beim Erstellen von entfernten Verzeichnissen ist ein unbekannter Fehler aufgetreten. Transfer method was downgraded from "%1" to "%2". If this is unexpected, please re-test device "%3". @@ -52659,12 +52641,12 @@ Die Datei "%1" konnte nicht geöffnet werden. "%1" ist nicht ausführbar. - Terminal process exited with code %1 - Der Terminalprozess wurde mit dem Rückgabewert %1 beendet + Terminal process exited with code %1. + Der Terminalprozess wurde mit dem Rückgabewert %1 beendet. - Process exited with code: %1 - Prozess wurde mit dem Rückgabewert %1 beendet + Process exited with code: %1. + Prozess wurde mit dem Rückgabewert %1 beendet. Copy @@ -54743,7 +54725,7 @@ Drücken Sie zusätzlich die Umschalttaste, wird ein Escape-Zeichen an der aktue Doxygen allows "@" and "\" to start commands. By default, "@" is used if the surrounding comment starts with "/**" or "///", and "\" is used -if the comment starts with "/*!" or "//! +if the comment starts with "/*!" or "//!". Doxygen erlaubt es, Befehle mit "@" und "\" zu beginnen. Die Vorgabe ist, mit "@" zu beginnen, wenn der umgebende Kommentar mit "/**" oder "///" anfängt, und "\" zu verwenden, wenn der Kommentar mit "/*!" oder "//!". diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts index 8e802d897c6..189555858b0 100644 --- a/share/qtcreator/translations/qtcreator_fr.ts +++ b/share/qtcreator/translations/qtcreator_fr.ts @@ -152,8 +152,8 @@ Lissage - Toggles if the smoothing is performed using linear interpolation method. Keeping it unchecked would follow non-smooth method using nearest neighbor. It is mostly applicable on image based items. - Active/désactive l'utilisation de l'interpolation linéaire pour le lissage. Lorsque décoché, la méthode du plus proche voisin sera utilisée. Cela s'applique principalement aux éléments images. + Toggles if the smoothing is performed using linear interpolation method. Keeping it unchecked would follow non-smooth method using nearest neighbor. It is mostly applicable on image based items. + Active/désactive l'utilisation de l'interpolation linéaire pour le lissage. Lorsque décoché, la méthode du plus proche voisin sera utilisée. Cela s'applique principalement aux éléments images. Antialiasing @@ -34341,8 +34341,8 @@ Souhaitez-vous les écraser ? Entrez les arguments appropriés pour votre commande de construction. - Make sure the build command's multi-job parameter value is large enough (such as -j200 for the JOM or Make build tools) - Assurez vous que le paramètre multi-job de la commande de construction est assez grande (telle que -j200 pour les outils de compilation comme JOM ou Make) + Make sure the build command's multi-job parameter value is large enough (such as -j200 for the JOM or Make build tools). + Assurez vous que le paramètre multi-job de la commande de construction est assez grande (telle que -j200 pour les outils de compilation comme JOM ou Make). Keep original jobs number: @@ -34461,16 +34461,16 @@ Souhaitez-vous les écraser ? Cacher l'entête IncrediBuild dans la sortie : - Suppresses IncrediBuild's header in the build output - Supprimer l'entête d'IncrediBuild de la sortie de construction + Suppresses IncrediBuild's header in the build output. + Supprimer l'entête d'IncrediBuild de la sortie de construction. Internal IncrediBuild logging level: Niveau de journalisation interne d'IncrediBuild : - Overrides the internal Incredibuild logging level for this build. Does not affect output or any user accessible logging. Used mainly to troubleshoot issues with the help of IncrediBuild support - Écrase le niveau interne de journalisation d'IncrediBuild pour cette construction. N'affecte pas la sortie ou un quelconque journal accessible par l'utilisateur. Utilisé principalement pour comprendre les problèmes avec l'aide du support d'IncrediBuild + Overrides the internal Incredibuild logging level for this build. Does not affect output or any user accessible logging. Used mainly to troubleshoot issues with the help of IncrediBuild support. + Écrase le niveau interne de journalisation d'IncrediBuild pour cette construction. N'affecte pas la sortie ou un quelconque journal accessible par l'utilisateur. Utilisé principalement pour comprendre les problèmes avec l'aide du support d'IncrediBuild. Miscellaneous @@ -34489,16 +34489,16 @@ Souhaitez-vous les écraser ? Arrêter en cas d'erreur : - When specified, the execution will stop as soon as an error is encountered. This is the default behavior in "Visual Studio" builds, but not the default for "Make and Build tools" or "Dev Tools" builds - Lorsque spécifié, l'exécution s'arrête dès qu'une erreur est rencontrée. C'est le comportement par défaut dans les constructions « Visual Studio », mais ce n'est pas le cas pour les constructions avec « Make et les outils de compilation » ou les « outils de développeur » + When specified, the execution will stop as soon as an error is encountered. This is the default behavior in "Visual Studio" builds, but not the default for "Make and Build tools" or "Dev Tools" builds. + Lorsque spécifié, l'exécution s'arrête dès qu'une erreur est rencontrée. C'est le comportement par défaut dans les constructions « Visual Studio », mais ce n'est pas le cas pour les constructions avec « Make et les outils de compilation » ou les « outils de développeur ». Additional Arguments: Arguments supplémentaires : - Add additional buildconsole arguments manually. The value of this field will be concatenated to the final buildconsole command line - Ajouter manuellement des arguments pour buildconsole. La valeur de ce champ est concaténé à la ligne de commande finale de buildconsole + Add additional buildconsole arguments manually. The value of this field will be concatenated to the final buildconsole command line. + Ajouter manuellement des arguments pour buildconsole. La valeur de ce champ est concaténé à la ligne de commande finale de buildconsole. Open Build Monitor: @@ -43130,8 +43130,8 @@ Activez cette option si vous envisagez de créer des binaires x86 32 bits sans u Le répertoire de compilation contient des caractères potentiellement problématiques « %1 ». - This warning can be suppressed <a href="dummy">here</a>. - Cet avertissement peut être supprimé <a href="dummy">ici</a>. + This warning can be suppressed <a href="dummy">here</a>. + Cet avertissement peut être supprimé <a href="dummy">ici</a>. Separate debug info: @@ -43548,39 +43548,28 @@ au projet « %2 ». Le typeId « %1 » du générateur est inconnu. Les typesIds pris en charge sont : « %2 ». - Path "%1" does not exist when checking Json wizard search paths. - + Path "%1" does not exist when checking Json wizard search paths. Le chemin « %1 » n’existe pas lors de la vérification des chemins de recherche de l’assistant Json. - Checking "%1" for %2. - - Vérification de « %1 » pour %2. - + Checking "%1" for %2. + Vérification de « %1 » pour %2. - * Failed to parse "%1":%2:%3: %4 - - * Échec de l’analyse de « %1 »:%2:%3 : %4 - + * Failed to parse "%1":%2:%3: %4 + * Échec de l’analyse de « %1 »:%2:%3 : %4 - * Did not find a JSON object in "%1". - - * N’a pas trouvé d’objet JSON dans « %1 ». - + * Did not find a JSON object in "%1". + * N’a pas trouvé d’objet JSON dans « %1 ». - * Configuration found and parsed. - - * La configuration a été trouvée et analysée. - + * Configuration found and parsed. + * La configuration a été trouvée et analysée. - JsonWizard: "%1" not found - - Assistant Json : « %1 » introuvable - + JsonWizard: "%1" not found + Assistant Json : « %1 » introuvable. Page is not an object. @@ -43599,16 +43588,12 @@ au projet « %2 ». La page avec le typeId « %1 » a un « index » invalide. - * Version %1 not supported. - - * La version %1 n’est pas prise en charge. - + * Version %1 not supported. + * La version %1 n’est pas prise en charge. - * Failed to create: %1 - - * Impossible de créer : %1 - + * Failed to create: %1 + * Impossible de créer : %1 key not found. @@ -44461,8 +44446,8 @@ Ces fichiers sont préservés. Chemin de l'interpréteur Python - No Python interpreter set for kit "%1" - Aucun interpréteur Python n'est défini pour le kit « %1 » + No Python interpreter set for kit "%1". + Aucun interpréteur Python n'est défini pour le kit « %1 ». @@ -49563,10 +49548,8 @@ Le processus de contrôle n'a pas pu démarrer. Connexion au périphérique… - Connected. Now doing extended checks. - - Connecté. Exécution des tests étendus. - + Connected. Now doing extended checks. + Connecté. Exécution des tests étendus. Basic connectivity test failed, device is considered unusable. @@ -49893,8 +49876,8 @@ Le processus de contrôle n'a pas pu démarrer. Utiliser le transfert par défaut. Cela peut être lent. - Unknown error occurred while trying to create remote directories - Une erreur inconnue s'est produite lors de la création des répertoires distants + Unknown error occurred while trying to create remote directories. + Une erreur inconnue s'est produite lors de la création des répertoires distants. Transfer method was downgraded from "%1" to "%2". If this is unexpected, please re-test device "%3". @@ -52415,12 +52398,12 @@ Impossible d'ouvrir le fichier « %1 ». « %1 » n'est pas un exécutable. - Terminal process exited with code %1 - Le processus du terminal s'est terminé avec le code %1 + Terminal process exited with code %1. + Le processus du terminal s'est terminé avec le code %1. - Process exited with code: %1 - Le processus s'est terminé avec le code : %1 + Process exited with code: %1. + Le processus s'est terminé avec le code : %1. Copy @@ -52708,10 +52691,10 @@ En outre, Maj+Entrée insère un caractère d’échappement à la position du c Doxygen allows "@" and "\" to start commands. By default, "@" is used if the surrounding comment starts with "/**" or "///", and "\" is used -if the comment starts with "/*!" or "//! +if the comment starts with "/*!" or "//!". Doxygen permet d'utiliser « @ » et « \ » pour démarrer une commande. Par défaut, « @ » est utilisé si le commentaire l'englobant commence avec « /** » ou « /// » et « \ » est utilisé -si le commentaire débute avec « /*! » ou « //! » +si le commentaire débute avec « /*! » ou « //! ». Documentation Comments diff --git a/share/qtcreator/translations/qtcreator_hr.ts b/share/qtcreator/translations/qtcreator_hr.ts index 6d69f112adb..ff8a9906537 100644 --- a/share/qtcreator/translations/qtcreator_hr.ts +++ b/share/qtcreator/translations/qtcreator_hr.ts @@ -27563,43 +27563,35 @@ to project "%2". - Path "%1" does not exist when checking Json wizard search paths. - + Path "%1" does not exist when checking Json wizard search paths. - Checking "%1" for %2. - + Checking "%1" for %2. - * Failed to parse "%1":%2:%3: %4 - + * Failed to parse "%1":%2:%3: %4 - * Did not find a JSON object in "%1". - + * Did not find a JSON object in "%1". - * Configuration found and parsed. - + * Configuration found and parsed. - * Version %1 not supported. - + * Version %1 not supported. - * Failed to create: %1 - + * Failed to create: %1 - JsonWizard: "%1" not found - + JsonWizard: "%1" not found. diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts index 71665c23d51..61f4213ab13 100644 --- a/share/qtcreator/translations/qtcreator_ja.ts +++ b/share/qtcreator/translations/qtcreator_ja.ts @@ -39137,40 +39137,28 @@ Would you like to overwrite it? typeId が "%1" のページの "index" が無効です。 - Path "%1" does not exist when checking Json wizard search paths. - - Json ウィザードの検索パスを確認しましたが、パス "%1" は存在しません。 - + Path "%1" does not exist when checking Json wizard search paths. + Json ウィザードの検索パスを確認しましたが、パス "%1" は存在しません。 - Checking "%1" for %2. - - %2 向けに "%1" を確認しています。 - + Checking "%1" for %2. + %2 向けに "%1" を確認しています。 - * Failed to parse "%1":%2:%3: %4 - - ・"%1" の解析に失敗しました:%2:%3: %4 - + * Failed to parse "%1":%2:%3: %4 + ・"%1" の解析に失敗しました:%2:%3: %4 - * Did not find a JSON object in "%1". - - ・"%1" に JSON オブジェクトが見つかりませんでした。 - + * Did not find a JSON object in "%1". + ・"%1" に JSON オブジェクトが見つかりませんでした。 - * Configuration found and parsed. - - ・設定が見つかり、解析しました。 - + * Configuration found and parsed. + ・設定が見つかり、解析しました。 - * Version %1 not supported. - - ・バージョン %1 には未対応です。 - + * Version %1 not supported. + ・バージョン %1 には未対応です。 The platform selected for the wizard. @@ -39201,16 +39189,12 @@ Would you like to overwrite it? 画像ファイル "%1" が見つかりません。 - * Failed to create: %1 - - ・作成に失敗しました: %1 - + * Failed to create: %1 + ・作成に失敗しました: %1 - JsonWizard: "%1" not found - - JsonWizard: "%1" が見つかりません - + JsonWizard: "%1" not found. + JsonWizard: "%1" が見つかりません。 key not found. diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts index a59ebcb424c..394f97a57b4 100644 --- a/share/qtcreator/translations/qtcreator_pl.ts +++ b/share/qtcreator/translations/qtcreator_pl.ts @@ -151,7 +151,7 @@ - Toggles if the smoothing is performed using linear interpolation method. Keeping it unchecked would follow non-smooth method using nearest neighbor. It is mostly applicable on image based items. + Toggles if the smoothing is performed using linear interpolation method. Keeping it unchecked would follow non-smooth method using nearest neighbor. It is mostly applicable on image based items. @@ -33297,7 +33297,7 @@ Czy nadpisać je? - Make sure the build command's multi-job parameter value is large enough (such as -j200 for the JOM or Make build tools) + Make sure the build command's multi-job parameter value is large enough (such as -j200 for the JOM or Make build tools). @@ -33425,7 +33425,7 @@ Czy nadpisać je? - Suppresses IncrediBuild's header in the build output + Suppresses IncrediBuild's header in the build output. @@ -33433,7 +33433,7 @@ Czy nadpisać je? - Overrides the internal Incredibuild logging level for this build. Does not affect output or any user accessible logging. Used mainly to troubleshoot issues with the help of IncrediBuild support + Overrides the internal Incredibuild logging level for this build. Does not affect output or any user accessible logging. Used mainly to troubleshoot issues with the help of IncrediBuild support. @@ -33449,7 +33449,7 @@ Czy nadpisać je? - When specified, the execution will stop as soon as an error is encountered. This is the default behavior in "Visual Studio" builds, but not the default for "Make and Build tools" or "Dev Tools" builds + When specified, the execution will stop as soon as an error is encountered. This is the default behavior in "Visual Studio" builds, but not the default for "Make and Build tools" or "Dev Tools" builds. @@ -33457,7 +33457,7 @@ Czy nadpisać je? - Add additional buildconsole arguments manually. The value of this field will be concatenated to the final buildconsole command line + Add additional buildconsole arguments manually. The value of this field will be concatenated to the final buildconsole command line. @@ -41748,40 +41748,28 @@ To develop a full application, create a Qt Quick Application project instead.Strona z typeid "%1" posiada niepoprawny "index". - Path "%1" does not exist when checking Json wizard search paths. - - Ścieżka "%1" nie istnieje podczas sprawdzania ścieżek poszukiwań kreatora Json. - + Path "%1" does not exist when checking Json wizard search paths. + Ścieżka "%1" nie istnieje podczas sprawdzania ścieżek poszukiwań kreatora Json. - Checking "%1" for %2. - - Sprawdzanie "%1" dla "%2". - + Checking "%1" for %2. + Sprawdzanie "%1" dla "%2". - * Failed to parse "%1":%2:%3: %4 - - * Nie można sparsować "%1":%2:%3: %4 - + * Failed to parse "%1":%2:%3: %4 + * Nie można sparsować "%1":%2:%3: %4 - * Did not find a JSON object in "%1". - - * Nie odnaleziono obiektu JSON w "%1". - + * Did not find a JSON object in "%1". + * Nie odnaleziono obiektu JSON w "%1". - * Configuration found and parsed. - - * Konfiguracja odnaleziona i przeparsowana. - + * Configuration found and parsed. + * Konfiguracja odnaleziona i przeparsowana. - * Version %1 not supported. - - * Wersja %1 nieobsługiwana. - + * Version %1 not supported. + * Wersja %1 nieobsługiwana. The platform selected for the wizard. @@ -41812,10 +41800,8 @@ To develop a full application, create a Qt Quick Application project instead.Brak pliku graficznego "%1". - JsonWizard: "%1" not found - - JsonWizard: Nie znaleziono "%1" - + JsonWizard: "%1" not found. + JsonWizard: Nie znaleziono "%1". key not found. @@ -48594,7 +48580,7 @@ Błąd uruchamiania procesu kontrolnego. - Unknown error occurred while trying to create remote directories + Unknown error occurred while trying to create remote directories. @@ -51127,11 +51113,11 @@ Nie można otworzyć pliku "%1". - Terminal process exited with code %1 + Terminal process exited with code %1. - Process exited with code: %1 + Process exited with code: %1. @@ -53843,7 +53829,7 @@ po naciśnięciu klawisza backspace Doxygen allows "@" and "\" to start commands. By default, "@" is used if the surrounding comment starts with "/**" or "///", and "\" is used -if the comment starts with "/*!" or "//! +if the comment starts with "/*!" or "//!". diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index ac9a564f8b3..501ede37bf2 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -22415,8 +22415,8 @@ Would you like to overwrite them? Максимальное количество ЦП для сборки: - When specified, the execution will stop as soon as an error is encountered. This is the default behavior in 'Visual Studio' builds, but not the default for 'Make and Build tools' or 'Dev Tools' builds - Включение остановки выполнения при возникновении ошибки. Это поведение по умолчанию в сборках «Visual Studio», но не по умолчанию для сборок «Make and Build tools» или «Dev Tools» + When specified, the execution will stop as soon as an error is encountered. This is the default behavior in 'Visual Studio' builds, but not the default for 'Make and Build tools' or 'Dev Tools' builds. + Включение остановки выполнения при возникновении ошибки. Это поведение по умолчанию в сборках «Visual Studio», но не по умолчанию для сборок «Make and Build tools» или «Dev Tools». Stop On Errors @@ -22467,7 +22467,7 @@ Would you like to overwrite them? Помощник запуска: - Add additional buildconsole arguments manually. The value of this field will be concatenated to the final buildconsole command line + Add additional buildconsole arguments manually. The value of this field will be concatenated to the final buildconsole command line. Дополнительные параметры buildconsole. Значение поля будет добавлено к итоговой командной строке buildconsole. @@ -22495,7 +22495,7 @@ Would you like to overwrite them? Исходное число задач - Overrides the internal Incredibuild logging level for this build. Does not affect output or any user accessible logging. Used mainly to troubleshoot issues with the help of IncrediBuild support + Overrides the internal Incredibuild logging level for this build. Does not affect output or any user accessible logging. Used mainly to troubleshoot issues with the help of IncrediBuild support. Меняет для этой сборки уровень ведения внутреннего журнала Incredibuild. Не влияет на вывод или любые доступные пользователю журналы. В основном используется для устранения проблем через службу поддержки IncrediBuild. @@ -30999,40 +30999,28 @@ Preselects a desktop Qt for building the application if available. У страницы с typeId «%1» неверный «index». - Path "%1" does not exist when checking Json wizard search paths. - - При проверке путей мастера Json: путь «%1» не существует. - + Path "%1" does not exist when checking Json wizard search paths. + При проверке путей мастера Json: путь «%1» не существует. - Checking "%1" for %2. - - Проверяется «%1» у %2. - + Checking "%1" for %2. + Проверяется «%1» у %2. - * Failed to parse "%1":%2:%3: %4 - - * Не удалось разобрать «%1»:%2:%3: %4 - + * Failed to parse "%1":%2:%3: %4 + * Не удалось разобрать «%1»:%2:%3: %4 - * Did not find a JSON object in "%1". - - * Объект JSON не был найден в «%1». - + * Did not find a JSON object in "%1". + * Объект JSON не был найден в «%1». - * Configuration found and parsed. - - * Конфигурация обнаружена и разобрана. - + * Configuration found and parsed. + * Конфигурация обнаружена и разобрана. - * Version %1 not supported. - - * Версия %1 не поддерживается. - + * Version %1 not supported. + * Версия %1 не поддерживается. The platform selected for the wizard. @@ -31063,16 +31051,12 @@ Preselects a desktop Qt for building the application if available. Файл изображения «%1» не найден. - * Failed to create: %1 - - * Не удалось создать: %1 - + * Failed to create: %1 + * Не удалось создать: %1 - JsonWizard: "%1" not found - - JsonWizard: «%1» не найден - + JsonWizard: "%1" not found. + JsonWizard: «%1» не найден. key not found. diff --git a/share/qtcreator/translations/qtcreator_sl.ts b/share/qtcreator/translations/qtcreator_sl.ts index e5b3b87b02b..b6af73d1e64 100644 --- a/share/qtcreator/translations/qtcreator_sl.ts +++ b/share/qtcreator/translations/qtcreator_sl.ts @@ -7761,8 +7761,8 @@ Preselects a desktop Qt for building the application if available. Napaka: - Warning: - Opozorilo: + Warning: + Opozorilo: Configuration name: diff --git a/share/qtcreator/translations/qtcreator_uk.ts b/share/qtcreator/translations/qtcreator_uk.ts index 432f5ab3a24..1b2aaae0d43 100644 --- a/share/qtcreator/translations/qtcreator_uk.ts +++ b/share/qtcreator/translations/qtcreator_uk.ts @@ -38747,40 +38747,28 @@ Preselects a desktop Qt for building the application if available. Сторінка з "%1" має неправильний "index". - Path "%1" does not exist when checking Json wizard search paths. - - Перевірка шляхів пошуків майстра Json: шлях "%1" не існує. - + Path "%1" does not exist when checking Json wizard search paths. + Перевірка шляхів пошуків майстра Json: шлях "%1" не існує. - Checking "%1" for %2. - - Перевірка "%1" для %2. - + Checking "%1" for %2. + Перевірка "%1" для %2. - * Failed to parse "%1":%2:%3: %4 - - * Збій розбору "%1":%2:%3: %4 - + * Failed to parse "%1":%2:%3: %4 + * Збій розбору "%1":%2:%3: %4 - * Did not find a JSON object in "%1". - - * Не знайдено об'єкт JSON в "%1". - + * Did not find a JSON object in "%1". + * Не знайдено об'єкт JSON в "%1". - * Configuration found and parsed. - - * Конфігурацію знайдено та розібрано. - + * Configuration found and parsed. + * Конфігурацію знайдено та розібрано. - * Version %1 not supported. - - * Версія %1 не підтримується. - + * Version %1 not supported. + * Версія %1 не підтримується. The platform selected for the wizard. @@ -38817,16 +38805,12 @@ Preselects a desktop Qt for building the application if available. - * Failed to create: %1 - - * Збій створення: %1 - + * Failed to create: %1 + * Збій створення: %1 - JsonWizard: "%1" not found - - JsonWizard: "%1" не знайдено - + JsonWizard: "%1" not found. + JsonWizard: "%1" не знайдено. key not found. diff --git a/share/qtcreator/translations/qtcreator_zh_CN.ts b/share/qtcreator/translations/qtcreator_zh_CN.ts index 7526f78c968..22599ee578a 100644 --- a/share/qtcreator/translations/qtcreator_zh_CN.ts +++ b/share/qtcreator/translations/qtcreator_zh_CN.ts @@ -22584,7 +22584,7 @@ Would you like to overwrite them? - Make sure the build command's multi-job parameter value is large enough (such as -j200 for the JOM or Make build tools) + Make sure the build command's multi-job parameter value is large enough (such as -j200 for the JOM or Make build tools). @@ -22704,7 +22704,7 @@ Would you like to overwrite them? - Suppresses IncrediBuild's header in the build output + Suppresses IncrediBuild's header in the build output. @@ -22712,7 +22712,7 @@ Would you like to overwrite them? - Overrides the internal Incredibuild logging level for this build. Does not affect output or any user accessible logging. Used mainly to troubleshoot issues with the help of IncrediBuild support + Overrides the internal Incredibuild logging level for this build. Does not affect output or any user accessible logging. Used mainly to troubleshoot issues with the help of IncrediBuild support. @@ -22732,7 +22732,7 @@ Would you like to overwrite them? - When specified, the execution will stop as soon as an error is encountered. This is the default behavior in "Visual Studio" builds, but not the default for "Make and Build tools" or "Dev Tools" builds + When specified, the execution will stop as soon as an error is encountered. This is the default behavior in "Visual Studio" builds, but not the default for "Make and Build tools" or "Dev Tools" builds. @@ -22740,7 +22740,7 @@ Would you like to overwrite them? - Add additional buildconsole arguments manually. The value of this field will be concatenated to the final buildconsole command line + Add additional buildconsole arguments manually. The value of this field will be concatenated to the final buildconsole command line. @@ -28771,33 +28771,27 @@ Enable this if you plan to create 32-bit x86 binaries without using a dedicated - Path "%1" does not exist when checking Json wizard search paths. - + Path "%1" does not exist when checking Json wizard search paths. - Checking "%1" for %2. - + Checking "%1" for %2. - * Failed to parse "%1":%2:%3: %4 - + * Failed to parse "%1":%2:%3: %4 - * Did not find a JSON object in "%1". - + * Did not find a JSON object in "%1". - * Configuration found and parsed. - + * Configuration found and parsed. - JsonWizard: "%1" not found - + JsonWizard: "%1" not found. @@ -28817,8 +28811,7 @@ Enable this if you plan to create 32-bit x86 binaries without using a dedicated - * Version %1 not supported. - + * Version %1 not supported. diff --git a/src/plugins/clangformat/clangformatconfigwidget.cpp b/src/plugins/clangformat/clangformatconfigwidget.cpp index e9f49a5eeec..ec1afdcfc1f 100644 --- a/src/plugins/clangformat/clangformatconfigwidget.cpp +++ b/src/plugins/clangformat/clangformatconfigwidget.cpp @@ -214,7 +214,7 @@ void ClangFormatConfigWidget::initEditor(TextEditor::ICodeStylePreferences *code return; } m_clangFileIsCorrectText->show(); - m_clangFileIsCorrectText->setText(Tr::tr("Warning: ") + success.error()); + m_clangFileIsCorrectText->setText(Tr::tr("Warning:") + " " + success.error()); m_clangFileIsCorrectText->setType(Utils::InfoLabel::Warning); }); diff --git a/src/plugins/incredibuild/buildconsolebuildstep.cpp b/src/plugins/incredibuild/buildconsolebuildstep.cpp index 61b40a8b2f9..2b8bcd2185a 100644 --- a/src/plugins/incredibuild/buildconsolebuildstep.cpp +++ b/src/plugins/incredibuild/buildconsolebuildstep.cpp @@ -55,9 +55,12 @@ public: CommandBuilderAspect commandBuilder{this}; TextDisplay t2{this, "" + Tr::tr("Enter the appropriate arguments to your build command.")}; - TextDisplay t3{this, "" + Tr::tr("Make sure the build command's multi-job " - "parameter value is large enough " - "(such as -j200 for the JOM or Make build tools)")}; + TextDisplay + t3{this, + "" + + Tr::tr("Make sure the build command's multi-job " + "parameter value is large enough " + "(such as -j200 for the JOM or Make build tools).")}; BoolAspect keepJobNum{this}; TextDisplay t4{this, "" + Tr::tr("IncrediBuild Distribution Control")}; @@ -187,7 +190,7 @@ BuildConsoleBuildStep::BuildConsoleBuildStep(BuildStepList *buildStepList, Id id hideHeader.setSettingsKey("IncrediBuild.BuildConsole.HideHeader"); hideHeader.setLabel(Tr::tr("Hide IncrediBuild Header in output:")); - hideHeader.setToolTip(Tr::tr("Suppresses IncrediBuild's header in the build output")); + hideHeader.setToolTip(Tr::tr("Suppresses IncrediBuild's header in the build output.")); logLevel.setSettingsKey("IncrediBuild.BuildConsole.LogLevel"); logLevel.setDisplayName(Tr::tr("Internal IncrediBuild logging level:")); @@ -198,7 +201,7 @@ BuildConsoleBuildStep::BuildConsoleBuildStep(BuildStepList *buildStepList, Id id logLevel.addOption("Detailed"); logLevel.setToolTip(Tr::tr("Overrides the internal Incredibuild logging level for this build. " "Does not affect output or any user accessible logging. Used mainly " - "to troubleshoot issues with the help of IncrediBuild support")); + "to troubleshoot issues with the help of IncrediBuild support.")); setEnv.setSettingsKey("IncrediBuild.BuildConsole.SetEnv"); setEnv.setLabelText(Tr::tr("Set an Environment Variable:")); @@ -210,14 +213,14 @@ BuildConsoleBuildStep::BuildConsoleBuildStep(BuildStepList *buildStepList, Id id stopOnError.setToolTip(Tr::tr("When specified, the execution will stop as soon as an error " "is encountered. This is the default behavior in " "\"Visual Studio\" builds, but not the default for " - "\"Make and Build tools\" or \"Dev Tools\" builds")); + "\"Make and Build tools\" or \"Dev Tools\" builds.")); additionalArguments.setSettingsKey("IncrediBuild.BuildConsole.AdditionalArguments"); additionalArguments.setLabelText(Tr::tr("Additional Arguments:")); additionalArguments.setDisplayStyle(StringAspect::LineEditDisplay); additionalArguments.setToolTip(Tr::tr("Add additional buildconsole arguments manually. " "The value of this field will be concatenated to the " - "final buildconsole command line")); + "final buildconsole command line.")); openMonitor.setSettingsKey("IncrediBuild.BuildConsole.OpenMonitor"); openMonitor.setLabel(Tr::tr("Open Build Monitor:")); diff --git a/src/plugins/incredibuild/ibconsolebuildstep.cpp b/src/plugins/incredibuild/ibconsolebuildstep.cpp index c53ffad4552..8dd68baa601 100644 --- a/src/plugins/incredibuild/ibconsolebuildstep.cpp +++ b/src/plugins/incredibuild/ibconsolebuildstep.cpp @@ -34,9 +34,12 @@ public: BoolAspect keepJobNum{this}; TextDisplay t2{this, "" + Tr::tr("Enter the appropriate arguments to your build command.")}; - TextDisplay t3{this, "" + Tr::tr("Make sure the build command's " - "multi-job parameter value is large enough (such as " - "-j200 for the JOM or Make build tools)")}; + TextDisplay + t3{this, + "" + + Tr::tr("Make sure the build command's " + "multi-job parameter value is large enough (such as " + "-j200 for the JOM or Make build tools).")}; TextDisplay t4{this, "" + Tr::tr("IncrediBuild Distribution Control")}; diff --git a/src/plugins/projectexplorer/buildaspects.cpp b/src/plugins/projectexplorer/buildaspects.cpp index 3872b7824a6..969f0b09bc4 100644 --- a/src/plugins/projectexplorer/buildaspects.cpp +++ b/src/plugins/projectexplorer/buildaspects.cpp @@ -197,8 +197,8 @@ QString BuildDirectoryAspect::updateProblemLabelsHelper(const QString &value) "Build directory contains potentially problematic character \"%1\".") .arg(*invalidChar); genericProblemLabelString - = genericProblem - + Tr::tr(" This warning can be suppressed here."); + = genericProblem + " " + + Tr::tr("This warning can be suppressed here."); } } diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp index 7f8ff6baf54..35ebff2374c 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp @@ -214,8 +214,10 @@ QVariantMap JsonWizardFactory::loadDefaultValues(const QString &fileName) FilePath dir = FilePath::fromString(path.toString()); if (!dir.exists()) { if (verbose()) - verboseLog.append(Tr::tr("Path \"%1\" does not exist when checking Json wizard search paths.\n") - .arg(path.toUserOutput())); + verboseLog.append( + Tr::tr("Path \"%1\" does not exist when checking Json wizard search paths.") + .arg(path.toUserOutput()) + + "\n"); continue; } @@ -225,9 +227,11 @@ QVariantMap JsonWizardFactory::loadDefaultValues(const QString &fileName) while (!dirs.isEmpty()) { const FilePath current = dirs.takeFirst(); if (verbose()) - verboseLog.append(Tr::tr("Checking \"%1\" for %2.\n") - .arg(QDir::toNativeSeparators(current.absolutePath().toString())) - .arg(fileName)); + verboseLog.append( + Tr::tr("Checking \"%1\" for %2.") + .arg(QDir::toNativeSeparators(current.absolutePath().toString())) + .arg(fileName) + + "\n"); if (current.pathAppended(fileName).exists()) { QFile configFile(current.pathAppended(fileName).toString()); configFile.open(QIODevice::ReadOnly); @@ -247,10 +251,13 @@ QVariantMap JsonWizardFactory::loadDefaultValues(const QString &fileName) ++column; } } - verboseLog.append(Tr::tr("* Failed to parse \"%1\":%2:%3: %4\n") - .arg(configFile.fileName()) - .arg(line).arg(column) - .arg(error.errorString())); + verboseLog.append( + Tr::tr("* Failed to parse \"%1\":%2:%3: %4") + .arg(configFile.fileName()) + .arg(line) + .arg(column) + .arg(error.errorString()) + + "\n"); continue; } @@ -261,7 +268,7 @@ QVariantMap JsonWizardFactory::loadDefaultValues(const QString &fileName) } if (verbose()) - verboseLog.append(Tr::tr("* Configuration found and parsed.\n")); + verboseLog.append(Tr::tr("* Configuration found and parsed.") + "\n"); return json.object().toVariantMap(); } @@ -271,7 +278,7 @@ QVariantMap JsonWizardFactory::loadDefaultValues(const QString &fileName) dirs.swap(subDirs); dirs.append(subDirs); } else if (verbose()) { - verboseLog.append(Tr::tr("JsonWizard: \"%1\" not found\n").arg(fileName)); + verboseLog.append(Tr::tr("JsonWizard: \"%1\" not found.").arg(fileName) + "\n"); } } } @@ -448,8 +455,10 @@ QList JsonWizardFactory::createWizardFactories() if (!path.exists()) { if (verbose()) - verboseLog.append(Tr::tr("Path \"%1\" does not exist when checking Json wizard search paths.\n") - .arg(path.toUserOutput())); + verboseLog.append( + Tr::tr("Path \"%1\" does not exist when checking Json wizard search paths.") + .arg(path.toUserOutput()) + + "\n"); continue; } @@ -475,27 +484,31 @@ QList JsonWizardFactory::createWizardFactories() ++column; } } - verboseLog.append(Tr::tr("* Failed to parse \"%1\":%2:%3: %4\n") - .arg(currentFile.fileName()) - .arg(line).arg(column) - .arg(error.errorString())); + verboseLog.append( + Tr::tr("* Failed to parse \"%1\":%2:%3: %4") + .arg(currentFile.fileName()) + .arg(line) + .arg(column) + .arg(error.errorString()) + + "\n"); continue; } if (!json.isObject()) { - verboseLog.append(Tr::tr("* Did not find a JSON object in \"%1\".\n") - .arg(currentFile.fileName())); + verboseLog.append( + Tr::tr("* Did not find a JSON object in \"%1\".").arg(currentFile.fileName()) + + "\n"); continue; } if (verbose()) - verboseLog.append(Tr::tr("* Configuration found and parsed.\n")); + verboseLog.append(Tr::tr("* Configuration found and parsed.") + "\n"); QVariantMap data = json.object().toVariantMap(); int version = data.value(QLatin1String(VERSION_KEY), 0).toInt(); if (version < 1 || version > 1) { - verboseLog.append(Tr::tr("* Version %1 not supported.\n").arg(version)); + verboseLog.append(Tr::tr("* Version %1 not supported.").arg(version) + "\n"); continue; } @@ -504,7 +517,7 @@ QList JsonWizardFactory::createWizardFactories() currentFile.parentDir(), &errorMessage); if (!factory) { - verboseLog.append(Tr::tr("* Failed to create: %1\n").arg(errorMessage)); + verboseLog.append(Tr::tr("* Failed to create: %1").arg(errorMessage) + "\n"); continue; } diff --git a/src/plugins/python/pythonproject.cpp b/src/plugins/python/pythonproject.cpp index db0831005f1..ed81e8cc8bb 100644 --- a/src/plugins/python/pythonproject.cpp +++ b/src/plugins/python/pythonproject.cpp @@ -33,9 +33,8 @@ Tasks PythonProject::projectIssues(const Kit *k) const { if (PythonKitAspect::python(k)) return {}; - return { - BuildSystemTask{Task::Error, - Tr::tr("No Python interpreter set for kit \"%1\"").arg(k->displayName())}}; + return {BuildSystemTask{ + Task::Error, Tr::tr("No Python interpreter set for kit \"%1\".").arg(k->displayName())}}; } PythonProjectNode::PythonProjectNode(const FilePath &path) diff --git a/src/plugins/remotelinux/genericdeploystep.cpp b/src/plugins/remotelinux/genericdeploystep.cpp index 3d1f0e5e3ab..0002e69f5f2 100644 --- a/src/plugins/remotelinux/genericdeploystep.cpp +++ b/src/plugins/remotelinux/genericdeploystep.cpp @@ -101,7 +101,7 @@ GroupItem GenericDeployStep::mkdirTask(const Storage &storage) const int numResults = async.future().resultCount(); if (numResults == 0) { addErrorMessage( - Tr::tr("Unknown error occurred while trying to create remote directories") + '\n'); + Tr::tr("Unknown error occurred while trying to create remote directories.") + '\n'); return; } diff --git a/src/plugins/remotelinux/linuxdevicetester.cpp b/src/plugins/remotelinux/linuxdevicetester.cpp index 2f0e43dfb51..4dea30c3d00 100644 --- a/src/plugins/remotelinux/linuxdevicetester.cpp +++ b/src/plugins/remotelinux/linuxdevicetester.cpp @@ -107,7 +107,7 @@ GroupItem GenericLinuxDeviceTesterPrivate::connectionTask() const const bool success = task.isResultAvailable() && task.result(); if (success) { // TODO: For master: move the '\n' outside of Tr(). - emit q->progressMessage(Tr::tr("Connected. Now doing extended checks.\n")); + emit q->progressMessage(Tr::tr("Connected. Now doing extended checks.") + "\n"); } else { emit q->errorMessage( Tr::tr("Basic connectivity test failed, device is considered unusable.") + '\n'); diff --git a/src/plugins/terminal/terminalwidget.cpp b/src/plugins/terminal/terminalwidget.cpp index 756f1a11bee..efaf671a03d 100644 --- a/src/plugins/terminal/terminalwidget.cpp +++ b/src/plugins/terminal/terminalwidget.cpp @@ -156,7 +156,7 @@ void TerminalWidget::setupPty() const int exitCode = QTC_GUARD(m_process) ? m_process->exitCode() : -1; if (m_process) { if (exitCode != 0) { - errorMessage = Tr::tr("Terminal process exited with code %1").arg(exitCode); + errorMessage = Tr::tr("Terminal process exited with code %1.").arg(exitCode); if (!m_process->errorString().isEmpty()) errorMessage += QString(" (%1)").arg(m_process->errorString()); @@ -183,7 +183,7 @@ void TerminalWidget::setupPty() writeToTerminal(msg, true); } else { - QString exitMsg = Tr::tr("Process exited with code: %1").arg(exitCode); + QString exitMsg = Tr::tr("Process exited with code: %1.").arg(exitCode); QByteArray msg = QString("\r\n%1").arg(exitMsg).toUtf8(); writeToTerminal(msg, true); } diff --git a/src/plugins/texteditor/commentssettings.cpp b/src/plugins/texteditor/commentssettings.cpp index bc6f76cb4bd..d3171a94d68 100644 --- a/src/plugins/texteditor/commentssettings.cpp +++ b/src/plugins/texteditor/commentssettings.cpp @@ -106,7 +106,7 @@ CommentsSettingsWidget::CommentsSettingsWidget(const CommentsSettings::Data &set const auto commandPrefixLabel = new QLabel(Tr::tr("Doxygen command prefix:")); const QString commandPrefixToolTip = Tr::tr(R"(Doxygen allows "@" and "\" to start commands. By default, "@" is used if the surrounding comment starts with "/**" or "///", and "\" is used -if the comment starts with "/*!" or "//!)"); +if the comment starts with "/*!" or "//!".)"); commandPrefixLabel->setToolTip(commandPrefixToolTip); d->m_commandPrefixComboBox.setToolTip(commandPrefixToolTip); d->m_commandPrefixComboBox.addItem(Tr::tr("Automatic"));