From 7ec2e724fe109525953d782ce003bbf49052f3ce Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 29 Sep 2022 14:47:34 +0200 Subject: [PATCH] ClearCase: Move to Tr::tr Change-Id: I0f65dfab1c73315d6877cfcc8a04cf202c0a3cdf Reviewed-by: Alessandro Portale --- share/qtcreator/translations/qtcreator_cs.ts | 35 +- share/qtcreator/translations/qtcreator_da.ts | 36 +- share/qtcreator/translations/qtcreator_de.ts | 30 +- share/qtcreator/translations/qtcreator_fr.ts | 35 +- share/qtcreator/translations/qtcreator_hr.ts | 35 +- share/qtcreator/translations/qtcreator_ja.ts | 309 +----------------- share/qtcreator/translations/qtcreator_pl.ts | 33 +- share/qtcreator/translations/qtcreator_ru.ts | 33 +- share/qtcreator/translations/qtcreator_uk.ts | 34 +- .../qtcreator/translations/qtcreator_zh_CN.ts | 35 +- .../qtcreator/translations/qtcreator_zh_TW.ts | 35 +- src/plugins/clearcase/activityselector.cpp | 12 +- src/plugins/clearcase/activityselector.h | 6 +- .../clearcase/annotationhighlighter.cpp | 5 +- src/plugins/clearcase/annotationhighlighter.h | 6 +- src/plugins/clearcase/checkoutdialog.cpp | 16 +- src/plugins/clearcase/clearcaseeditor.cpp | 8 +- src/plugins/clearcase/clearcaseeditor.h | 6 +- src/plugins/clearcase/clearcaseplugin.cpp | 113 ++++--- src/plugins/clearcase/clearcaseplugin.h | 6 +- src/plugins/clearcase/clearcasesettings.cpp | 36 +- src/plugins/clearcase/clearcasesettings.h | 6 +- .../clearcase/clearcasesubmiteditor.cpp | 7 +- src/plugins/clearcase/clearcasesubmiteditor.h | 6 +- .../clearcase/clearcasesubmiteditorwidget.cpp | 11 +- .../clearcase/clearcasesubmiteditorwidget.h | 6 +- src/plugins/clearcase/clearcasesync.cpp | 7 +- src/plugins/clearcase/clearcasesync.h | 6 +- src/plugins/clearcase/settingspage.cpp | 53 ++- src/plugins/clearcase/versionselector.cpp | 22 +- 30 files changed, 191 insertions(+), 797 deletions(-) diff --git a/share/qtcreator/translations/qtcreator_cs.ts b/share/qtcreator/translations/qtcreator_cs.ts index 186d8c33c56..0332a839896 100644 --- a/share/qtcreator/translations/qtcreator_cs.ts +++ b/share/qtcreator/translations/qtcreator_cs.ts @@ -49855,7 +49855,7 @@ Je zapotřebí mít nějakou verzi Qt a sadu nástrojů, aby modely kódu C++ a - ClearCase::Internal::CheckOutDialog + ClearCase Check Out Získat (checkout) @@ -49881,9 +49881,6 @@ Je zapotřebí mít nějakou verzi Qt a sadu nástrojů, aby modely kódu C++ a Hijack: Unset read-only flag without check-out. This is used for local changes which the user does not want to commit. Použít pro místní úpravy (&hijack) - - - ClearCase::Internal::SettingsPage Configuration Nastavení @@ -49966,9 +49963,6 @@ Je zapotřebí mít nějakou verzi Qt a sadu nástrojů, aby modely kódu C++ a VOBs list, separated by comma. Indexer will only traverse the specified VOBs. If left blank, all active VOBs will be indexed. Seznam VOB, oddělený čárkou. Indexer překročí pouze zadané VOBs. Bude-li ponecháno prázdné, budou zindexovány všechny činné VOB. - - - ClearCase::Internal::UndoCheckOut Dialog Dialog @@ -49981,9 +49975,6 @@ Je zapotřebí mít nějakou verzi Qt a sadu nástrojů, aby modely kódu C++ a &Save copy of the file with a '.keep' extension &Uložit kopii souboru s příponou '.keep' - - - ClearCase::Internal::VersionSelector Confirm Version to Check Out Potvrdit verzi k načtení @@ -50634,7 +50625,7 @@ Nainstalujte, prosím, alespoň jedno SDK. - ClearCase::Internal::ActivitySelector + ClearCase Select &activity: Vybrat č&innost: @@ -50647,9 +50638,6 @@ Nainstalujte, prosím, alespoň jedno SDK. Keep item activity Zachovat činnost položky - - - ClearCase::Internal::ClearCaseControl &Check Out &Načíst (checkout) @@ -50662,16 +50650,10 @@ Nainstalujte, prosím, alespoň jedno SDK. &Hijack Upravit místně (&hijack) - - - ClearCase::Internal::ClearCaseEditor Annotate version "%1" Opatřit anotacemi verzi "%1" - - - ClearCase::Internal::ClearCasePlugin Editing Derived Object: %1 Úpravy odvozeného objektu: %1 @@ -50966,32 +50948,19 @@ Nainstalujte, prosím, alespoň jedno SDK. XXX: příliš dlouhé? Indexování ClearCase - - - ClearCase::Internal::ClearCaseSubmitEditor ClearCase Check In Zápis-odevzdání do ClearCase - - - ClearCase::Internal::ClearCaseSubmitEditorWidget Chec&k in even if identical to previous version Zapsat-&odevzdat i v případě shody s předchozí verzí - - &Preserve file modification time - &Zachovat čas změny souboru - &Check In XXX: příliš dlouhé? &Zapsat-odevzdat (check in) - - - ClearCase::Internal::SettingsPageWidget ClearCase Command Příkaz pro ClearCase diff --git a/share/qtcreator/translations/qtcreator_da.ts b/share/qtcreator/translations/qtcreator_da.ts index 8e9de599caa..93ae3e91015 100644 --- a/share/qtcreator/translations/qtcreator_da.ts +++ b/share/qtcreator/translations/qtcreator_da.ts @@ -5343,7 +5343,7 @@ Men brug af de afslappede og udvidet regler betyder også at der ikke kan levere - ClearCase::Internal::ActivitySelector + ClearCase Select &activity: Vælg &aktivitet: @@ -5356,9 +5356,6 @@ Men brug af de afslappede og udvidet regler betyder også at der ikke kan levere Keep item activity Hold post aktivitet - - - ClearCase::Internal::CheckOutDialog Check Out Check out @@ -5384,9 +5381,6 @@ Men brug af de afslappede og udvidet regler betyder også at der ikke kan levere Hijack: Unset read-only flag without check-out. This is used for local changes which the user does not want to commit. Brug &hijacked fil - - - ClearCase::Internal::ClearCaseControl Check &Out Check &out @@ -5395,16 +5389,10 @@ Men brug af de afslappede og udvidet regler betyder også at der ikke kan levere &Hijack &Hijack - - - ClearCase::Internal::ClearCaseEditorWidget Annotate version "%1" Annotate version "%1" - - - ClearCase::Internal::ClearCasePlugin Editing Derived Object: %1 Redigerer afledt objekt: %1 @@ -5702,31 +5690,18 @@ Men brug af de afslappede og udvidet regler betyder også at der ikke kan levere Updating ClearCase Index Opdaterer ClearCase-indeks - - - ClearCase::Internal::ClearCaseSubmitEditor ClearCase Check In ClearCase check in - - - ClearCase::Internal::ClearCaseSubmitEditorWidget Chec&k in even if identical to previous version Chec&k in selv hvis identisk med forrige version - - &Preserve file modification time - &Bevar filændringstid - &Check In &Check in - - - ClearCase::Internal::SettingsPage Configuration Konfiguration @@ -5808,9 +5783,6 @@ Men brug af de afslappede og udvidet regler betyder også at der ikke kan levere ClearCase ClearCase - - - ClearCase::Internal::SettingsPageWidget ClearCase Command ClearCase-kommando @@ -5823,9 +5795,6 @@ Men brug af de afslappede og udvidet regler betyder også at der ikke kan levere DiffUtils is available for free download at http://gnuwin32.sourceforge.net/packages/diffutils.htm. Extract it to a directory in your PATH. DiffUtils kan frit downloades på http://gnuwin32.sourceforge.net/packages/diffutils.htm. Udpak den til en mappe i din PATH. - - - ClearCase::Internal::UndoCheckOut Dialog Dialog @@ -5838,9 +5807,6 @@ Men brug af de afslappede og udvidet regler betyder også at der ikke kan levere &Save copy of the file with a '.keep' extension &Gem kopi af filen med en '.keep'-endelse - - - ClearCase::Internal::VersionSelector Confirm Version to Check Out Bekræft version som skal check out diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index b1adf602b8e..fae9b53b67b 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -20170,7 +20170,7 @@ hinzufügen, um dem QML-Editor den wahrscheinlichen URI mitzuteilen. - ClearCase::Internal::CheckOutDialog + ClearCase Check Out Check Out @@ -20196,9 +20196,6 @@ hinzufügen, um dem QML-Editor den wahrscheinlichen URI mitzuteilen.&Checkout comment: &Checkout-Kommentar: - - - ClearCase::Internal::SettingsPage Configuration Konfiguration @@ -20276,9 +20273,6 @@ hinzufügen, um dem QML-Editor den wahrscheinlichen URI mitzuteilen.Do &not prompt for comment during checkout or check-in Beim Check-in oder Check-out &nicht nach Kommentaren fragen - - - ClearCase::Internal::UndoCheckOut Dialog Dialog @@ -20291,9 +20285,6 @@ hinzufügen, um dem QML-Editor den wahrscheinlichen URI mitzuteilen.The file was changed. Die Datei wurde geändert. - - - ClearCase::Internal::VersionSelector Confirm Version to Check Out Bestätigung der Check-Out-Version @@ -20353,7 +20344,7 @@ hinzufügen, um dem QML-Editor den wahrscheinlichen URI mitzuteilen. - ClearCase::Internal::ActivitySelector + ClearCase Select &activity: Aktivität &auswählen: @@ -20366,31 +20357,18 @@ hinzufügen, um dem QML-Editor den wahrscheinlichen URI mitzuteilen.Keep item activity Aktivität des Elements beibehalten - - - ClearCase::Internal::ClearCaseSubmitEditor ClearCase Check In ClearCase Einchecken - - - ClearCase::Internal::ClearCaseSubmitEditorWidget Chec&k in even if identical to previous version Einchec&ken auch wenn zur Vorgängerversion identisch - - &Preserve file modification time - Änderungsdatum von D&ateien beibehalten - &Check In &Einchecken - - - ClearCase::Internal::SettingsPageWidget ClearCase Command ClearCase-Befehl @@ -28239,7 +28217,7 @@ Der vom Kit mindestens benötigte API-Level ist %1. - ClearCase::Internal::ClearCaseEditorWidget + ClearCase Annotate version "%1" Annotation für Version "%1" @@ -45529,7 +45507,7 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e - ClearCase::Internal::ClearCasePluginPrivate + ClearCase Editing Derived Object: %1 Bearbeite abgeleitetes Objekt: %1 diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts index 93942216834..48f51966394 100644 --- a/share/qtcreator/translations/qtcreator_fr.ts +++ b/share/qtcreator/translations/qtcreator_fr.ts @@ -46846,7 +46846,7 @@ Le fichier APL ne sera pas utilisable sur d'autres périphériques. - ClearCase::Internal::CheckOutDialog + ClearCase Check Out Importer @@ -46873,9 +46873,6 @@ Le fichier APL ne sera pas utilisable sur d'autres périphériques.ça sent le dikkenek un peu tout ça: http://www.lembrouille.com/dikkenek/dikkenek-je-viens-de-me-faire-carjacker Utiliser fichier &Hijacké - - - ClearCase::Internal::SettingsPage Configuration Configuration @@ -46952,9 +46949,6 @@ Le fichier APL ne sera pas utilisable sur d'autres périphériques.ClearCase ClearCase - - - ClearCase::Internal::UndoCheckOut Dialog Boîte de dialogue @@ -46967,9 +46961,6 @@ Le fichier APL ne sera pas utilisable sur d'autres périphériques.&Save copy of the file with a '.keep' extension &Sauvergarder une copie du fichier avec une extension ".keep" - - - ClearCase::Internal::VersionSelector Confirm Version to Check Out Confirmer la version à importer @@ -48300,7 +48291,7 @@ Veuillez choisir un nom de paquet valide pour votre application (par exemple &qu - ClearCase::Internal::ActivitySelector + ClearCase Select &activity: Sélectionner une &activité : @@ -48313,9 +48304,6 @@ Veuillez choisir un nom de paquet valide pour votre application (par exemple &qu Keep item activity Garder l'élément de l'activité - - - ClearCase::Internal::ClearCaseControl &Check Out &Importer @@ -48328,16 +48316,10 @@ Veuillez choisir un nom de paquet valide pour votre application (par exemple &qu &Hijack &Hijack - - - ClearCase::Internal::ClearCaseEditor Annotate version "%1" Annoter la version "%1" - - - ClearCase::Internal::ClearCasePlugin C&learCase C&learCase @@ -48628,31 +48610,18 @@ Oui :) CC Indexing CC Indexing - - - ClearCase::Internal::ClearCaseSubmitEditor ClearCase Check In Import ClearCase - - - ClearCase::Internal::ClearCaseSubmitEditorWidget Chec&k in even if identical to previous version Importer même si identique à la version précédente (&K) - - &Preserve file modification time - &Préserver la date de modification du fichier - &Check In Importer (&C) - - - ClearCase::Internal::SettingsPageWidget ClearCase Command Commande ClearCase diff --git a/share/qtcreator/translations/qtcreator_hr.ts b/share/qtcreator/translations/qtcreator_hr.ts index 4162586f393..98cebebd327 100644 --- a/share/qtcreator/translations/qtcreator_hr.ts +++ b/share/qtcreator/translations/qtcreator_hr.ts @@ -1926,7 +1926,7 @@ Međutim, korištenje opuštenih i proširenih pravila također znači da nije m - ClearCase::Internal::CheckOutDialog + ClearCase Check Out Odjava @@ -1952,9 +1952,6 @@ Međutim, korištenje opuštenih i proširenih pravila također znači da nije m Hijack: Unset read-only flag without check-out. This is used for local changes which the user does not want to commit. Koristi &otetu datoteku - - - ClearCase::Internal::SettingsPage Configuration Konfiguracija @@ -2036,9 +2033,6 @@ Međutim, korištenje opuštenih i proširenih pravila također znači da nije m ClearCase ClearCase - - - ClearCase::Internal::UndoCheckOut Dialog Dijalog @@ -2051,9 +2045,6 @@ Međutim, korištenje opuštenih i proširenih pravila također znači da nije m &Save copy of the file with a '.keep' extension &Spremi kopiju datoteke s nastavkom '.keep' - - - ClearCase::Internal::VersionSelector Confirm Version to Check Out Potvrdi verziju u odjavi @@ -17379,7 +17370,7 @@ Izlaz: - ClearCase::Internal::ActivitySelector + ClearCase Select &activity: Odaberi &aktivnost: @@ -17392,9 +17383,6 @@ Izlaz: Keep item activity Zadrži aktivnost stavke - - - ClearCase::Internal::ClearCaseControl Check &Out @@ -17403,16 +17391,10 @@ Izlaz: &Hijack - - - ClearCase::Internal::ClearCaseEditorWidget Annotate version "%1" Pribilježi verziju "%1" - - - ClearCase::Internal::ClearCasePlugin Editing Derived Object: %1 @@ -17681,31 +17663,18 @@ Izlaz: Updating ClearCase Index - - - ClearCase::Internal::ClearCaseSubmitEditor ClearCase Check In - - - ClearCase::Internal::ClearCaseSubmitEditorWidget Chec&k in even if identical to previous version - - &Preserve file modification time - - &Check In - - - ClearCase::Internal::SettingsPageWidget ClearCase Command diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts index d8c07be011a..fd8b41e44dc 100644 --- a/share/qtcreator/translations/qtcreator_ja.ts +++ b/share/qtcreator/translations/qtcreator_ja.ts @@ -1084,7 +1084,7 @@ Local pulls are not applied to the master branch. - ClearCase::Internal::CheckOutDialog + ClearCase Check Out チェックアウト @@ -1110,9 +1110,6 @@ Local pulls are not applied to the master branch. Hijack: Unset read-only flag without check-out. This is used for local changes which the user does not want to commit. ハイジャックファイルを使う(&H) - - - ClearCase::Internal::SettingsPage Configuration 設定 @@ -1194,9 +1191,6 @@ Local pulls are not applied to the master branch. Do &not prompt for comment during checkout or check-in チェックアウトまたはチェックイン時にコメントを確認しない(&N) - - - ClearCase::Internal::UndoCheckOut Dialog ダイアログ @@ -1209,9 +1203,6 @@ Local pulls are not applied to the master branch. &Save copy of the file with a '.keep' extension '.keep' 拡張子を付けてコピーを保存する(&S) - - - ClearCase::Internal::VersionSelector Confirm Version to Check Out チェックアウトバージョンの確認 @@ -13089,7 +13080,7 @@ in the system's browser for manual download. - ClearCase::Internal::ActivitySelector + ClearCase Select &activity: アクティビティの選択 (&A): @@ -13102,9 +13093,6 @@ in the system's browser for manual download. Keep item activity アイテムのアクティビティを保持 - - - ClearCase::Internal::ClearCaseControl Check &Out チェックアウト(&O) @@ -13113,9 +13101,6 @@ in the system's browser for manual download. &Hijack ハイジャック(&H) - - - ClearCase::Internal::ClearCasePlugin Editing Derived Object: %1 派生オブジェクトの編集中: %1 @@ -13408,31 +13393,18 @@ in the system's browser for manual download. Enter activity headline アクティビティ ヘッドラインに入る - - - ClearCase::Internal::ClearCaseSubmitEditor ClearCase Check In ClearCase チェックイン - - - ClearCase::Internal::ClearCaseSubmitEditorWidget Chec&k in even if identical to previous version 以前のバージョンが指定されている場合でもチェックインする(&K) - - &Preserve file modification time - ファイルの更新日時を保持する(&P) - &Check In チェックイン(&C) - - - ClearCase::Internal::SettingsPageWidget ClearCase Command ClearCase コマンド @@ -13445,10 +13417,6 @@ in the system's browser for manual download. DiffUtils is available for free download at http://gnuwin32.sourceforge.net/packages/diffutils.htm. Extract it to a directory in your PATH. DiffUtils は http://gnuwin32.sourceforge.net/packages/diffutils.htm からフリーでダウンロードできます。PATH の通ったディレクトリに展開してください。 - - ClearCase - ClearCase - CMakeProjectManager::Internal::CMakeBuildConfigurationFactory @@ -39192,7 +39160,7 @@ clang の実行ファイルを設定してください。 - ClearCase::Internal::ClearCaseEditorWidget + ClearCase Annotate version "%1" バージョン "%1" のアノテーション @@ -49700,277 +49668,6 @@ Output: クリップボードにコピーする - - ClearCase::Internal::ClearCasePluginPrivate - - Editing Derived Object: %1 - 派生オブジェクトの編集中: %1 - - - C&learCase - C&learCase - - - Check Out... - チェックアウト... - - - Check &Out "%1"... - "%1" をチェックアウト(&O)... - - - Meta+L,Meta+O - Meta+L,Meta+O - - - Alt+L,Alt+O - Alt+L,Alt+O - - - Check &In... - チェックイン(&I)... - - - Check &In "%1"... - "%1" をチェックイン(&I)... - - - Meta+L,Meta+I - Meta+L,Meta+I - - - Alt+L,Alt+I - Alt+L,Alt+I - - - Undo Check Out - チェックアウトを元に戻す - - - &Undo Check Out "%1" - "%1" のチェックアウトを元に戻す(&U) - - - Meta+L,Meta+U - Meta+L,Meta+U - - - Alt+L,Alt+U - Alt+L,Alt+U - - - Undo Hijack - ハイジャックを元に戻す - - - Undo Hi&jack "%1" - "%1" のハイジャックを元に戻す(&J) - - - Meta+L,Meta+R - Meta+L,Meta+R - - - Alt+L,Alt+R - Alt+L,Alt+R - - - &Diff "%1" - "%1" の差分表示(&D) - - - Meta+L,Meta+D - Meta+L,Meta+D - - - Alt+L,Alt+D - Alt+L,Alt+D - - - History Current File - 現在のファイルの履歴 - - - &History "%1" - "%1" の履歴(&H) - - - Meta+L,Meta+H - Meta+L,Meta+H - - - Alt+L,Alt+H - Alt+L,Alt+H - - - &Annotate "%1" - "%1" のアノテーション(&A) - - - Meta+L,Meta+A - Meta+L,Meta+A - - - Alt+L,Alt+A - Alt+L,Alt+A - - - Add File... - ファイルを追加... - - - Add File "%1" - ファイル "%1" を追加 - - - Diff A&ctivity... - アクティビティの差分表示(&C)... - - - Ch&eck In Activity - アクティビティをチェックイン(&E) - - - Chec&k In Activity "%1"... - アクティビティ "%1" をチェックイン(&K)... - - - Update Index - インデックス更新 - - - Update View - ビュー更新 - - - U&pdate View "%1" - ビュー "%1" 更新(&P) - - - Check In All &Files... - すべてのファイルをチェックイン(&F)... - - - Meta+L,Meta+F - Meta+L,Meta+F - - - Alt+L,Alt+F - Alt+L,Alt+F - - - View &Status - ステータス更新(&S) - - - Meta+L,Meta+S - Meta+L,Meta+S - - - Alt+L,Alt+S - Alt+L,Alt+S - - - Check In - チェックイン - - - Do you want to undo the check out of "%1"? - "%1" のチェックアウトを元に戻しますか？ - - - Undo Hijack File - ハイジャックファイルを元に戻す - - - Do you want to undo hijack of "%1"? - "%1" のハイジャックを元に戻しますか？ - - - External diff is required to compare multiple files. - 外部 diff ツールは、複数のファイルを比較できる必要があります。 - - - Enter Activity - アクティビティに入る - - - Activity Name - アクティビティ名 - - - Check In Activity - アクティビティをチェックイン - - - Another check in is currently being executed. - 別のチェックインが実行中です。 - - - There are no modified files. - 変更されたファイルはありません。 - - - No ClearCase executable specified. - 実行可能な ClearCase が指定されていません。 - - - ClearCase Checkout - ClearCase チェックアウト - - - File is already checked out. - ファイルは、既にチェックアウトされています。 - - - Set current activity failed: %1 - アクティビティ設定失敗: %1 - - - Enter &comment: - コメントを入力(&C): - - - ClearCase Add File %1 - ClearCase ファイル %1 を追加 - - - ClearCase Remove Element %1 - ClearCase 要素 %1 を削除 - - - This operation is irreversible. Are you sure? - この操作は元に戻せませんが、よろしいですか？ - - - ClearCase Remove File %1 - ClearCase ファイル %1 を削除 - - - ClearCase Rename File %1 -> %2 - ClearCase ファイル名変更 %1 -> %2 - - - Activity Headline - アクティビティ ヘッドライン - - - Enter activity headline - アクティビティ ヘッドラインに入る - - - Updating ClearCase Index - ClearCase インデックスの更新中 - - - Check &Out - チェックアウト(&O) - - - &Hijack - ハイジャック(&H) - - CMakeProjectManager::CMakeBuildConfiguration diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts index 770fb4c15be..841ccc239bd 100644 --- a/share/qtcreator/translations/qtcreator_pl.ts +++ b/share/qtcreator/translations/qtcreator_pl.ts @@ -22877,7 +22877,7 @@ poinstruuje Qt Creatora o URI. - ClearCase::Internal::CheckOutDialog + ClearCase Check Out Kopia robocza @@ -22903,9 +22903,6 @@ poinstruuje Qt Creatora o URI. &Checkout comment: - - - ClearCase::Internal::SettingsPage Configuration Konfiguracja @@ -22987,9 +22984,6 @@ poinstruuje Qt Creatora o URI. Do &not prompt for comment during checkout or check-in - - - ClearCase::Internal::UndoCheckOut Dialog Dialog @@ -23002,9 +22996,6 @@ poinstruuje Qt Creatora o URI. &Save copy of the file with a '.keep' extension &Zachowaj kopię pliku z rozszerzeniem ".keep" - - - ClearCase::Internal::VersionSelector Confirm Version to Check Out Potwierdź wersję dla kopii roboczej @@ -23043,7 +23034,7 @@ poinstruuje Qt Creatora o URI. - ClearCase::Internal::ActivitySelector + ClearCase Select &activity: Wybierz &aktywność: @@ -23056,9 +23047,6 @@ poinstruuje Qt Creatora o URI. Keep item activity Zachowaj aktywność elementu - - - ClearCase::Internal::ClearCasePlugin C&learCase C&learCase @@ -23351,31 +23339,18 @@ poinstruuje Qt Creatora o URI. Enter activity headline - - - ClearCase::Internal::ClearCaseSubmitEditor ClearCase Check In Wrzuć do ClearCase - - - ClearCase::Internal::ClearCaseSubmitEditorWidget Chec&k in even if identical to previous version W&rzuć, nawet jeśli wersja jest identyczna z wersją poprzednią - - &Preserve file modification time - Zachowaj czas modyfikacji &pliku - &Check In &Wrzuć - - - ClearCase::Internal::SettingsPageWidget ClearCase Command Komenda ClearCase @@ -23497,7 +23472,7 @@ You can choose another communication channel here, such as a serial line or cust - ClearCase::Internal::ClearCaseControl + ClearCase Check &Out @@ -30498,7 +30473,7 @@ Zainstaluj SDK o wersji %1 lub wyższej. - ClearCase::Internal::ClearCaseEditorWidget + ClearCase Annotate version "%1" Dołącz adnotację do wersji "%1" diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index 69995b2b8b6..16826e3a9b0 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -8072,7 +8072,7 @@ Set a valid executable first. - ClearCase::Internal::ActivitySelector + ClearCase Select &activity: Выбрать &активность: @@ -8085,9 +8085,6 @@ Set a valid executable first. Keep item activity Сохранить активность элемента - - - ClearCase::Internal::CheckOutDialog Check Out Создание изменяемой копии @@ -8113,16 +8110,10 @@ Set a valid executable first. &Checkout comment: &Комментарий: - - - ClearCase::Internal::ClearCaseEditorWidget Annotate version "%1" Аннотация версии «%1» - - - ClearCase::Internal::ClearCasePluginPrivate Editing Derived Object: %1 Изменение производного объекта: %1 @@ -8399,31 +8390,18 @@ Set a valid executable first. &Hijack &Исправить - - - ClearCase::Internal::ClearCaseSubmitEditor ClearCase Check In Фиксация ClearCase - - - ClearCase::Internal::ClearCaseSubmitEditorWidget Chec&k in even if identical to previous version Фиксироват&ь, даже если совпадает с предыдущей версией - - &Preserve file modification time - &Сохранять время изменения файлов - &Check In &Фиксировать - - - ClearCase::Internal::SettingsPage Configuration Конфигурация @@ -8503,9 +8481,6 @@ Set a valid executable first. Do &not prompt for comment during checkout or check-in &Не спрашивать комментарии при получении и фиксации - - - ClearCase::Internal::SettingsPageWidget ClearCase Command Команда ClearCase @@ -8522,9 +8497,6 @@ Set a valid executable first. ClearCase ClearCase - - - ClearCase::Internal::UndoCheckOut Dialog @@ -8537,9 +8509,6 @@ Set a valid executable first. &Save copy of the file with a '.keep' extension &Сохранить копию файла с расширением «.keep» - - - ClearCase::Internal::VersionSelector Confirm Version to Check Out Подтвердите версию для извлечения diff --git a/share/qtcreator/translations/qtcreator_uk.ts b/share/qtcreator/translations/qtcreator_uk.ts index 164ab679965..8afbb857097 100644 --- a/share/qtcreator/translations/qtcreator_uk.ts +++ b/share/qtcreator/translations/qtcreator_uk.ts @@ -28406,7 +28406,7 @@ The APK will not be usable on any other device. - ClearCase::Internal::CheckOutDialog + ClearCase Check Out @@ -28432,9 +28432,6 @@ The APK will not be usable on any other device. Hijack: Unset read-only flag without check-out. This is used for local changes which the user does not want to commit. - - - ClearCase::Internal::SettingsPage Configuration Конфігурація @@ -28520,9 +28517,6 @@ The APK will not be usable on any other device. Do &not prompt for comment during checkout or check-in - - - ClearCase::Internal::UndoCheckOut Dialog Діалог @@ -28535,9 +28529,6 @@ The APK will not be usable on any other device. &Save copy of the file with a '.keep' extension &Зберегти копію файлу з розширенням '.keep' - - - ClearCase::Internal::VersionSelector Confirm Version to Check Out @@ -29929,7 +29920,7 @@ To add the Qt versions, select Options > Build & Run > Qt Versions. - ClearCase::Internal::ActivitySelector + ClearCase Select &activity: @@ -29942,9 +29933,6 @@ To add the Qt versions, select Options > Build & Run > Qt Versions.Keep item activity - - - ClearCase::Internal::ClearCaseControl Check &Out @@ -29953,9 +29941,6 @@ To add the Qt versions, select Options > Build & Run > Qt Versions.&Hijack - - - ClearCase::Internal::ClearCasePlugin Editing Derived Object: %1 @@ -30248,31 +30233,18 @@ To add the Qt versions, select Options > Build & Run > Qt Versions.Enter activity headline - - - ClearCase::Internal::ClearCaseSubmitEditor ClearCase Check In - - - ClearCase::Internal::ClearCaseSubmitEditorWidget Chec&k in even if identical to previous version - - &Preserve file modification time - - &Check In - - - ClearCase::Internal::SettingsPageWidget ClearCase Command Команда ClearCase @@ -44296,7 +44268,7 @@ Deploying local Qt libraries is incompatible with Android 5. - ClearCase::Internal::ClearCaseEditorWidget + ClearCase Annotate version "%1" diff --git a/share/qtcreator/translations/qtcreator_zh_CN.ts b/share/qtcreator/translations/qtcreator_zh_CN.ts index d7b30da7a49..fb9bf277950 100644 --- a/share/qtcreator/translations/qtcreator_zh_CN.ts +++ b/share/qtcreator/translations/qtcreator_zh_CN.ts @@ -41568,7 +41568,7 @@ This option is useful when you want to try your application on devices which don - ClearCase::Internal::CheckOutDialog + ClearCase Check Out Check Out @@ -41594,9 +41594,6 @@ This option is useful when you want to try your application on devices which don Hijack: Unset read-only flag without check-out. This is used for local changes which the user does not want to commit. 使用&Hijack文件 - - - ClearCase::Internal::SettingsPage Configuration 配置 @@ -41670,9 +41667,6 @@ This option is useful when you want to try your application on devices which don ClearCase ClearCase - - - ClearCase::Internal::UndoCheckOut Dialog 对话框 @@ -41685,9 +41679,6 @@ This option is useful when you want to try your application on devices which don &Save copy of the file with a '.keep' extension 以'.keep'为扩展名保存文件的拷贝(&S) - - - ClearCase::Internal::VersionSelector Confirm Version to Check Out 确定checkout的版本 @@ -44870,7 +44861,7 @@ Please choose a valid package name for your application (e.g. "org.example. - ClearCase::Internal::ActivitySelector + ClearCase Select &activity: 选择活动(&A): @@ -44883,9 +44874,6 @@ Please choose a valid package name for your application (e.g. "org.example. Keep item activity 保留项的活动 - - - ClearCase::Internal::ClearCaseControl &Check Out &Check Out @@ -44894,16 +44882,10 @@ Please choose a valid package name for your application (e.g. "org.example. &Hijack &Hijack - - - ClearCase::Internal::ClearCaseEditor Annotate version "%1" 注释版本 "%1" - - - ClearCase::Internal::ClearCasePlugin C&learCase C&learCase @@ -45192,31 +45174,18 @@ Please choose a valid package name for your application (e.g. "org.example. CC Indexing CC 正在索引 - - - ClearCase::Internal::ClearCaseSubmitEditor ClearCase Check In ClearCase Check In - - - ClearCase::Internal::ClearCaseSubmitEditorWidget Chec&k in even if identical to previous version 即使与前一版本完全相同仍然checkin (&K) - - &Preserve file modification time - 保留文件被修改的时间(&P) - &Check In &Check In - - - ClearCase::Internal::SettingsPageWidget ClearCase Command ClearCase 命令 diff --git a/share/qtcreator/translations/qtcreator_zh_TW.ts b/share/qtcreator/translations/qtcreator_zh_TW.ts index 67523f7b4a1..46e26a465f2 100644 --- a/share/qtcreator/translations/qtcreator_zh_TW.ts +++ b/share/qtcreator/translations/qtcreator_zh_TW.ts @@ -29604,7 +29604,7 @@ This option is useful when you want to try your application on devices which don - ClearCase::Internal::CheckOutDialog + ClearCase Check Out @@ -29630,9 +29630,6 @@ This option is useful when you want to try your application on devices which don Hijack: Unset read-only flag without check-out. This is used for local changes which the user does not want to commit. - - - ClearCase::Internal::SettingsPage Configuration 設置 @@ -29706,9 +29703,6 @@ This option is useful when you want to try your application on devices which don ClearCase - - - ClearCase::Internal::UndoCheckOut Dialog 對話框 @@ -29721,9 +29715,6 @@ This option is useful when you want to try your application on devices which don &Save copy of the file with a '.keep' extension - - - ClearCase::Internal::VersionSelector Confirm Version to Check Out @@ -30910,7 +30901,7 @@ Please choose a valid package name for your application (e.g. "org.example. - ClearCase::Internal::ActivitySelector + ClearCase Select &activity: @@ -30923,9 +30914,6 @@ Please choose a valid package name for your application (e.g. "org.example. Keep item activity - - - ClearCase::Internal::ClearCaseControl &Check Out @@ -30934,16 +30922,10 @@ Please choose a valid package name for your application (e.g. "org.example. &Hijack - - - ClearCase::Internal::ClearCaseEditor Annotate version "%1" - - - ClearCase::Internal::ClearCasePlugin C&learCase @@ -31232,31 +31214,18 @@ Please choose a valid package name for your application (e.g. "org.example. CC Indexing - - - ClearCase::Internal::ClearCaseSubmitEditor ClearCase Check In - - - ClearCase::Internal::ClearCaseSubmitEditorWidget Chec&k in even if identical to previous version - - &Preserve file modification time - - &Check In - - - ClearCase::Internal::SettingsPageWidget ClearCase Command diff --git a/src/plugins/clearcase/activityselector.cpp b/src/plugins/clearcase/activityselector.cpp index 822e7c1a01c..3572ccfae2d 100644 --- a/src/plugins/clearcase/activityselector.cpp +++ b/src/plugins/clearcase/activityselector.cpp @@ -6,6 +6,7 @@ #include "clearcaseconstants.h" #include "clearcaseplugin.h" #include "clearcasesettings.h" +#include "clearcasetr.h" #include @@ -14,8 +15,7 @@ #include #include -using namespace ClearCase; -using namespace ClearCase::Internal; +namespace ClearCase::Internal { ActivitySelector::ActivitySelector(QWidget *parent) : QWidget(parent) { @@ -24,7 +24,7 @@ ActivitySelector::ActivitySelector(QWidget *parent) : QWidget(parent) auto hboxLayout = new QHBoxLayout(this); hboxLayout->setContentsMargins(0, 0, 0, 0); - auto lblActivity = new QLabel(tr("Select &activity:")); + auto lblActivity = new QLabel(Tr::tr("Select &activity:")); lblActivity->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred); hboxLayout->addWidget(lblActivity); @@ -32,7 +32,7 @@ ActivitySelector::ActivitySelector(QWidget *parent) : QWidget(parent) m_cmbActivity->setMinimumSize(QSize(350, 0)); hboxLayout->addWidget(m_cmbActivity); - QString addText = tr("Add"); + QString addText = Tr::tr("Add"); if (!ClearCasePlugin::settings().autoAssignActivityName) addText.append(QLatin1String("...")); auto btnAdd = new QToolButton; @@ -67,7 +67,7 @@ bool ActivitySelector::refresh() void ActivitySelector::addKeep() { - m_cmbActivity->insertItem(0, tr("Keep item activity"), QLatin1String(Constants::KEEP_ACTIVITY)); + m_cmbActivity->insertItem(0, Tr::tr("Keep item activity"), QLatin1String(Constants::KEEP_ACTIVITY)); setActivity(QLatin1String(Constants::KEEP_ACTIVITY)); } @@ -93,3 +93,5 @@ void ActivitySelector::newActivity() if (ClearCasePlugin::newActivity()) refresh(); } + +} // ClearCase::Internal diff --git a/src/plugins/clearcase/activityselector.h b/src/plugins/clearcase/activityselector.h index 3a851931716..4883b48c3a3 100644 --- a/src/plugins/clearcase/activityselector.h +++ b/src/plugins/clearcase/activityselector.h @@ -9,8 +9,7 @@ QT_BEGIN_NAMESPACE class QComboBox; QT_END_NAMESPACE -namespace ClearCase { -namespace Internal { +namespace ClearCase::Internal { class ActivitySelector : public QWidget { @@ -33,5 +32,4 @@ private: QComboBox *m_cmbActivity = nullptr; }; -} // namespace Internal -} // namespace ClearCase +} // ClearCase::Internal diff --git a/src/plugins/clearcase/annotationhighlighter.cpp b/src/plugins/clearcase/annotationhighlighter.cpp index f619f558c4c..1e6b59e6799 100644 --- a/src/plugins/clearcase/annotationhighlighter.cpp +++ b/src/plugins/clearcase/annotationhighlighter.cpp @@ -3,8 +3,7 @@ #include "annotationhighlighter.h" -using namespace ClearCase; -using namespace ClearCase::Internal; +namespace ClearCase::Internal { ClearCaseAnnotationHighlighter::ClearCaseAnnotationHighlighter(const ChangeNumbers &changeNumbers, QTextDocument *document) : @@ -16,3 +15,5 @@ QString ClearCaseAnnotationHighlighter::changeNumber(const QString &block) const const int pos = block.indexOf(m_separator); return pos > 1 ? block.left(pos) : QString(); } + +} // ClearCase::Internal diff --git a/src/plugins/clearcase/annotationhighlighter.h b/src/plugins/clearcase/annotationhighlighter.h index 76a1e08623e..05f46f8c5ba 100644 --- a/src/plugins/clearcase/annotationhighlighter.h +++ b/src/plugins/clearcase/annotationhighlighter.h @@ -5,8 +5,7 @@ #include -namespace ClearCase { -namespace Internal { +namespace ClearCase::Internal { // Annotation highlighter for clearcase triggering on 'changenumber ' class ClearCaseAnnotationHighlighter : public VcsBase::BaseAnnotationHighlighter @@ -22,5 +21,4 @@ private: const QChar m_separator = QLatin1Char('|'); }; -} // namespace Internal -} // namespace ClearCase +} // ClearCase::Internal diff --git a/src/plugins/clearcase/checkoutdialog.cpp b/src/plugins/clearcase/checkoutdialog.cpp index db9af1af9b6..2798bee5bf0 100644 --- a/src/plugins/clearcase/checkoutdialog.cpp +++ b/src/plugins/clearcase/checkoutdialog.cpp @@ -4,11 +4,10 @@ #include "checkoutdialog.h" #include "activityselector.h" +#include "clearcasetr.h" #include -#include - #include #include #include @@ -17,6 +16,7 @@ #include #include #include +#include #include namespace ClearCase::Internal { @@ -26,7 +26,7 @@ CheckOutDialog::CheckOutDialog(const QString &fileName, bool isUcm, bool showCom QDialog(parent) { resize(352, 317); - setWindowTitle(tr("Check Out")); + setWindowTitle(Tr::tr("Check Out")); auto lblFileName = new QLabel(fileName); lblFileName->setTextInteractionFlags(Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse); @@ -34,17 +34,17 @@ CheckOutDialog::CheckOutDialog(const QString &fileName, bool isUcm, bool showCom m_txtComment = new QPlainTextEdit(this); m_txtComment->setTabChangesFocus(true); - m_lblComment = new QLabel(tr("&Checkout comment:")); + m_lblComment = new QLabel(Tr::tr("&Checkout comment:")); m_lblComment->setBuddy(m_txtComment); - m_chkReserved = new QCheckBox(tr("&Reserved")); + m_chkReserved = new QCheckBox(Tr::tr("&Reserved")); m_chkReserved->setChecked(true); - m_chkUnreserved = new QCheckBox(tr("&Unreserved if already reserved")); + m_chkUnreserved = new QCheckBox(Tr::tr("&Unreserved if already reserved")); - m_chkPTime = new QCheckBox(tr("&Preserve file modification time")); + m_chkPTime = new QCheckBox(Tr::tr("&Preserve file modification time")); - m_hijackedCheckBox = new QCheckBox(tr("Use &Hijacked file")); + m_hijackedCheckBox = new QCheckBox(Tr::tr("Use &Hijacked file")); m_hijackedCheckBox->setChecked(true); auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Cancel|QDialogButtonBox::Ok); diff --git a/src/plugins/clearcase/clearcaseeditor.cpp b/src/plugins/clearcase/clearcaseeditor.cpp index bfcd7558c1a..41c921105fa 100644 --- a/src/plugins/clearcase/clearcaseeditor.cpp +++ b/src/plugins/clearcase/clearcaseeditor.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 #include "clearcaseeditor.h" +#include "clearcasetr.h" #include "annotationhighlighter.h" @@ -9,8 +10,7 @@ #include -using namespace ClearCase; -using namespace ClearCase::Internal; +namespace ClearCase::Internal { ClearCaseEditorWidget::ClearCaseEditorWidget() : m_versionNumberPattern(QLatin1String("[\\\\/]main[\\\\/][^ \t\n\"]*")) @@ -21,7 +21,7 @@ ClearCaseEditorWidget::ClearCaseEditorWidget() : // "+++ D:\depot\...\mainwindow.cpp[TAB]Sun May 01 14:22:37 2011" (local) setDiffFilePattern("^[-+]{3} ([^\\t]+?)(?:@@|\\t)"); setLogEntryPattern("version \"([^\"]+)\""); - setAnnotateRevisionTextFormat(tr("Annotate version \"%1\"")); + setAnnotateRevisionTextFormat(Tr::tr("Annotate version \"%1\"")); setAnnotationEntryPattern("([^|]*)\\|[^\\n]*\\n"); setAnnotationSeparatorPattern("\\n-{30}"); } @@ -46,3 +46,5 @@ VcsBase::BaseAnnotationHighlighter *ClearCaseEditorWidget::createAnnotationHighl { return new ClearCaseAnnotationHighlighter(changes); } + +} // ClearCase::Internal diff --git a/src/plugins/clearcase/clearcaseeditor.h b/src/plugins/clearcase/clearcaseeditor.h index 0c0dbd635c7..584b0f6f459 100644 --- a/src/plugins/clearcase/clearcaseeditor.h +++ b/src/plugins/clearcase/clearcaseeditor.h @@ -7,8 +7,7 @@ #include -namespace ClearCase { -namespace Internal { +namespace ClearCase::Internal { class ClearCaseEditorWidget : public VcsBase::VcsBaseEditorWidget { @@ -25,5 +24,4 @@ private: const QRegularExpression m_versionNumberPattern; }; -} // namespace Internal -} // namespace ClearCase +} // ClearCase::Internal diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp index 96f7500db5a..3de8dcca259 100644 --- a/src/plugins/clearcase/clearcaseplugin.cpp +++ b/src/plugins/clearcase/clearcaseplugin.cpp @@ -11,6 +11,7 @@ #include "clearcasesubmiteditor.h" #include "clearcasesubmiteditorwidget.h" #include "clearcasesync.h" +#include "clearcasetr.h" #include "settingspage.h" #include "versionselector.h" @@ -421,7 +422,7 @@ void ClearCasePluginPrivate::updateEditDerivedObjectWarning(const QString &fileN return; infoBar->addInfo(InfoBarEntry(derivedObjectWarning, - tr("Editing Derived Object: %1").arg(fileName))); + Tr::tr("Editing Derived Object: %1").arg(fileName))); } else { infoBar->removeInfo(derivedObjectWarning); } @@ -620,82 +621,82 @@ ClearCasePluginPrivate::ClearCasePluginPrivate() const QString prefix = QLatin1String("cc"); // register cc prefix in Locator m_commandLocator = new CommandLocator("cc", description, prefix, this); - m_commandLocator->setDescription(tr("Triggers a ClearCase version control operation.")); + m_commandLocator->setDescription(Tr::tr("Triggers a ClearCase version control operation.")); //register actions ActionContainer *toolsContainer = ActionManager::actionContainer(M_TOOLS); ActionContainer *clearcaseMenu = ActionManager::createMenu(CMD_ID_CLEARCASE_MENU); - clearcaseMenu->menu()->setTitle(tr("C&learCase")); + clearcaseMenu->menu()->setTitle(Tr::tr("C&learCase")); toolsContainer->addMenu(clearcaseMenu); m_menuAction = clearcaseMenu->menu()->menuAction(); Command *command; - m_checkOutAction = new ParameterAction(tr("Check Out..."), tr("Check &Out \"%1\"..."), ParameterAction::AlwaysEnabled, this); + m_checkOutAction = new ParameterAction(Tr::tr("Check Out..."), Tr::tr("Check &Out \"%1\"..."), ParameterAction::AlwaysEnabled, this); command = ActionManager::registerAction(m_checkOutAction, CMD_ID_CHECKOUT, context); command->setAttribute(Command::CA_UpdateText); - command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Meta+L,Meta+O") : tr("Alt+L,Alt+O"))); + command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? Tr::tr("Meta+L,Meta+O") : Tr::tr("Alt+L,Alt+O"))); connect(m_checkOutAction, &QAction::triggered, this, &ClearCasePluginPrivate::checkOutCurrentFile); clearcaseMenu->addAction(command); m_commandLocator->appendCommand(command); - m_checkInCurrentAction = new ParameterAction(tr("Check &In..."), tr("Check &In \"%1\"..."), ParameterAction::AlwaysEnabled, this); + m_checkInCurrentAction = new ParameterAction(Tr::tr("Check &In..."), Tr::tr("Check &In \"%1\"..."), ParameterAction::AlwaysEnabled, this); command = ActionManager::registerAction(m_checkInCurrentAction, CMD_ID_CHECKIN, context); command->setAttribute(Command::CA_UpdateText); - command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Meta+L,Meta+I") : tr("Alt+L,Alt+I"))); + command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? Tr::tr("Meta+L,Meta+I") : Tr::tr("Alt+L,Alt+I"))); connect(m_checkInCurrentAction, &QAction::triggered, this, &ClearCasePluginPrivate::startCheckInCurrentFile); clearcaseMenu->addAction(command); m_commandLocator->appendCommand(command); - m_undoCheckOutAction = new ParameterAction(tr("Undo Check Out"), tr("&Undo Check Out \"%1\""), ParameterAction::AlwaysEnabled, this); + m_undoCheckOutAction = new ParameterAction(Tr::tr("Undo Check Out"), Tr::tr("&Undo Check Out \"%1\""), ParameterAction::AlwaysEnabled, this); command = ActionManager::registerAction(m_undoCheckOutAction, CMD_ID_UNDOCHECKOUT, context); command->setAttribute(Command::CA_UpdateText); - command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Meta+L,Meta+U") : tr("Alt+L,Alt+U"))); + command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? Tr::tr("Meta+L,Meta+U") : Tr::tr("Alt+L,Alt+U"))); connect(m_undoCheckOutAction, &QAction::triggered, this, &ClearCasePluginPrivate::undoCheckOutCurrent); clearcaseMenu->addAction(command); m_commandLocator->appendCommand(command); - m_undoHijackAction = new ParameterAction(tr("Undo Hijack"), tr("Undo Hi&jack \"%1\""), ParameterAction::AlwaysEnabled, this); + m_undoHijackAction = new ParameterAction(Tr::tr("Undo Hijack"), Tr::tr("Undo Hi&jack \"%1\""), ParameterAction::AlwaysEnabled, this); command = ActionManager::registerAction(m_undoHijackAction, CMD_ID_UNDOHIJACK, context); command->setAttribute(Command::CA_UpdateText); - command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Meta+L,Meta+R") : tr("Alt+L,Alt+R"))); + command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? Tr::tr("Meta+L,Meta+R") : Tr::tr("Alt+L,Alt+R"))); connect(m_undoHijackAction, &QAction::triggered, this, &ClearCasePluginPrivate::undoHijackCurrent); clearcaseMenu->addAction(command); m_commandLocator->appendCommand(command); clearcaseMenu->addSeparator(context); - m_diffCurrentAction = new ParameterAction(tr("Diff Current File"), tr("&Diff \"%1\""), ParameterAction::EnabledWithParameter, this); + m_diffCurrentAction = new ParameterAction(Tr::tr("Diff Current File"), Tr::tr("&Diff \"%1\""), ParameterAction::EnabledWithParameter, this); command = ActionManager::registerAction(m_diffCurrentAction, CMD_ID_DIFF_CURRENT, context); command->setAttribute(Command::CA_UpdateText); - command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Meta+L,Meta+D") : tr("Alt+L,Alt+D"))); + command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? Tr::tr("Meta+L,Meta+D") : Tr::tr("Alt+L,Alt+D"))); connect(m_diffCurrentAction, &QAction::triggered, this, &ClearCasePluginPrivate::diffCurrentFile); clearcaseMenu->addAction(command); m_commandLocator->appendCommand(command); - m_historyCurrentAction = new ParameterAction(tr("History Current File"), tr("&History \"%1\""), ParameterAction::EnabledWithParameter, this); + m_historyCurrentAction = new ParameterAction(Tr::tr("History Current File"), Tr::tr("&History \"%1\""), ParameterAction::EnabledWithParameter, this); command = ActionManager::registerAction(m_historyCurrentAction, CMD_ID_HISTORY_CURRENT, context); command->setAttribute(Command::CA_UpdateText); - command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Meta+L,Meta+H") : tr("Alt+L,Alt+H"))); + command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? Tr::tr("Meta+L,Meta+H") : Tr::tr("Alt+L,Alt+H"))); connect(m_historyCurrentAction, &QAction::triggered, this, &ClearCasePluginPrivate::historyCurrentFile); clearcaseMenu->addAction(command); m_commandLocator->appendCommand(command); - m_annotateCurrentAction = new ParameterAction(tr("Annotate Current File"), tr("&Annotate \"%1\""), ParameterAction::EnabledWithParameter, this); + m_annotateCurrentAction = new ParameterAction(Tr::tr("Annotate Current File"), Tr::tr("&Annotate \"%1\""), ParameterAction::EnabledWithParameter, this); command = ActionManager::registerAction(m_annotateCurrentAction, CMD_ID_ANNOTATE, context); command->setAttribute(Command::CA_UpdateText); - command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Meta+L,Meta+A") : tr("Alt+L,Alt+A"))); + command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? Tr::tr("Meta+L,Meta+A") : Tr::tr("Alt+L,Alt+A"))); connect(m_annotateCurrentAction, &QAction::triggered, this, &ClearCasePluginPrivate::annotateCurrentFile); clearcaseMenu->addAction(command); m_commandLocator->appendCommand(command); - m_addFileAction = new ParameterAction(tr("Add File..."), tr("Add File \"%1\""), ParameterAction::EnabledWithParameter, this); + m_addFileAction = new ParameterAction(Tr::tr("Add File..."), Tr::tr("Add File \"%1\""), ParameterAction::EnabledWithParameter, this); command = ActionManager::registerAction(m_addFileAction, CMD_ID_ADD_FILE, context); command->setAttribute(Command::CA_UpdateText); connect(m_addFileAction, &QAction::triggered, this, &ClearCasePluginPrivate::addCurrentFile); @@ -703,14 +704,14 @@ ClearCasePluginPrivate::ClearCasePluginPrivate() clearcaseMenu->addSeparator(context); - m_diffActivityAction = new QAction(tr("Diff A&ctivity..."), this); + m_diffActivityAction = new QAction(Tr::tr("Diff A&ctivity..."), this); m_diffActivityAction->setEnabled(false); command = ActionManager::registerAction(m_diffActivityAction, CMD_ID_DIFF_ACTIVITY, context); connect(m_diffActivityAction, &QAction::triggered, this, &ClearCasePluginPrivate::diffActivity); clearcaseMenu->addAction(command); m_commandLocator->appendCommand(command); - m_checkInActivityAction = new ParameterAction(tr("Ch&eck In Activity"), tr("Chec&k In Activity \"%1\"..."), ParameterAction::EnabledWithParameter, this); + m_checkInActivityAction = new ParameterAction(Tr::tr("Ch&eck In Activity"), Tr::tr("Chec&k In Activity \"%1\"..."), ParameterAction::EnabledWithParameter, this); m_checkInActivityAction->setEnabled(false); command = ActionManager::registerAction(m_checkInActivityAction, CMD_ID_CHECKIN_ACTIVITY, context); connect(m_checkInActivityAction, &QAction::triggered, this, &ClearCasePluginPrivate::startCheckInActivity); @@ -720,12 +721,12 @@ ClearCasePluginPrivate::ClearCasePluginPrivate() clearcaseMenu->addSeparator(context); - m_updateIndexAction = new QAction(tr("Update Index"), this); + m_updateIndexAction = new QAction(Tr::tr("Update Index"), this); command = ActionManager::registerAction(m_updateIndexAction, CMD_ID_UPDATEINDEX, context); connect(m_updateIndexAction, &QAction::triggered, this, &ClearCasePluginPrivate::updateIndex); clearcaseMenu->addAction(command); - m_updateViewAction = new ParameterAction(tr("Update View"), tr("U&pdate View \"%1\""), ParameterAction::EnabledWithParameter, this); + m_updateViewAction = new ParameterAction(Tr::tr("Update View"), Tr::tr("U&pdate View \"%1\""), ParameterAction::EnabledWithParameter, this); command = ActionManager::registerAction(m_updateViewAction, CMD_ID_UPDATE_VIEW, context); connect(m_updateViewAction, &QAction::triggered, this, &ClearCasePluginPrivate::updateView); command->setAttribute(Command::CA_UpdateText); @@ -733,16 +734,16 @@ ClearCasePluginPrivate::ClearCasePluginPrivate() clearcaseMenu->addSeparator(context); - m_checkInAllAction = new QAction(tr("Check In All &Files..."), this); + m_checkInAllAction = new QAction(Tr::tr("Check In All &Files..."), this); command = ActionManager::registerAction(m_checkInAllAction, CMD_ID_CHECKIN_ALL, context); - command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Meta+L,Meta+F") : tr("Alt+L,Alt+F"))); + command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? Tr::tr("Meta+L,Meta+F") : Tr::tr("Alt+L,Alt+F"))); connect(m_checkInAllAction, &QAction::triggered, this, &ClearCasePluginPrivate::startCheckInAll); clearcaseMenu->addAction(command); m_commandLocator->appendCommand(command); - m_statusAction = new QAction(tr("View &Status"), this); + m_statusAction = new QAction(Tr::tr("View &Status"), this); command = ActionManager::registerAction(m_statusAction, CMD_ID_STATUS, context); - command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Meta+L,Meta+S") : tr("Alt+L,Alt+S"))); + command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? Tr::tr("Meta+L,Meta+S") : Tr::tr("Alt+L,Alt+S"))); connect(m_statusAction, &QAction::triggered, this, &ClearCasePluginPrivate::viewStatus); clearcaseMenu->addAction(command); m_commandLocator->appendCommand(command); @@ -995,7 +996,7 @@ void ClearCasePluginPrivate::updateActions(VcsBasePluginPrivate::ActionState as) QString ClearCasePluginPrivate::commitDisplayName() const { - return tr("Check In"); + return Tr::tr("Check In"); } void ClearCasePluginPrivate::checkOutCurrentFile() @@ -1024,14 +1025,12 @@ void ClearCasePluginPrivate::setStatus(const QString &file, FileStatus::Status s class UndoCheckOutDialog : public QDialog { - Q_DECLARE_TR_FUNCTIONS(ClearCase::Internal::UndoCheckOut) - public: UndoCheckOutDialog() { resize(323, 105); setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); - setWindowTitle(tr("Dialog")); + setWindowTitle(Tr::tr("Dialog")); lblMessage = new QLabel(this); @@ -1044,10 +1043,10 @@ public: brush1.setStyle(Qt::SolidPattern); palette.setBrush(QPalette::Disabled, QPalette::WindowText, brush1); - auto lblModified = new QLabel(tr("The file was changed.")); + auto lblModified = new QLabel(Tr::tr("The file was changed.")); lblModified->setPalette(palette); - chkKeep = new QCheckBox(tr("&Save copy of the file with a '.keep' extension")); + chkKeep = new QCheckBox(Tr::tr("&Save copy of the file with a '.keep' extension")); chkKeep->setChecked(true); auto buttonBox = new QDialogButtonBox(QDialogButtonBox::No|QDialogButtonBox::Yes); @@ -1086,7 +1085,7 @@ void ClearCasePluginPrivate::undoCheckOutCurrent() bool keep = false; if (result.exitCode()) { // return value is 1 if there is any difference UndoCheckOutDialog dialog; - dialog.lblMessage->setText(tr("Do you want to undo the check out of \"%1\"?").arg(fileName)); + dialog.lblMessage->setText(Tr::tr("Do you want to undo the check out of \"%1\"?").arg(fileName)); dialog.chkKeep->setChecked(m_settings.keepFileUndoCheckout); if (dialog.exec() != QDialog::Accepted) return; @@ -1168,8 +1167,8 @@ void ClearCasePluginPrivate::undoHijackCurrent() } if (askKeep) { UndoCheckOutDialog unhijackDlg; - unhijackDlg.setWindowTitle(tr("Undo Hijack File")); - unhijackDlg.lblMessage->setText(tr("Do you want to undo hijack of \"%1\"?") + unhijackDlg.setWindowTitle(Tr::tr("Undo Hijack File")); + unhijackDlg.lblMessage->setText(Tr::tr("Do you want to undo hijack of \"%1\"?") .arg(QDir::toNativeSeparators(fileName))); if (unhijackDlg.exec() != QDialog::Accepted) return; @@ -1208,7 +1207,7 @@ void ClearCasePluginPrivate::ccDiffWithPred(const FilePath &workingDir, const QS return; // done here, diff is opened in a new window } if (!m_settings.extDiffAvailable) { - VcsOutputWindow::appendError(tr("External diff is required to compare multiple files.")); + VcsOutputWindow::appendError(Tr::tr("External diff is required to compare multiple files.")); return; } QString result; @@ -1280,12 +1279,12 @@ void ClearCasePluginPrivate::diffActivity() if (Constants::debug) qDebug() << Q_FUNC_INFO; if (!m_settings.extDiffAvailable) { - VcsOutputWindow::appendError(tr("External diff is required to compare multiple files.")); + VcsOutputWindow::appendError(Tr::tr("External diff is required to compare multiple files.")); return; } FilePath topLevel = state.topLevel(); - QString activity = QInputDialog::getText(ICore::dialogParent(), tr("Enter Activity"), - tr("Activity Name"), QLineEdit::Normal, m_activity); + QString activity = QInputDialog::getText(ICore::dialogParent(), Tr::tr("Enter Activity"), + Tr::tr("Activity Name"), QLineEdit::Normal, m_activity); if (activity.isEmpty()) return; const QStringList versions = ccGetActivityVersions(topLevel, activity); @@ -1383,7 +1382,7 @@ void ClearCasePluginPrivate::startCheckInActivity() connect(buttonBox, &QDialogButtonBox::rejected, &dlg, &QDialog::reject); layout->addWidget(actSelector); layout->addWidget(buttonBox); - dlg.setWindowTitle(tr("Check In Activity")); + dlg.setWindowTitle(Tr::tr("Check In Activity")); if (!dlg.exec()) return; @@ -1417,13 +1416,13 @@ void ClearCasePluginPrivate::startCheckIn(const FilePath &workingDir, const QStr return; if (isCheckInEditorOpen()) { - VcsOutputWindow::appendWarning(tr("Another check in is currently being executed.")); + VcsOutputWindow::appendWarning(Tr::tr("Another check in is currently being executed.")); return; } // Get list of added/modified/deleted files if (files.empty()) { - VcsOutputWindow::appendWarning(tr("There are no modified files.")); + VcsOutputWindow::appendWarning(Tr::tr("There are no modified files.")); return; } // Create a new submit change file containing the submit template @@ -1659,7 +1658,7 @@ CommandResult ClearCasePluginPrivate::runCleartool(const FilePath &workingDir, QTextCodec *outputCodec) const { if (m_settings.ccBinaryPath.isEmpty()) - return CommandResult(ProcessResult::StartFailed, tr("No ClearCase executable specified.")); + return CommandResult(ProcessResult::StartFailed, Tr::tr("No ClearCase executable specified.")); std::unique_ptr command; command.reset(VcsBaseClient::createVcsCommand(workingDir, Environment::systemEnvironment())); @@ -1727,8 +1726,8 @@ bool ClearCasePluginPrivate::vcsOpen(const FilePath &workingDir, const QString & (fi.isWritable() || vcsStatus(absPath).status == FileStatus::Unknown)) runAsync(sync, QStringList(absPath)).waitForFinished(); if (vcsStatus(absPath).status == FileStatus::CheckedOut) { - QMessageBox::information(ICore::dialogParent(), tr("ClearCase Checkout"), - tr("File is already checked out.")); + QMessageBox::information(ICore::dialogParent(), Tr::tr("ClearCase Checkout"), + Tr::tr("File is already checked out.")); return true; } @@ -1823,7 +1822,7 @@ bool ClearCasePluginPrivate::vcsSetActivity(const FilePath &workingDir, const QS const CommandResult result = runCleartool(workingDir, args, m_settings.timeOutS, VcsCommand::ShowStdOut); if (result.result() != ProcessResult::FinishedWithSuccess) { - QMessageBox::warning(ICore::dialogParent(), title, tr("Set current activity failed: %1") + QMessageBox::warning(ICore::dialogParent(), title, Tr::tr("Set current activity failed: %1") .arg(result.exitMessage()), QMessageBox::Ok); return false; } @@ -1903,7 +1902,7 @@ bool ClearCasePluginPrivate::ccFileOp(const FilePath &workingDir, const QString verticalLayout->addWidget(actSelector); } - auto commentLabel = new QLabel(tr("Enter &comment:")); + auto commentLabel = new QLabel(Tr::tr("Enter &comment:")); verticalLayout->addWidget(commentLabel); auto commentEdit = new QTextEdit; @@ -1976,24 +1975,24 @@ static QString baseName(const QString &fileName) bool ClearCasePluginPrivate::vcsAdd(const FilePath &workingDir, const QString &fileName) { - return ccFileOp(workingDir, tr("ClearCase Add File %1").arg(baseName(fileName)), + return ccFileOp(workingDir, Tr::tr("ClearCase Add File %1").arg(baseName(fileName)), QStringList({"mkelem", "-ci"}), fileName); } bool ClearCasePluginPrivate::vcsDelete(const FilePath &workingDir, const QString &fileName) { - const QString title(tr("ClearCase Remove Element %1").arg(baseName(fileName))); - if (QMessageBox::warning(ICore::dialogParent(), title, tr("This operation is irreversible. Are you sure?"), + const QString title(Tr::tr("ClearCase Remove Element %1").arg(baseName(fileName))); + if (QMessageBox::warning(ICore::dialogParent(), title, Tr::tr("This operation is irreversible. Are you sure?"), QMessageBox::Yes | QMessageBox::No) == QMessageBox::No) return true; - return ccFileOp(workingDir, tr("ClearCase Remove File %1").arg(baseName(fileName)), + return ccFileOp(workingDir, Tr::tr("ClearCase Remove File %1").arg(baseName(fileName)), QStringList({"rmname", "-force"}), fileName); } bool ClearCasePluginPrivate::vcsMove(const FilePath &workingDir, const QString &from, const QString &to) { - return ccFileOp(workingDir, tr("ClearCase Rename File %1 -> %2") + return ccFileOp(workingDir, Tr::tr("ClearCase Rename File %1 -> %2") .arg(baseName(from)).arg(baseName(to)), QStringList("move"), from, to); } @@ -2094,8 +2093,8 @@ bool ClearCasePluginPrivate::newActivity() QStringList args; args << QLatin1String("mkactivity") << QLatin1String("-f"); if (!m_settings.autoAssignActivityName) { - QString headline = QInputDialog::getText(ICore::dialogParent(), tr("Activity Headline"), - tr("Enter activity headline")); + QString headline = QInputDialog::getText(ICore::dialogParent(), Tr::tr("Activity Headline"), + Tr::tr("Enter activity headline")); if (headline.isEmpty()) return false; args << QLatin1String("-headline") << headline; @@ -2213,7 +2212,7 @@ void ClearCasePluginPrivate::updateIndex() m_statusMap->clear(); QFuture result = runAsync(sync, transform(project->files(Project::SourceFiles), &FilePath::toString)); if (!m_settings.disableIndexer) - ProgressManager::addTask(result, tr("Updating ClearCase Index"), ClearCase::Constants::TASK_INDEX); + ProgressManager::addTask(result, Tr::tr("Updating ClearCase Index"), ClearCase::Constants::TASK_INDEX); } /*! retrieve a \a file (usually of the form path\to\filename.cpp@@\main\ver) @@ -2461,14 +2460,14 @@ void ClearCasePluginPrivate::vcsAnnotate(const FilePath &filePath, int line) QString ClearCasePluginPrivate::vcsOpenText() const { - return tr("Check &Out"); + return Tr::tr("Check &Out"); } QString ClearCasePluginPrivate::vcsMakeWritableText() const { if (isDynamic()) return {}; - return tr("&Hijack"); + return Tr::tr("&Hijack"); } QString ClearCasePluginPrivate::vcsTopic(const FilePath &directory) diff --git a/src/plugins/clearcase/clearcaseplugin.h b/src/plugins/clearcase/clearcaseplugin.h index 8fa6dbc2f02..dec889af9bf 100644 --- a/src/plugins/clearcase/clearcaseplugin.h +++ b/src/plugins/clearcase/clearcaseplugin.h @@ -10,8 +10,7 @@ #include #include -namespace ClearCase { -namespace Internal { +namespace ClearCase::Internal { class ClearCaseSettings; @@ -91,5 +90,4 @@ private slots: #endif }; -} // namespace Internal -} // namespace ClearCase +} // ClearCase::Internal diff --git a/src/plugins/clearcase/clearcasesettings.cpp b/src/plugins/clearcase/clearcasesettings.cpp index 47e1779bfd1..78f12b2c40a 100644 --- a/src/plugins/clearcase/clearcasesettings.cpp +++ b/src/plugins/clearcase/clearcasesettings.cpp @@ -7,23 +7,25 @@ #include -static const char groupC[] = "ClearCase"; -static const char commandKeyC[] = "Command"; +namespace ClearCase::Internal { -static const char historyCountKeyC[] = "HistoryCount"; -static const char timeOutKeyC[] = "TimeOut"; -static const char autoCheckOutKeyC[] = "AutoCheckOut"; -static const char noCommentKeyC[] = "NoComment"; -static const char keepFileUndoCheckoutKeyC[] = "KeepFileUnDoCheckout"; -static const char diffTypeKeyC[] = "DiffType"; -static const char diffArgsKeyC[] = "DiffArgs"; -static const char autoAssignActivityKeyC[] = "AutoAssignActivityName"; -static const char promptToCheckInKeyC[] = "PromptToCheckIn"; -static const char disableIndexerKeyC[] = "DisableIndexer"; -static const char totalFilesKeyC[] = "TotalFiles"; -static const char indexOnlyVOBsC[] = "IndexOnlyVOBs"; +const char groupC[] = "ClearCase"; +const char commandKeyC[] = "Command"; -static const char defaultDiffArgs[] = "-ubp"; +const char historyCountKeyC[] = "HistoryCount"; +const char timeOutKeyC[] = "TimeOut"; +const char autoCheckOutKeyC[] = "AutoCheckOut"; +const char noCommentKeyC[] = "NoComment"; +const char keepFileUndoCheckoutKeyC[] = "KeepFileUnDoCheckout"; +const char diffTypeKeyC[] = "DiffType"; +const char diffArgsKeyC[] = "DiffArgs"; +const char autoAssignActivityKeyC[] = "AutoAssignActivityName"; +const char promptToCheckInKeyC[] = "PromptToCheckIn"; +const char disableIndexerKeyC[] = "DisableIndexer"; +const char totalFilesKeyC[] = "TotalFiles"; +const char indexOnlyVOBsC[] = "IndexOnlyVOBs"; + +const char defaultDiffArgs[] = "-ubp"; enum { defaultTimeOutS = 30, defaultHistoryCount = 50 }; @@ -32,8 +34,6 @@ static QString defaultCommand() return QLatin1String("cleartool" QTC_HOST_EXE_SUFFIX); } -using namespace ClearCase::Internal; - ClearCaseSettings::ClearCaseSettings() : ccCommand(defaultCommand()), diffArgs(QLatin1String(defaultDiffArgs)), @@ -118,3 +118,5 @@ bool ClearCaseSettings::equals(const ClearCaseSettings &s) const && indexOnlyVOBs == s.indexOnlyVOBs && totalFiles == s.totalFiles; } + +} // ClearCase::Internal diff --git a/src/plugins/clearcase/clearcasesettings.h b/src/plugins/clearcase/clearcasesettings.h index 912c758f5d7..b8a050b25ca 100644 --- a/src/plugins/clearcase/clearcasesettings.h +++ b/src/plugins/clearcase/clearcasesettings.h @@ -12,8 +12,7 @@ QT_BEGIN_NAMESPACE class QSettings; QT_END_NAMESPACE -namespace ClearCase { -namespace Internal { +namespace ClearCase::Internal { enum DiffType { @@ -55,5 +54,4 @@ public: int timeOutS; }; -} // namespace Internal -} // namespace ClearCase +} // ClearCase::Internal diff --git a/src/plugins/clearcase/clearcasesubmiteditor.cpp b/src/plugins/clearcase/clearcasesubmiteditor.cpp index 8e74a67f5f5..676e16a686a 100644 --- a/src/plugins/clearcase/clearcasesubmiteditor.cpp +++ b/src/plugins/clearcase/clearcasesubmiteditor.cpp @@ -4,17 +4,18 @@ #include "clearcasesubmiteditor.h" #include "clearcasesubmiteditorwidget.h" +#include "clearcasetr.h" #include #include -using namespace ClearCase::Internal; +namespace ClearCase::Internal { ClearCaseSubmitEditor::ClearCaseSubmitEditor() : VcsBase::VcsBaseSubmitEditor(new ClearCaseSubmitEditorWidget) { - document()->setPreferredDisplayName(tr("ClearCase Check In")); + document()->setPreferredDisplayName(Tr::tr("ClearCase Check In")); } ClearCaseSubmitEditorWidget *ClearCaseSubmitEditor::submitEditorWidget() @@ -45,3 +46,5 @@ QByteArray ClearCaseSubmitEditor::fileContents() const { return VcsBase::VcsBaseSubmitEditor::fileContents().trimmed(); } + +} // ClearCase::Internal diff --git a/src/plugins/clearcase/clearcasesubmiteditor.h b/src/plugins/clearcase/clearcasesubmiteditor.h index 7f7de4eb151..af2fdc56d7c 100644 --- a/src/plugins/clearcase/clearcasesubmiteditor.h +++ b/src/plugins/clearcase/clearcasesubmiteditor.h @@ -5,8 +5,7 @@ #include -namespace ClearCase { -namespace Internal { +namespace ClearCase::Internal { class ClearCaseSubmitEditorWidget; @@ -28,5 +27,4 @@ protected: QByteArray fileContents() const override; }; -} // namespace Internal -} // namespace ClearCase +} // ClearCase::Internal diff --git a/src/plugins/clearcase/clearcasesubmiteditorwidget.cpp b/src/plugins/clearcase/clearcasesubmiteditorwidget.cpp index b089c7b83b2..e1273815876 100644 --- a/src/plugins/clearcase/clearcasesubmiteditorwidget.cpp +++ b/src/plugins/clearcase/clearcasesubmiteditorwidget.cpp @@ -4,13 +4,14 @@ #include "clearcasesubmiteditorwidget.h" #include "activityselector.h" +#include "clearcasetr.h" #include #include #include -using namespace ClearCase::Internal; +namespace ClearCase::Internal { ClearCaseSubmitEditorWidget::ClearCaseSubmitEditorWidget() { @@ -19,10 +20,10 @@ ClearCaseSubmitEditorWidget::ClearCaseSubmitEditorWidget() m_verticalLayout = new QVBoxLayout(checkInWidget); - m_chkIdentical = new QCheckBox(tr("Chec&k in even if identical to previous version")); + m_chkIdentical = new QCheckBox(Tr::tr("Chec&k in even if identical to previous version")); m_verticalLayout->addWidget(m_chkIdentical); - m_chkPTime = new QCheckBox(tr("&Preserve file modification time")); + m_chkPTime = new QCheckBox(Tr::tr("&Preserve file modification time")); m_verticalLayout->addWidget(m_chkPTime); insertTopWidget(checkInWidget); @@ -73,5 +74,7 @@ void ClearCaseSubmitEditorWidget::addActivitySelector(bool isUcm) QString ClearCaseSubmitEditorWidget::commitName() const { - return tr("&Check In"); + return Tr::tr("&Check In"); } + +} // ClearCase::Internal diff --git a/src/plugins/clearcase/clearcasesubmiteditorwidget.h b/src/plugins/clearcase/clearcasesubmiteditorwidget.h index f22a10b6c9c..a608f6b82ef 100644 --- a/src/plugins/clearcase/clearcasesubmiteditorwidget.h +++ b/src/plugins/clearcase/clearcasesubmiteditorwidget.h @@ -10,8 +10,7 @@ class QCheckBox; class QVBoxLayout; QT_END_NAMESPACE -namespace ClearCase { -namespace Internal { +namespace ClearCase::Internal { class ActivitySelector; @@ -40,5 +39,4 @@ private: QVBoxLayout *m_verticalLayout; }; -} // namespace Internal -} // namespace ClearCase +} // ClearCase::Internal diff --git a/src/plugins/clearcase/clearcasesync.cpp b/src/plugins/clearcase/clearcasesync.cpp index f9221fe1555..d1e0dccc7de 100644 --- a/src/plugins/clearcase/clearcasesync.cpp +++ b/src/plugins/clearcase/clearcasesync.cpp @@ -20,8 +20,7 @@ using namespace Utils; -namespace ClearCase { -namespace Internal { +namespace ClearCase::Internal { static void runProcess(QFutureInterface &future, const ClearCaseSettings &settings, @@ -333,6 +332,4 @@ void ClearCaseSync::verifyFileNotManagedDynamicView() #endif - -} // namespace Internal -} // namespace ClearCase +} // ClearCase::Internal diff --git a/src/plugins/clearcase/clearcasesync.h b/src/plugins/clearcase/clearcasesync.h index d87007029be..60ca445d5df 100644 --- a/src/plugins/clearcase/clearcasesync.h +++ b/src/plugins/clearcase/clearcasesync.h @@ -11,8 +11,7 @@ template class QFutureInterface; QT_END_NAMESPACE -namespace ClearCase { -namespace Internal { +namespace ClearCase::Internal { class ClearCaseSync : public QObject { @@ -53,5 +52,4 @@ public slots: #endif }; -} // namespace Internal -} // namespace ClearCase +} // ClearCase::Internal diff --git a/src/plugins/clearcase/settingspage.cpp b/src/plugins/clearcase/settingspage.cpp index 68b0501f0b0..6b13f4bd092 100644 --- a/src/plugins/clearcase/settingspage.cpp +++ b/src/plugins/clearcase/settingspage.cpp @@ -6,6 +6,7 @@ #include "clearcaseconstants.h" #include "clearcaseplugin.h" #include "clearcasesettings.h" +#include "clearcasetr.h" #include @@ -27,8 +28,6 @@ namespace ClearCase::Internal { class SettingsPageWidget final : public Core::IOptionsPageWidget { - Q_DECLARE_TR_FUNCTIONS(ClearCase::Internal::SettingsPageWidget) - public: SettingsPageWidget(); @@ -54,17 +53,17 @@ SettingsPageWidget::SettingsPageWidget() resize(512, 589); commandPathChooser = new PathChooser; - commandPathChooser->setPromptDialogTitle(tr("ClearCase Command")); + commandPathChooser->setPromptDialogTitle(Tr::Tr::tr("ClearCase Command")); commandPathChooser->setExpectedKind(PathChooser::ExistingCommand); commandPathChooser->setHistoryCompleter("ClearCase.Command.History"); - graphicalDiffRadioButton = new QRadioButton(tr("&Graphical (single file only)")); + graphicalDiffRadioButton = new QRadioButton(Tr::tr("&Graphical (single file only)")); graphicalDiffRadioButton->setChecked(true); auto diffWidget = new QWidget; diffWidget->setEnabled(false); - externalDiffRadioButton = new QRadioButton(tr("&External")); + externalDiffRadioButton = new QRadioButton(Tr::tr("&External")); QObject::connect(externalDiffRadioButton, &QRadioButton::toggled, diffWidget, &QWidget::setEnabled); diffArgsEdit = new QLineEdit(diffWidget); @@ -86,44 +85,44 @@ SettingsPageWidget::SettingsPageWidget() historyCountSpinBox->setMaximum(10000); timeOutSpinBox = new QSpinBox; - timeOutSpinBox->setSuffix(tr("s", nullptr)); + timeOutSpinBox->setSuffix(Tr::tr("s", nullptr)); timeOutSpinBox->setRange(1, 360); timeOutSpinBox->setValue(30); - autoCheckOutCheckBox = new QCheckBox(tr("&Automatically check out files on edit")); + autoCheckOutCheckBox = new QCheckBox(Tr::tr("&Automatically check out files on edit")); - promptCheckBox = new QCheckBox(tr("&Prompt on check-in")); + promptCheckBox = new QCheckBox(Tr::tr("&Prompt on check-in")); - disableIndexerCheckBox = new QCheckBox(tr("Di&sable indexer")); + disableIndexerCheckBox = new QCheckBox(Tr::tr("Di&sable indexer")); indexOnlyVOBsEdit = new QLineEdit; - indexOnlyVOBsEdit->setToolTip(tr("VOBs list, separated by comma. Indexer will only traverse " + indexOnlyVOBsEdit->setToolTip(Tr::tr("VOBs list, separated by comma. Indexer will only traverse " "the specified VOBs. If left blank, all active VOBs will be indexed.")); - autoAssignActivityCheckBox = new QCheckBox(tr("Aut&o assign activity names")); - autoAssignActivityCheckBox->setToolTip(tr("Check this if you have a trigger that renames " + autoAssignActivityCheckBox = new QCheckBox(Tr::tr("Aut&o assign activity names")); + autoAssignActivityCheckBox->setToolTip(Tr::tr("Check this if you have a trigger that renames " "the activity automatically. You will not be prompted for activity name.")); - noCommentCheckBox = new QCheckBox(tr("Do ¬ prompt for comment during checkout or check-in")); - noCommentCheckBox->setToolTip(tr("Check out or check in files with no comment (-nc/omment).")); + noCommentCheckBox = new QCheckBox(Tr::tr("Do ¬ prompt for comment during checkout or check-in")); + noCommentCheckBox->setToolTip(Tr::tr("Check out or check in files with no comment (-nc/omment).")); using namespace Layouting; Row { - tr("Arg&uments:"), + Tr::tr("Arg&uments:"), diffArgsEdit }.attachTo(diffWidget, WithoutMargins); Column { Group { - title(tr("Configuration")), + title(Tr::tr("Configuration")), Form { - tr("&Command:"), commandPathChooser + Tr::tr("&Command:"), commandPathChooser } }, Group { - title(tr("Diff")), + title(Tr::tr("Diff")), Form { graphicalDiffRadioButton, br, externalDiffRadioButton, diffWidget, br, @@ -132,16 +131,16 @@ SettingsPageWidget::SettingsPageWidget() }, Group { - title(tr("Miscellaneous")), + title(Tr::tr("Miscellaneous")), Form { - tr("&History count:"), historyCountSpinBox, br, - tr("&Timeout:"), timeOutSpinBox, br, + Tr::tr("&History count:"), historyCountSpinBox, br, + Tr::tr("&Timeout:"), timeOutSpinBox, br, autoCheckOutCheckBox, br, autoAssignActivityCheckBox, br, noCommentCheckBox, br, promptCheckBox, br, disableIndexerCheckBox, br, - tr("&Index only VOBs:"), indexOnlyVOBsEdit, + Tr::tr("&Index only VOBs:"), indexOnlyVOBsEdit, } }, st @@ -158,12 +157,12 @@ SettingsPageWidget::SettingsPageWidget() if (extDiffAvailable) { diffWarningLabel->setVisible(false); } else { - QString diffWarning = tr("In order to use External diff, \"diff\" command needs to be accessible."); + QString diffWarning = Tr::tr("In order to use External diff, \"diff\" command needs to be accessible."); if (HostOsInfo::isWindowsHost()) { diffWarning += QLatin1Char(' '); - diffWarning.append(tr("DiffUtils is available for free download at " - "http://gnuwin32.sourceforge.net/packages/diffutils.htm. " - "Extract it to a directory in your PATH.")); + diffWarning.append(Tr::tr("DiffUtils is available for free download at " + "http://gnuwin32.sourceforge.net/packages/diffutils.htm. " + "Extract it to a directory in your PATH.")); } diffWarningLabel->setText(diffWarning); externalDiffRadioButton->setEnabled(false); @@ -206,7 +205,7 @@ void SettingsPageWidget::apply() ClearCaseSettingsPage::ClearCaseSettingsPage() { setId(ClearCase::Constants::VCS_ID_CLEARCASE); - setDisplayName(SettingsPageWidget::tr("ClearCase")); + setDisplayName(Tr::tr("ClearCase")); setCategory(VcsBase::Constants::VCS_SETTINGS_CATEGORY); setWidgetCreator([] { return new SettingsPageWidget; }); } diff --git a/src/plugins/clearcase/versionselector.cpp b/src/plugins/clearcase/versionselector.cpp index 2b5fe1e337b..1116ced6a05 100644 --- a/src/plugins/clearcase/versionselector.cpp +++ b/src/plugins/clearcase/versionselector.cpp @@ -3,11 +3,11 @@ #include "versionselector.h" +#include "clearcasetr.h" + #include -#include #include -#include #include #include #include @@ -22,14 +22,14 @@ VersionSelector::VersionSelector(const QString &fileName, const QString &message QDialog(parent) { resize(413, 435); - setWindowTitle(tr("Confirm Version to Check Out")); + setWindowTitle(Tr::tr("Confirm Version to Check Out")); - auto headerLabel = new QLabel(tr("Multiple versions of \"%1\" can be checked out. " + auto headerLabel = new QLabel(Tr::tr("Multiple versions of \"%1\" can be checked out. " "Select the version to check out:").arg(fileName)); headerLabel->setWordWrap(true); headerLabel->setTextInteractionFlags(Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse); - auto loadedRadioButton = new QRadioButton(tr("&Loaded version")); + auto loadedRadioButton = new QRadioButton(Tr::tr("&Loaded version")); loadedRadioButton->setChecked(true); auto loadedLabel = new QLabel; @@ -42,13 +42,13 @@ VersionSelector::VersionSelector(const QString &fileName, const QString &message auto updatedText = new QPlainTextEdit; updatedText->setReadOnly(true); - m_updatedRadioButton = new QRadioButton(tr("Version after &update")); + m_updatedRadioButton = new QRadioButton(Tr::tr("Version after &update")); auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Cancel|QDialogButtonBox::Ok); auto loadedText = new QTextEdit; loadedText->setHtml("

" - + tr("Note: You will not be able to check in this file without merging " + + Tr::tr("Note: You will not be able to check in this file without merging " "the changes (not supported by the plugin)") + "

"); m_stream = new QTextStream(message.toLocal8Bit(), QIODevice::ReadOnly | QIODevice::Text); @@ -76,14 +76,14 @@ VersionSelector::VersionSelector(const QString &fileName, const QString &message headerLabel, Form { loadedRadioButton, loadedLabel, br, - tr("Created by:"), loadedCreatedByLabel, br, - tr("Created on:"), loadedCreatedOnLabel, br, + Tr::tr("Created by:"), loadedCreatedByLabel, br, + Tr::tr("Created on:"), loadedCreatedOnLabel, br, Span(2, loadedText), }, Form { m_updatedRadioButton, updatedLabel, br, - tr("Created by:"), updatedCreatedByLabel, br, - tr("Created on:"), updatedCreatedOnLabel, br, + Tr::tr("Created by:"), updatedCreatedByLabel, br, + Tr::tr("Created on:"), updatedCreatedOnLabel, br, Span(2, updatedText) }, buttonBox,