From 1098d3bd586e6eab689e3df73410bc72623db8ca Mon Sep 17 00:00:00 2001 From: Alf Henrik Sauge Date: Tue, 4 Aug 2026 00:55:10 +0200 Subject: [PATCH 1/2] Remove unnecessary use of "Advanced" in GUI It's poor usability to hide single options behind an expand. It just adds extra click distance for no good reason. Hiding advanced options only makes sense if there's more of them and it would clutter the GUI to show them. --- src/dialogs/AccountDialog.cpp | 32 ++++++++------------------------ src/dialogs/CloneDialog.cpp | 18 +----------------- src/dialogs/NewBranchDialog.cpp | 17 +---------------- src/dialogs/RemoteDialog.cpp | 28 +++------------------------- src/ui/ReferenceList.cpp | 15 ++++++++++----- 5 files changed, 23 insertions(+), 87 deletions(-) diff --git a/src/dialogs/AccountDialog.cpp b/src/dialogs/AccountDialog.cpp index 1af0f89f1..db7a65469 100644 --- a/src/dialogs/AccountDialog.cpp +++ b/src/dialogs/AccountDialog.cpp @@ -55,19 +55,7 @@ AccountDialog::AccountDialog(Account *account, QWidget *parent) mLabel->setVisible(!mLabel->text().isEmpty()); }); - ExpandButton *expand = new ExpandButton(this); - QWidget *advanced = new QWidget(this); - advanced->setVisible(false); - - QFormLayout *form = new QFormLayout; - form->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow); - form->addRow(tr("Host:"), mHost); - form->addRow(tr("Username:"), mUsername); - form->addRow(tr("Password:"), mPassword); - form->addRow(mLabel); - form->addRow(tr("Advanced:"), expand); - - mUrl = new QLineEdit(advanced); + mUrl = new QLineEdit(this); mUrl->setText(account ? account->url() : Account::defaultUrl(kind)); connect(mHost, signal, [this] { Account::Kind kind = @@ -77,16 +65,13 @@ AccountDialog::AccountDialog(Account *account, QWidget *parent) resize(sizeHint()); }); - QFormLayout *advancedForm = new QFormLayout(advanced); - advancedForm->setContentsMargins(-1, 0, 0, 0); - advancedForm->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow); - advancedForm->addRow(tr("URL:"), mUrl); - - connect(expand, &ExpandButton::toggled, [this, advanced](bool checked) { - advanced->setVisible(checked); - QApplication::processEvents(QEventLoop::ExcludeUserInputEvents); - resize(sizeHint()); - }); + QFormLayout *form = new QFormLayout; + form->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow); + form->addRow(tr("Host:"), mHost); + form->addRow(tr("Username:"), mUsername); + form->addRow(tr("Password:"), mPassword); + form->addRow(mLabel); + form->addRow(tr("URL:"), mUrl); QDialogButtonBox::StandardButtons buttons = QDialogButtonBox::Ok | QDialogButtonBox::Cancel; @@ -97,7 +82,6 @@ AccountDialog::AccountDialog(Account *account, QWidget *parent) QVBoxLayout *layout = new QVBoxLayout(this); layout->addLayout(form); - layout->addWidget(advanced); layout->addWidget(mButtons); updateButtons(); diff --git a/src/dialogs/CloneDialog.cpp b/src/dialogs/CloneDialog.cpp index de33a6900..0762a8bf8 100644 --- a/src/dialogs/CloneDialog.cpp +++ b/src/dialogs/CloneDialog.cpp @@ -163,34 +163,18 @@ class LocationPage : public QWizardPage { pathLayout->addWidget(mPath); pathLayout->addWidget(browse); - ExpandButton *expand = new ExpandButton(this); - QWidget *advanced = new QWidget(this); - advanced->setVisible(false); - QFormLayout *form = new QFormLayout; form->setFormAlignment(Qt::AlignLeft); form->addRow(tr("Name:"), mName); form->addRow(tr("Directory:"), path); - form->addRow(tr("Advanced:"), expand); QCheckBox *bare = new QCheckBox(tr("Create a bare repository")); - - QFormLayout *advancedForm = new QFormLayout(advanced); - advancedForm->setContentsMargins(-1, 0, 0, 0); - advancedForm->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow); - advancedForm->addRow(bare); - - connect(expand, &ExpandButton::toggled, [this, advanced](bool checked) { - advanced->setVisible(checked); - QApplication::processEvents(QEventLoop::ExcludeUserInputEvents); - resize(sizeHint()); - }); + form->addRow(bare); mLabel = new QLabel(this); QVBoxLayout *layout = new QVBoxLayout(this); layout->addLayout(form); - layout->addWidget(advanced); layout->addWidget(mLabel); // Register fields. diff --git a/src/dialogs/NewBranchDialog.cpp b/src/dialogs/NewBranchDialog.cpp index db903d017..809b2eadf 100644 --- a/src/dialogs/NewBranchDialog.cpp +++ b/src/dialogs/NewBranchDialog.cpp @@ -42,7 +42,6 @@ NewBranchDialog::NewBranchDialog(const git::Repository &repo, mCheckout->setVisible(qobject_cast(parent)); mCheckout->setChecked(true); - ExpandButton *expand = new ExpandButton(this); QFormLayout *form = new QFormLayout; form->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow); form->addRow(tr("Name:"), mName); @@ -50,21 +49,8 @@ NewBranchDialog::NewBranchDialog(const git::Repository &repo, form->addRow(tr("Start Point:"), mRefs); } form->addRow(QString(), mCheckout); - form->addRow(tr("Advanced:"), expand); - QWidget *advanced = new QWidget(this); - advanced->setVisible(false); - - QFormLayout *advancedForm = new QFormLayout(advanced); - advancedForm->setContentsMargins(-1, 0, 0, 0); - advancedForm->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow); - advancedForm->addRow(tr("Upstream:"), mUpstream); - - connect(expand, &ExpandButton::toggled, [this, advanced](bool checked) { - advanced->setVisible(checked); - QApplication::processEvents(QEventLoop::ExcludeUserInputEvents); - resize(sizeHint()); - }); + form->addRow(tr("Upstream:"), mUpstream); QDialogButtonBox *buttons = new QDialogButtonBox(this); buttons->addButton(QDialogButtonBox::Cancel); @@ -76,7 +62,6 @@ NewBranchDialog::NewBranchDialog(const git::Repository &repo, QVBoxLayout *layout = new QVBoxLayout(this); layout->addLayout(form); - layout->addWidget(advanced); layout->addWidget(buttons); // Update button when name text changes. diff --git a/src/dialogs/RemoteDialog.cpp b/src/dialogs/RemoteDialog.cpp index 579f768f0..cb9ab0122 100644 --- a/src/dialogs/RemoteDialog.cpp +++ b/src/dialogs/RemoteDialog.cpp @@ -55,8 +55,6 @@ RemoteDialog::RemoteDialog(Kind kind, RepoView *parent) : QDialog(parent) { mAction->addItem(tr("Merge (Fast-forward Only)"), ffonly); } - QWidget *advanced = nullptr; - ExpandButton *expand = nullptr; QCheckBox *prune = nullptr; if (kind == Push) { @@ -64,25 +62,7 @@ RemoteDialog::RemoteDialog(Kind kind, RepoView *parent) : QDialog(parent) { mRefs = new ReferenceList(repo, kinds, this); mSetUpstream = new QCheckBox(tr("Set upstream"), this); mForce = new QCheckBox(tr("Force"), this); - - // advanced options - expand = new ExpandButton(this); - - advanced = new QWidget(this); - advanced->setVisible(false); - - mRemoteRef = new QLineEdit(advanced); - - QFormLayout *advancedForm = new QFormLayout(advanced); - advancedForm->setContentsMargins(-1, 0, 0, 0); - advancedForm->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow); - advancedForm->addRow(tr("Remote Reference:"), mRemoteRef); - - connect(expand, &ExpandButton::toggled, [this, advanced](bool checked) { - advanced->setVisible(checked); - QApplication::processEvents(QEventLoop::ExcludeUserInputEvents); - resize(sizeHint()); - }); + mRemoteRef = new QLineEdit(this); connect(mRefs, &ReferenceList::referenceSelected, [this](const git::Reference &ref) { @@ -136,8 +116,8 @@ RemoteDialog::RemoteDialog(Kind kind, RepoView *parent) : QDialog(parent) { form->addRow(QString(), mSetUpstream); if (mForce) form->addRow(QString(), mForce); - if (expand) - form->addRow(tr("Advanced:"), expand); + if (mRemoteRef) + form->addRow(tr("Remote Reference:"), mRemoteRef); QDialogButtonBox *buttons = new QDialogButtonBox(QDialogButtonBox::Cancel, this); @@ -147,8 +127,6 @@ RemoteDialog::RemoteDialog(Kind kind, RepoView *parent) : QDialog(parent) { QVBoxLayout *layout = new QVBoxLayout(this); layout->addLayout(form); - if (advanced) - layout->addWidget(advanced); layout->addWidget(buttons); connect(this, &RemoteDialog::accepted, [this, kind, prune] { diff --git a/src/ui/ReferenceList.cpp b/src/ui/ReferenceList.cpp index 6b19ce57a..5e4c2aa39 100644 --- a/src/ui/ReferenceList.cpp +++ b/src/ui/ReferenceList.cpp @@ -147,10 +147,10 @@ void ReferenceList::paintEvent(QPaintEvent *event) { style()->drawComplexControl(QStyle::CC_ComboBox, &opt, &painter, this); if (opt.currentText.isEmpty()) { - if (!mCommit.isValid()) - return; - - opt.currentText = mCommit.shortId(); + if (mCommit.isValid()) + opt.currentText = mCommit.shortId(); + else + opt.currentText = tr("(Not set)"); } QRect rect = style()->subControlRect(QStyle::CC_ComboBox, &opt, @@ -160,7 +160,12 @@ void ReferenceList::paintEvent(QPaintEvent *event) { // Draw kind. git::Reference ref = currentReference(); - QString kind = ref.isValid() ? ReferenceView::kindString(ref) : tr("Commit"); + QString kind; + if (ref.isValid()) + kind = ReferenceView::kindString(ref); + else if (mCommit.isValid()) + kind = tr("Commit"); + if (!kind.isEmpty()) { painter.save(); painter.setPen(palette().color(QPalette::Disabled, QPalette::Text)); From e5db41d4e82458b75a74fb88acde7e56d0f2cf0e Mon Sep 17 00:00:00 2001 From: Alf Henrik Sauge Date: Mon, 10 Aug 2026 15:09:32 +0200 Subject: [PATCH 2/2] Update translations with the removal of 'Advanced' #Conflicts: # l10n/gittyup_ta.ts --- l10n/gittyup_de.ts | 107 +++++++++++++++++----------------------- l10n/gittyup_en.ts | 107 +++++++++++++++++----------------------- l10n/gittyup_es.ts | 107 +++++++++++++++++----------------------- l10n/gittyup_ja.ts | 107 +++++++++++++++++----------------------- l10n/gittyup_pt.ts | 107 +++++++++++++++++----------------------- l10n/gittyup_pt_BR.ts | 112 ++++++++++++++++++------------------------ l10n/gittyup_ru.ts | 107 +++++++++++++++++----------------------- l10n/gittyup_ta.ts | 20 ++------ l10n/gittyup_zh_CN.ts | 107 +++++++++++++++++----------------------- 9 files changed, 373 insertions(+), 508 deletions(-) diff --git a/l10n/gittyup_de.ts b/l10n/gittyup_de.ts index ce6264446..bf4317559 100644 --- a/l10n/gittyup_de.ts +++ b/l10n/gittyup_de.ts @@ -73,57 +73,52 @@ Remote-Account hinzufügen - + Host: Host: - + Username: Benutzername: - + Password: Passwort: - - Advanced: - Erweitert: - - - + URL: URL: - + Replace? Ersetzen? - + An account of this type already exists. Ein Account dieses Typs existiert bereits. - + Would you like to replace the previous account? Willst Du den alten Account ersetzen? - + Replace Ersetzen - + Cancel Abbrechen - + Connection Failed Verbinden fehlgeschlagen @@ -479,32 +474,32 @@ CloneDialog - + Initialize Repository Repository initialisieren - + Clone Repository Repository klonen - + Initialized empty repository into '%1' Leeres Repository in '%1' initialisiert - + Cloned repository from '%1' into '%2' Repository von '%1' nach '%2' geklont - + Initialize Initialisieren - + Clone Klonen @@ -512,33 +507,33 @@ ClonePage - + Clone Progress Fortschritt des Klon-Vorgangs - + The new repository will open after the clone finishes. Das neue Repository wird geöffnet, sobald das Klonen fertig ist. - + Clone Klone - - + + clone Klonen - + Clone canceled. Klonen abgebrochen. - + Failed to %1 into '%2' - %3 %1 nach %2 fehlgeschlagen - %3 @@ -2498,27 +2493,22 @@ Beispiele Ordner wählen - + Name: Name: - + Directory: Ordner: - - Advanced: - Erweitert: - - - + Create a bare repository Ein Bare-Repository erstellen - + The new repository will be created at:<p style='text-indent: 12px'><b>%1</b></p> Das neue Repository wird in <b>%1</b> erstellt @@ -3173,27 +3163,22 @@ Beispiele Branch auschecken - + Name: Name: - + Start Point: Startpunkt: - Advanced: - Erweitert: - - - Upstream: Upstream: - + Create Branch Branch erstellen @@ -3427,7 +3412,12 @@ Konflikt zu beheben ReferenceList - + + (Not set) + + + + Commit Commit @@ -3625,60 +3615,55 @@ Konflikt zu beheben Mergen (nur Fast-Forwards) - + Set upstream Upstream setzen - + Force Erzwingen - + Remote Reference: Remote-Referenz: - + Prune references Referenzen aufräumen - + Fetch Fetchen - + Pull Pullen - + Push Pushen - + Remote: Remote: - + Reference: Referenz: - + Action: Aktion: - - - Advanced: - Erweitert: - RemotePage diff --git a/l10n/gittyup_en.ts b/l10n/gittyup_en.ts index 44992e452..ded42dd38 100644 --- a/l10n/gittyup_en.ts +++ b/l10n/gittyup_en.ts @@ -65,57 +65,52 @@ - + Host: - + Username: - + Password: - - Advanced: - - - - + URL: - + Replace? - + An account of this type already exists. - + Would you like to replace the previous account? - + Replace - + Cancel - + Connection Failed @@ -457,32 +452,32 @@ CloneDialog - + Initialize Repository - + Clone Repository - + Initialized empty repository into '%1' - + Cloned repository from '%1' into '%2' - + Initialize - + Clone @@ -490,33 +485,33 @@ ClonePage - + Clone Progress - + The new repository will open after the clone finishes. - + Clone - - + + clone - + Clone canceled. - + Failed to %1 into '%2' - %3 @@ -2282,27 +2277,22 @@ Examples - + Name: - + Directory: - - Advanced: - - - - + Create a bare repository - + The new repository will be created at:<p style='text-indent: 12px'><b>%1</b></p> @@ -2945,27 +2935,22 @@ Examples - + Name: - + Start Point: - Advanced: - - - - Upstream: - + Create Branch @@ -3186,7 +3171,12 @@ Would you like to fix the merge conflict and continue? ReferenceList - + + (Not set) + + + + Commit @@ -3376,60 +3366,55 @@ Would you like to fix the merge conflict and continue? - + Set upstream - + Force - + Remote Reference: - + Prune references - + Fetch - + Pull - + Push - + Remote: - + Reference: - + Action: - - - Advanced: - - RemotePage diff --git a/l10n/gittyup_es.ts b/l10n/gittyup_es.ts index 18a52ad06..d1f9a67bb 100644 --- a/l10n/gittyup_es.ts +++ b/l10n/gittyup_es.ts @@ -73,57 +73,52 @@ Agregar Cuenta Remota - + Host: - + Username: Nombre de Usuario: - + Password: Contraseña: - - Advanced: - Avanzado: - - - + URL: - + Replace? ¿Reemplazar? - + An account of this type already exists. Ya existe una cuenta de este tipo. - + Would you like to replace the previous account? ¿Te gustaría reemplazar la cuenta anterior? - + Replace Reemplazar - + Cancel Cancelar - + Connection Failed Conexión Fallida @@ -479,32 +474,32 @@ CloneDialog - + Initialize Repository Inicializar Repositorio - + Clone Repository Clonar Repositorio - + Initialized empty repository into '%1' Inicializar repositorio vacío en '%1' - + Cloned repository from '%1' into '%2' Clonar repositorio desde '%1' en '%2' - + Initialize Inicializar - + Clone Clonar @@ -512,33 +507,33 @@ ClonePage - + Clone Progress Progreso de clonación - + The new repository will open after the clone finishes. El nuevo repositorio de abrirá después que termine la clonación. - + Clone Clonar - - + + clone clonar - + Clone canceled. Clonación cancelada. - + Failed to %1 into '%2' - %3 Falló al %1 en '%2' - %3 @@ -2452,27 +2447,22 @@ Ejemplos Escoger Directorio - + Name: Nombre: - + Directory: Directorio: - - Advanced: - Avanzado: - - - + Create a bare repository Crear un repositorio vacío - + The new repository will be created at:<p style='text-indent: 12px'><b>%1</b></p> El nuevo repositorio será creado en:<p style='text-indent: 12px'><b>%1</b></p> @@ -3227,27 +3217,22 @@ Ejemplos Revisar Rama - + Name: Nombre: - + Start Point: Punto de Inicio: - Advanced: - Avanzado: - - - Upstream: Rama a seguir: - + Create Branch Crear Rama @@ -3468,7 +3453,12 @@ Would you like to fix the merge conflict and continue? ReferenceList - + + (Not set) + + + + Commit Confirmación @@ -3658,60 +3648,55 @@ Would you like to fix the merge conflict and continue? Fusionar (Adelantar Únicamente) - + Set upstream Configurar rama a seguir - + Force Forzar - + Remote Reference: Referencia Remota: - + Prune references Podar referencias - + Fetch Traer - + Pull Combinar - + Push Enviar - + Remote: Remoto: - + Reference: Referencia: - + Action: Acción: - - - Advanced: - Avanzado: - RemotePage diff --git a/l10n/gittyup_ja.ts b/l10n/gittyup_ja.ts index b2ed9212e..578744706 100644 --- a/l10n/gittyup_ja.ts +++ b/l10n/gittyup_ja.ts @@ -73,57 +73,52 @@ リモートアカウントを追加 - + Host: ホスト: - + Username: ユーザー名: - + Password: パスワード: - - Advanced: - 詳細設定: - - - + URL: URL: - + Replace? 置き換えますか？ - + An account of this type already exists. この種類のアカウントは既に存在します。 - + Would you like to replace the previous account? 以前のアカウントと置き換えますか？ - + Replace 置換 - + Cancel キャンセル - + Connection Failed 接続失敗 @@ -479,32 +474,32 @@ CloneDialog - + Initialize Repository リポジトリを作成 - + Clone Repository リポジトリをクローン - + Initialized empty repository into '%1' 空のリポジトリを '%1' に作成しました - + Cloned repository from '%1' into '%2' リポジトリ '%1' を '%2' にクローンしました - + Initialize 作成 - + Clone クローン @@ -512,33 +507,33 @@ ClonePage - + Clone Progress クローンの進行状況 - + The new repository will open after the clone finishes. クローンの完了後に、新しいリポジトリが開かれます。 - + Clone クローン - - + + clone クローン - + Clone canceled. クローンをキャンセルしました。 - + Failed to %1 into '%2' - %3 '%2' への%1に失敗しました - %3 @@ -2449,27 +2444,22 @@ Examples ディレクトリを選択 - + Name: 名前: - + Directory: ディレクトリ: - - Advanced: - 詳細設定: - - - + Create a bare repository ベアリポジトリを作成 - + The new repository will be created at:<p style='text-indent: 12px'><b>%1</b></p> 新しいリポジトリは <p style='text-indent: 12px'><b>%1</b></p> に作成されます @@ -3216,27 +3206,22 @@ Examples ブランチをチェックアウト - + Name: 名前: - + Start Point: 開始地点: - Advanced: - 詳細設定: - - - Upstream: 上流: - + Create Branch ブランチを作成 @@ -3457,7 +3442,12 @@ Would you like to fix the merge conflict and continue? ReferenceList - + + (Not set) + + + + Commit コミット @@ -3647,60 +3637,55 @@ Would you like to fix the merge conflict and continue? マージ (高速転送のみ) - + Set upstream 上流を設定 - + Force 強制 - + Remote Reference: リモートの参照先: - + Prune references 不要ブランチの参照解除 - + Fetch フェッチ - + Pull プル - + Push プッシュ - + Remote: リモート: - + Reference: 参照先: - + Action: アクション: - - - Advanced: - 詳細設定: - RemotePage diff --git a/l10n/gittyup_pt.ts b/l10n/gittyup_pt.ts index 9a8e86e6b..38c44aa7b 100644 --- a/l10n/gittyup_pt.ts +++ b/l10n/gittyup_pt.ts @@ -73,57 +73,52 @@ Adicionar conta remota - + Host: Servidor: - + Username: Utilizador: - + Password: Senha: - - Advanced: - Avançado: - - - + URL: URL: - + Replace? Substituir? - + An account of this type already exists. Já existe uma conta deste tipo. - + Would you like to replace the previous account? Deseja substituir a conta anterior? - + Replace Substituir - + Cancel Cancelar - + Connection Failed A ligação falhou @@ -479,32 +474,32 @@ CloneDialog - + Initialize Repository Inicializar repositório - + Clone Repository Clonar repositório - + Initialized empty repository into '%1' Repositório vazio inicializado em "%1" - + Cloned repository from '%1' into '%2' Repositório clonado de "%1" para "%2" - + Initialize Inicializar - + Clone Clonar @@ -512,33 +507,33 @@ ClonePage - + Clone Progress Progresso da clonagem - + The new repository will open after the clone finishes. O novo repositório será aberto após terminar a clonagem. - + Clone Clonar - - + + clone clonar - + Clone canceled. Clonagem cancelada. - + Failed to %1 into '%2' - %3 Falha ao %1 para "%2" - %3 @@ -2450,27 +2445,22 @@ Exemplos Escloher pasta - + Name: Nome: - + Directory: Pasta: - - Advanced: - Avançado: - - - + Create a bare repository Criar um repositório em bruto - + The new repository will be created at:<p style='text-indent: 12px'><b>%1</b></p> O novo repositório será criado em :<p style='text-indent: 12px'><b>%1</b></p> @@ -3217,27 +3207,22 @@ Exemplos Mudar ramo - + Name: Nome: - + Start Point: Pnto inicial: - Advanced: - Avançado: - - - Upstream: Montante: - + Create Branch Criar ramo @@ -3458,7 +3443,12 @@ Would you like to fix the merge conflict and continue? ReferenceList - + + (Not set) + + + + Commit Submeter @@ -3648,60 +3638,55 @@ Would you like to fix the merge conflict and continue? Unir (só avanço rápido) - + Set upstream Definir montante - + Force Forçar - + Remote Reference: Referência remota: - + Prune references Aparar referências - + Fetch Obter - + Pull Puxar - + Push Enviar - + Remote: Remoto: - + Reference: Referência: - + Action: Acção: - - - Advanced: - Avançado: - RemotePage diff --git a/l10n/gittyup_pt_BR.ts b/l10n/gittyup_pt_BR.ts index 7414996c0..240862188 100644 --- a/l10n/gittyup_pt_BR.ts +++ b/l10n/gittyup_pt_BR.ts @@ -84,67 +84,61 @@ Add Conta remota - + Host: Host. Host: - + Username: Nome do usuário. Nome de usuário: - + Password: Senha. Senha: - - Advanced: - Avançado. - Avançado: - - - + URL: Endereço web. URL: - + Replace? Substitui. Substituir? - + An account of this type already exists. Informe de conta já existente. Uma conta desse tipo já existe. - + Would you like to replace the previous account? Informe de substituição de conta. Deseja substituir a conta anterior? - + Replace Substituir. Substituir - + Cancel Cancelar Cancelar - + Connection Failed Houve falha na conexão. Falha na conexão @@ -555,37 +549,37 @@ CloneDialog - + Initialize Repository Inicializa um repositório git no diretório especificado (cria repositório git). Inicializar repositório - + Clone Repository Clona o repositório especificado. Clonar repositório - + Initialized empty repository into '%1' Inicializa um repositório vazio no diretório específicado. Repositório vazio inicializado. em %1 - + Cloned repository from '%1' into '%2' Clona um repositório para um diretório específico. Repositório clonado de %1 em %2 - + Initialize Inicializar... Inicializar - + Clone Clonar... Clonar @@ -594,38 +588,38 @@ ClonePage - + Clone Progress Progresso do clone... Progresso do clone - + The new repository will open after the clone finishes. Informe de ação após a conclusão do clone. O novo repositório será aberto após a conclusão do clone. - + Clone Clonar... Clonar - - + + clone clonar... clonar - + Clone canceled. O clone foi cancelado... Clone cancelado. - + Failed to %1 into '%2' - %3 Falha durante o clone. Falha para %1 em %2 - %3 @@ -2818,31 +2812,25 @@ Exemplos Escolha o diretório - + Name: Nome... Nome: - + Directory: Diretório... Diretório: - - Advanced: - Avançado... - Avançado: - - - + Create a bare repository Cria um repositório vazio... Crie um repositório vazio - + The new repository will be created at:<p style='text-indent: 12px'><b>%1</b></p> Caminho do novo repositório... O novo repositório será criado em:<p style='text-indent: 12px'><b>%1</b></p> @@ -3731,31 +3719,25 @@ Exemplos Checkout branch - + Name: Nome... Nome: - + Start Point: Ponto de partida... Ponto inicial: - Advanced: - Avançado... - Avançado: - - - Upstream: Upstream... Upstream: - + Create Branch Cria nova ramificação... Criar Branch @@ -4000,7 +3982,12 @@ Would you like to fix the merge conflict and continue? ReferenceList - + + (Not set) + + + + Commit Commit... Commit @@ -4206,60 +4193,55 @@ Would you like to fix the merge conflict and continue? Mesclar (avanço rápido) - + Set upstream - + Force - + Remote Reference: - + Prune references - + Fetch Fetch - + Pull Pull - + Push Push - + Remote: - + Reference: Referência: - + Action: Açao: - - - Advanced: - Avançado: - RemotePage @@ -6251,7 +6233,7 @@ x (number) determines the number of maximum files shown Update %1 - + Atualizar %1 diff --git a/l10n/gittyup_ru.ts b/l10n/gittyup_ru.ts index 4046c40c1..d07d37155 100644 --- a/l10n/gittyup_ru.ts +++ b/l10n/gittyup_ru.ts @@ -73,57 +73,52 @@ Добавить удаленный аккаунт - + Host: Сервер: - + Username: Имя пользователя: - + Password: Пароль: - - Advanced: - Дополнительно: - - - + URL: - + Replace? Заменить? - + An account of this type already exists. Аккаунт этого типа уже существует. - + Would you like to replace the previous account? Желаете заменить предыдущий аккаунт? - + Replace Заменить - + Cancel Отменить - + Connection Failed Соединение не удалось @@ -479,32 +474,32 @@ CloneDialog - + Initialize Repository Инициализировать репозиторий - + Clone Repository Клонировать репозиторий - + Initialized empty repository into '%1' Инициализировал пустой репозиторий '%1' - + Cloned repository from '%1' into '%2' Клонировал репозиторий из '%1' в '%2' - + Initialize Инициализировать - + Clone Клонировать @@ -512,33 +507,33 @@ ClonePage - + Clone Progress Прогрессклонирования - + The new repository will open after the clone finishes. Новый репозиторий откроется когда клонирование завершится. - + Clone Клонировать - - + + clone клонировать - + Clone canceled. Клонирование отменено. - + Failed to %1 into '%2' - %3 Ну не смогла я %1 в '%2' - %3 @@ -2448,27 +2443,22 @@ Examples Выберите директорию - + Name: Имя: - + Directory: Директория: - - Advanced: - Дополнительно: - - - + Create a bare repository Создать "голый" репозиторий - + The new repository will be created at:<p style='text-indent: 12px'><b>%1</b></p> Новый репозиторий будет создан в:<p style='text-indent: 12px'><b>%1</b></p> @@ -3115,27 +3105,22 @@ Examples Перейти на ветку - + Name: Имя: - + Start Point: Начальная точка: - Advanced: - Дополнительно: - - - Upstream: - + Create Branch Создать ветку @@ -3356,7 +3341,12 @@ Would you like to fix the merge conflict and continue? ReferenceList - + + (Not set) + + + + Commit Коммит @@ -3546,60 +3536,55 @@ Would you like to fix the merge conflict and continue? Слить (только fast-forward) - + Set upstream Выставить upstream - + Force Принудительно - + Remote Reference: Удаленная ссылка: - + Prune references Подчистить ссылки - + Fetch Забрать - + Pull Утянуть - + Push Запушить - + Remote: - + Reference: Сссылка: - + Action: Действие: - - - Advanced: - Дополнительно: - RemotePage diff --git a/l10n/gittyup_ta.ts b/l10n/gittyup_ta.ts index f9927dbe4..8a528a8da 100644 --- a/l10n/gittyup_ta.ts +++ b/l10n/gittyup_ta.ts @@ -65,10 +65,6 @@ Password: கடவுச்சொல்: - - Advanced: - மேம்பட்ட: - URL: URL: @@ -1856,10 +1852,6 @@ Examples Directory: அடைவு: - - Advanced: - மேம்பட்ட: - Create a bare repository ஒரு வெற்று களஞ்சியத்தை உருவாக்கவும் @@ -2385,10 +2377,6 @@ Examples Start Point: தொடக்க புள்ளி: - - Advanced: - மேம்பட்ட: - Upstream: அப்ச்ட்ரீம்: @@ -2577,6 +2565,10 @@ Would you like to fix the merge conflict and continue? ReferenceList + + (Not set) + + Commit உறுதி @@ -2771,10 +2763,6 @@ Would you like to fix the merge conflict and continue? Action: செயல்: - - Advanced: - மேம்பட்ட: - RemotePage diff --git a/l10n/gittyup_zh_CN.ts b/l10n/gittyup_zh_CN.ts index d978f4a24..6c4696fde 100644 --- a/l10n/gittyup_zh_CN.ts +++ b/l10n/gittyup_zh_CN.ts @@ -73,57 +73,52 @@ 添加远程帐户 - + Host: 主机： - + Username: 用户名： - + Password: 密码： - - Advanced: - 高级： - - - + URL: 地址URL： - + Replace? 确定替换吗？ - + An account of this type already exists. 此类型的帐户已存在。 - + Would you like to replace the previous account? 您要替换以前的帐户吗？ - + Replace 替换 - + Cancel 取消 - + Connection Failed 连接失败 @@ -479,32 +474,32 @@ CloneDialog - + Initialize Repository 初始化仓库 - + Clone Repository 克隆仓库 - + Initialized empty repository into '%1' 将空仓库初始化为'%1' - + Cloned repository from '%1' into '%2' 将仓库从'%1'克隆到'%2' - + Initialize 初始化 - + Clone 克隆 @@ -512,33 +507,33 @@ ClonePage - + Clone Progress 克隆进度 - + The new repository will open after the clone finishes. 克隆完成后，将打开新的仓库。 - + Clone 克隆 - - + + clone 克隆 - + Clone canceled. 克隆已取消。 - + Failed to %1 into '%2' - %3 %1克隆到'%2'失败 - %3 @@ -2450,27 +2445,22 @@ Examples 选择目录 - + Name: 名称： - + Directory: 目录： - - Advanced: - 高级： - - - + Create a bare repository 创建一个纯仓库 - + The new repository will be created at:<p style='text-indent: 12px'><b>%1</b></p> 新的仓库将在以下位置创建：<p style='text-indent：12px'><b>%1</b></p> @@ -3217,27 +3207,22 @@ Examples 检出分支 - + Name: 名称： - + Start Point: 起点： - Advanced: - 高级： - - - Upstream: 上游： - + Create Branch 新建分支 @@ -3458,7 +3443,12 @@ Would you like to fix the merge conflict and continue? ReferenceList - + + (Not set) + + + + Commit 提交 @@ -3648,60 +3638,55 @@ Would you like to fix the merge conflict and continue? 合并（仅快进） - + Set upstream 设置上游 - + Force 强制 - + Remote Reference: 远程引用： - + Prune references 清除引用 - + Fetch 获取 - + Pull 拉取 - + Push 推送 - + Remote: 远程： - + Reference: 引用： - + Action: 动作： - - - Advanced: - 高级： - RemotePage