From e5f9484638c70d944e77069db5b0ec5159ad2cb9 Mon Sep 17 00:00:00 2001 From: Micha WERLE Date: Wed, 8 May 2024 10:49:49 +0900 Subject: [PATCH 1/4] chore: add tags file to gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index ca6f9e25..f34e3873 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,4 @@ build .idea/ .venv compile_commands.json - +tags \ No newline at end of file From 81cf2e6e5ebdff770610e0c53d0e3b29a85787f3 Mon Sep 17 00:00:00 2001 From: Micha WERLE Date: Sat, 27 Apr 2024 10:20:41 +0900 Subject: [PATCH 2/4] feat(whitespace): show whitespace in editor views This commit adds a new Settings entry "ShowWhitespaceinEditor" ("editor/view/showWhitespace") to the Settings class, and a new checkbox in the Editor settings dialog. This setting defaults to off/false, preserving the current behaviour of the application. If this setting is toggled to on, whitespace is rendered in the HunkWidget and BlameEditor views. --- conf/editor.lua | 3 +++ src/conf/Setting.cpp | 1 + src/conf/Setting.h | 1 + src/dialogs/SettingsDialog.cpp | 9 +++++++++ src/editor/TextEditor.cpp | 1 + 5 files changed, 15 insertions(+) diff --git a/conf/editor.lua b/conf/editor.lua index 91b47e94..c855928a 100644 --- a/conf/editor.lua +++ b/conf/editor.lua @@ -14,6 +14,9 @@ return { family = family, size = size }, + view = { + showWhitespace = false + }, indent = { tabs = true, width = 4, diff --git a/src/conf/Setting.cpp b/src/conf/Setting.cpp index 2d1af02e..c7e2bea6 100644 --- a/src/conf/Setting.cpp +++ b/src/conf/Setting.cpp @@ -12,6 +12,7 @@ void Setting::initialize(QMap &keys) { keys[Id::IndentWidth] = "editor/indent/width"; keys[Id::TabWidth] = "editor/indent/tabwidth"; keys[Id::ShowHeatmapInBlameMargin] = "editor/blame/heatmap"; + keys[Id::ShowWhitespaceInEditor] = "editor/view/showWhitespace"; keys[Id::ColorTheme] = "window/theme"; keys[Id::ShowFullRepoPath] = "window/path/full"; keys[Id::HideLogAutomatically] = "window/log/hide"; diff --git a/src/conf/Setting.h b/src/conf/Setting.h index a6ebe9aa..24fe12b3 100644 --- a/src/conf/Setting.h +++ b/src/conf/Setting.h @@ -36,6 +36,7 @@ public: IndentWidth, TabWidth, ShowHeatmapInBlameMargin, + ShowWhitespaceInEditor, ColorTheme, ShowFullRepoPath, HideLogAutomatically, diff --git a/src/dialogs/SettingsDialog.cpp b/src/dialogs/SettingsDialog.cpp index a246755d..7dfcc3b6 100644 --- a/src/dialogs/SettingsDialog.cpp +++ b/src/dialogs/SettingsDialog.cpp @@ -661,6 +661,14 @@ public: Settings::instance()->setValue(Setting::Id::FontSize, i); }); + QCheckBox *showWhitespace = new QCheckBox(tr("Show whitespace"), this); + showWhitespace->setChecked( + settings->value(Setting::Id::ShowWhitespaceInEditor).toBool()); + connect(showWhitespace, &QCheckBox::toggled, [](bool checked) { + Settings::instance()->setValue(Setting::Id::ShowWhitespaceInEditor, + checked); + }); + QComboBox *indent = new QComboBox(this); indent->addItem(tr("Tabs")); indent->addItem(tr("Spaces")); @@ -695,6 +703,7 @@ public: QFormLayout *layout = new QFormLayout(this); layout->addRow(tr("Font:"), font); layout->addRow(tr("Font size:"), fontSize); + layout->addRow(tr("Whitespace:"), showWhitespace); layout->addRow(tr("Indent using:"), indent); layout->addRow(tr("Indent width:"), indentWidth); layout->addRow(tr("Tab width:"), tabWidth); diff --git a/src/editor/TextEditor.cpp b/src/editor/TextEditor.cpp index 28f348dc..7549ab89 100644 --- a/src/editor/TextEditor.cpp +++ b/src/editor/TextEditor.cpp @@ -182,6 +182,7 @@ void TextEditor::applySettings() { setUseTabs(settings->value(Setting::Id::UseTabsForIndent).toBool()); setIndent(settings->value(Setting::Id::IndentWidth).toInt()); setTabWidth(settings->value(Setting::Id::TabWidth).toInt()); + setViewWS(settings->value(Setting::Id::ShowWhitespaceInEditor).toBool()); if (Settings::instance()->isTextEditorWrapLines()) { setWrapMode(SC_WRAP_WORD); From e3072fce50407cfdab8380f4854bd46944bd4ceb Mon Sep 17 00:00:00 2001 From: Micha WERLE Date: Sat, 27 Apr 2024 12:56:45 +0900 Subject: [PATCH 3/4] feat(whitespace): Update translation files. Commit updated translation files following source code changes. NOTE: This commit does not update the actual translations. --- l10n/gittyup_de.ts | 824 ++++++++++++++++++++++-------------------- l10n/gittyup_en.ts | 824 ++++++++++++++++++++++-------------------- l10n/gittyup_es.ts | 824 ++++++++++++++++++++++-------------------- l10n/gittyup_ja.ts | 824 ++++++++++++++++++++++-------------------- l10n/gittyup_pt.ts | 824 ++++++++++++++++++++++-------------------- l10n/gittyup_pt_BR.ts | 824 ++++++++++++++++++++++-------------------- l10n/gittyup_ru.ts | 824 ++++++++++++++++++++++-------------------- l10n/gittyup_zh_CN.ts | 824 ++++++++++++++++++++++-------------------- 8 files changed, 3416 insertions(+), 3176 deletions(-) diff --git a/l10n/gittyup_de.ts b/l10n/gittyup_de.ts index 350a03ea..96a72400 100644 --- a/l10n/gittyup_de.ts +++ b/l10n/gittyup_de.ts @@ -629,115 +629,115 @@ - + <b>Commit Message:</b> <b>Commit-Nachricht:</b> - - + + Spell Check Language - + The dictionary '%1' is invalid - + Spell checking is disabled. - + The choosen dictionary '%1.dic' is not a valid hunspell dictionary. - - + + Invalid dictionary '%1.dic' - + Edit User Dictionary - + Stage All Alles stagen - + Unstage All Alles unstagen - - + + Commit Committen - + Abort rebasing - + Continue rebasing - + Abort Merge Merge abbrechen - + %1 %1 - + %1 and %2 - + %1, %2, and %3 - + Merge - + Revert - + Cherry-pick - + Rebase - + Abort %1 %1 abbrechen - + Commit Rebase @@ -758,47 +758,47 @@ %1, %2 und %3 weitere dateien aktualisiert... - + Nothing staged Nichts gestaged - + %1 of %2 file staged %1 von %2 Datei gestaged - + %1 of %2 files staged %1 von %2 Dateien gestaged - + %1 file partially staged %1 Datei teilweise gestaged - + %1 files partially staged %1 Dateien teilweise gestaged - + %1 unresolved conflict %1 ungelöster Konflikt - + %1 unresolved conflicts %1 ungelöste Konflikte - + all conflicts resolved Alle Konflikte gelöst - + Commit Merge Merge committen @@ -806,42 +806,42 @@ CommitList - + Remove Untracked Files Ungetrackte Dateien entfernen - + Apply Anwenden - + Pop Poppen - + Drop Droppen - + Unstar Ent-Favorisieren - + Star Favorisieren - + Add Tag... Tag hinzufügen... - + New Branch... Neuer Branch... @@ -854,83 +854,83 @@ Branch %1 löschen - + Rename Branch - + Delete Branch - + Delete Tag Lösche Tag - + Merge... Mergen... - + Rebase... Rebasen... - + Squash... Squashen... - + Revert Reverten - + Cherry-pick Cherry-Picken - - + + Checkout %1 %1 auschecken - + Checkout - + Local branch is already checked out Ein lokaler Branch ist bereits ausgecheckt - + This is a bare repository Dies ist ein Bare-Repository - + Reset Zurücksetzen - + Soft Soft - + Mixed Mixed - + Hard Hard @@ -938,12 +938,12 @@ CommitModel - + Uncommitted changes Uncommittete Änderungen - + Checking for uncommitted changes Prüfe auf uncommittete Änderungen @@ -1225,24 +1225,24 @@ DetailView - - + + Author: Author: - + reset zurücksetzen - + Here you can set the author used for committing These settings will not be saved permanently - + Email: E-Mail: @@ -1261,16 +1261,26 @@ These settings will not be saved permanently + Wrap lines + + + + Context lines: Kontext-Zeilen: - + + Wrap lines: + + + + Character Encoding: Zeichensatz: - + Ignore Whitespace (-w) Whitespace ignorieren (-w) @@ -1279,17 +1289,17 @@ These settings will not be saved permanently Kompakter Modus - + Added files Hinzugefügte Dateien - + Deleted files Gelöschte Dateien - + Whitespace: Whitespace: @@ -1298,7 +1308,7 @@ These settings will not be saved permanently Kompakter Modus: - + Auto Collapse: Automatisch zuklappen: @@ -1314,7 +1324,7 @@ These settings will not be saved permanently DiffTreeModel - + Submodule Submodul @@ -1322,12 +1332,12 @@ These settings will not be saved permanently DiffView - + Add new file Neue Datei hinzufügen - + Or drag files here to copy into the repository Oder Dateien hierher ziehen, um sie dem Repository hinzuzufügen @@ -1335,40 +1345,25 @@ These settings will not be saved permanently DoubleTreeWidget - + Blame - + Show Blame Editor - + Diff Diff - + Show Diff View Unterschiede anzeigen - - - Single Tree View - - - - - List View - - - - - Hide Untracked Files - - DownloadDialog @@ -1422,47 +1417,57 @@ These settings will not be saved permanently EditorPanel - + + Show whitespace + + + + Tabs Tabs - + Spaces Leerzeichen - + Show heat map Heat-Map anzeigen - + Font: Schriftart: - + Font size: Schriftgröße: - + + Whitespace: + Whitespace: + + + Indent using: Einzug mit: - + Indent width: Einzugs-Breite: - + Tab width: Tab-Breite: - + Blame margin: Blame-Seitenrand: @@ -1934,12 +1939,12 @@ These settings will not be saved permanently Änderungen verwerfen - + Discard Verwerfen - + discard verwerfe @@ -2165,51 +2170,51 @@ These settings will not be saved permanently HunkWidget - + Save Speichern - + Undo Rückgängig - + Use Ours Unseres benutzen - + Use Theirs Ihres benutzen - + Edit Hunk Hunk bearbeiten - + Discard Hunk Hunk verwerfen - + Discard selected lines? - + Are you sure you want to discard the changes in hunk from line %1 to %2 in '%3'? - + Discard selected lines @@ -2218,7 +2223,7 @@ These settings will not be saved permanently Hunk verwerfen? - + Are you sure you want to remove '%1'? Bist Du sicher, dass Du '%1' entfernen willst? @@ -2227,29 +2232,29 @@ These settings will not be saved permanently Bist Du sicher, dass Du die Änderungen im Hunk ab Zeile %1 in '%2' verwerfen willst? - + This action cannot be undone. Die Aktion kann nicht rückgängig gemacht werden. - - + + Collapse Hunk Hunk zuklappen - - + + Expand Hunk Hunk aufklappen - + Fix Beheben - + Edit Bearbeiten @@ -2259,7 +2264,7 @@ These settings will not be saved permanently Keine Leerzeile am Ende der Datei - + Esc @@ -2529,59 +2534,59 @@ Beispiele MainWindow - + Invalid Git Repository Ungültiges GIT-Repository - + %1 does not contain a valid git repository. %1 enthält kein gültiges GIT-Repository. - - + + %1 - %2 %1 - %2 - + ahead: %1 voraus: %1 - + behind: %1 dahinter: %1 - + up-to-date aktuell - - + + %1 (%2) %1 (%2) - + MERGING MERGE - + REVERTING REVERTE - + CHERRY-PICKING CHERRY-PICKEND - + REBASING REBASE @@ -3150,12 +3155,12 @@ Beispiele MiscPanel - + Path to SSH config file: Pfad zur SSH-Konfigurations-Datei: - + Path to default / fallback SSH key file: Pfad zur Standard- / Fallback-SSH-Schlüssel-Datei: @@ -3324,32 +3329,32 @@ Beispiele QObject - + Expand all - + Collapse all - + Staged Files - + Unstaged Files - + Committed Files - + Workdir Files @@ -3358,6 +3363,21 @@ Beispiele Your global GIT configuration is invalid, Gittyup won't run properly until this is fixed + + + File Name + + + + + Relative Path + + + + + State + + RebaseConflictDialog @@ -4012,235 +4032,235 @@ was added to %1 - + Unable to %1 '%2' - %3 Kann nicht '%2' %1 - %3 - + Unable to %1 - %2 Kann nicht %1 - %2 - + %1 remotes %1 Remotes - + Fetch All Fetche alle - + Fetch Fetche - - - + + + <i>no remote</i> <i>kein Remote</i> - + Unable to fetch. No upstream is configured for the current branch, and there isn't a remote called 'origin'. Kann nicht fetchen. Kein Upstream ist für den aktuellen branch konfiguriert und es gibt kein Remote namens 'origin'. - - + + Fetch canceled. Fetchen abgebrochen. - + fetch from fetche von - + You may disable ssl verification <a href='action:sslverifyrepo'>for this repository</a> or overall disable ssl verification <a href='action:sslverifygit'>for all repositories</a>. - - - + + + Everything up-to-date. Bereits aktuell. - - - + + + <i>no branch</i> <i>kein Branch</i> - + %1 from %2 %1 von %2 - + Pull Pulle - + <i>no upstream</i> <i>kein Upstream</i> - + Merge Merge - + %1 into %2 %1 in %2 - + Fast-forward Fast-Forward - + %2 to %1 %2 nach %1 - - + + Rebase Rebase - + %2 on %1 %2 auf %1 - + The repository is empty. - - + + The current branch '%1' has no upstream branch. Der aktuelle Branch '%1' hat keinen Upstream. - - + + Already up-to-date. Bereits aktuell. - + Unable to fast-forward. Kann nicht fast-forwarden. - + fast-forward Fast-Forward - + You may be able to reconcile your changes with the conflicting files by <a href='action:stash'>stashing</a> before you <a href='%1'>fast-forward</a>. Then <a href='action:unstash'>unstash</a> to restore your changes. Du kannst ggf. Deine Änderungen mit den konfliktierenden Dateien lösen, indem Du erst <a href='action:stash'>stashst</a>, dann <a href='%1'>fast-forwardest</a> und schließlich <a href='action:unstash'>unstashst</a> um Deine Änderungen wiederherzustellen. - + If you want to create a new merge commit instead of fast-forwarding, you can <a href='%1'>merge without fast-forwarding </a> instead. Wenn Du statt fast-forwarden einen neuen Merge-Commit erzeugen willst, kannst du <a href='%1'>dies tun</>. - - - - + + + + merge Merge - - + + You may be able to rebase by <a href='action:stash'>stashing</a> before trying to <a href='action:merge'>merge</a>. Then <a href='action:unstash'>unstash</a> to restore your changes. Du kannst ggf. rebasen, indem Du erst <a href='action:stash'>stashst</a>, dann <a href='action:merge'>mergest</a> und schließlich <a href='action:unstash'>unstashst</a> um Deine Änderungen wiederherzustellen. - - - + + + Abort Abbrechen - + Some merged files have unstaged changes Einige gemergte Dateien haben ungestagte Änderungen - + abort merge merge abbrechen - - - + + + revert Revert - - - + + + cherry-pick Cherry-Pick - - - + + + rebase Rebase - + Continue ongoing rebase - + Invalid head. - + You may be able to rebase by <a href='action:stash'>stashing</a> before trying to <a href='action:rebase'>rebase</a>. Then <a href='action:unstash'>unstash</a> to restore your changes. Du kannst ggf. rebasen, indem Du erst <a href='action:stash'>stashst</a>, dann <a href='action:rebase'>rebast</a> und schließlich <a href='action:unstash'>unstashst</a> um Deine Änderungen wiederherzustellen. - - + + %1/%2 %1/%2 - + %1 - %2 %1 - %2 - + Apply Anwenden @@ -4253,29 +4273,29 @@ was added to %1 Es gab einen Merge-Konflikt. Der Rebase wurde abgebrochen - + %1 - %2 <i>already applied</i> %1 - %2 <i>bereits angewandt</i> - + %1 - %2 as %3 %1 - %2 als %3 - - - + + + squash Squashen - + Revert Reverte - + Revert "%1" This reverts commit %2. @@ -4284,17 +4304,17 @@ This reverts commit %2. Dies reverted den Commit %2. - + <i>detached HEAD</i> <i>losgelöster HEAD</i> - + %1 on %2 %1 auf %2 - + Cherry-pick Cherry-Picke @@ -4303,99 +4323,99 @@ Dies reverted den Commit %2. Force-Push? - + Are you sure you want to force push? Bist Du sicher, dass Du force-pushen willst? - + The remote will lose any commits that are reachable only from the overwritten reference. Dropped commits may be unexpectedly reintroduced by clones that already contain those commits locally. Der Remote wird jegliche Commits verlieren, die nur durch die überschriebene Referenz erreichbar sind. Entfernte Commits können unerwartet durch Klone, die bereits diese Commits lokal haben, wieder auftauchen. - + Force Push Force-Push - + <i>no reference</i> <i>keine Referenz</i> - + Push Pushe - + Push (Force) Pushe (erzwungen) - - + + %1 to %2 %1 nach %2 - - + + You are not currently on a branch. Du bist derzeit auf keinem Branch. - + Create a commit to add the default '%1' branch. Erstelle einen Commit, um den Standard-Branch '%1' hinzuzufügen. - + You can <a href='action:checkout'>checkout</a> a branch then <a href='action:push'>push</a> again, or <a href='action:push-to'>push to an explicit branch</a>. Du kannst einen Branch <a href='action:checkout'>auschecken</a>,dann erneut <a href='action:push'>pushen</a>, oder <a href='action:push-to'>zu einem expliziten Branch pushen</a>. - + The current branch '%1' has no default remote. Der aktuelle Branch '%1' hat keinen Standard-Remote. - + You may want to <a href='action:add-remote?name=origin'>add a remote named 'origin'</a>. Then <a href='action:push?set-upstream=true'>push and set the current branch's upstream</a> to begin tracking a remote branch called 'origin/%1'. Ggf. möchtest Du <a href='action:add-remote?name=origin'>einen Remote namens 'origin' hinzufügen</a> und dann <a href='action:push?set-upstream=true'>pushen und den Upstream des aktuellen Branches setzen</a>, um einen entfernten Branch namens 'origin/%1' zu tracken. - + You can also <a href='action:push-to'>push to an explicit URL</a> if you don't want to track a remote branch. Du kannst auch <a href='action:push-to'>zu einer expliziten URL pushen</a>, wenn Du keinen entfernten Branch tracken willst. - + To begin tracking a remote branch called '%1', <a href='action:push?set-upstream=true'>push and set the current branch's upstream</a>. Um einen entfernten Branch namens '%1' zu tracken, <a href='action:push?set-upstream=true'>pushe und setze den Upstream des aktuellen Branches</a>. - + To push without setting up tracking information, <a href='action:push?ref=%1'>push '%2'</a> explicitly. Um zu pushen, ohne Tracking-Informationen zu konfigurieren, <a href='action:push?ref=%1'>pushe '%2'</a> explizit. - + Push canceled. Pushen abgebrochen. - + push to pushen - + The tag update may cause the remote to lose commits. Das Aktualisieren des Tags kann dazu führen, dass im Remote Commits verloren gehen. - + If you want to risk the remote losing commits, you can <a href='action:push?ref=%1&to=%2&force=true'>force push</a>. Wenn Du das Risiko, dass im Remote Commits verloren gehen, eingehen willst, kannst Du <a href='action:push?ref=%1&to=%2&force=true'>force-pushen</a>. @@ -4408,227 +4428,227 @@ Dies reverted den Commit %2. Wenn Du wirklich willst, dass der Remote Commits verliert, kannst du ggf. <a href='action:push?force=true'>force-pushen</a>. - + Commit? Commit? - + Are you sure you want to commit on a detached HEAD? Bist Du sicher, dass Du auf einen losgelösten HEAD committen willst? - + <p>You are in a detached HEAD state. You can still commit, but the new commit will not be reachable from any branch. If you want to commit to an existing branch, checkout the branch first.</p> <p>Du bist derzeit auf einem losgelösten HEAD. Du kannst weiterhin committen, aber der neue Commit wird von keinem Branch aus erreichbar sein. Wenn Du auf einem bestehendem Branch committen willst, checke diesen erst aus.</p> - - + + Commit Committe - - + + <i>no commit</i> <i>kein Commit</i> - + commit commit - + This commit was signed with a generated user name and email. Dieser Commit wurde mit einem generierten Benutzernamen und E-Mail-Adresse signiert. - + Consider setting the user name and email in <a href='action:config?global=true'>global settings</a>. Denke darüber nach, Benutzername und E-Mail-Adresse in den<a href='action:config?global=true'>globalen Einstellungen</a> zu hinterlegen. - + If you want to limit the name and email settings to this repository, <a href='action:config'>edit repository settings</a> instead. Wenn Du Benutzername und E-Mail-Adresse auf dieses Repository einschränken willst, bearbeite stattdessen die <a href='action:config'>Repository-Einstellungen</a>. - + After settings have been updated, <a href='action:amend'> amend this commit</a> to record the new user name and email. Nachdem die Einstellungen angepasst sind, <a href='action:amend'>amende diesen Commit</a> um den neuen Benutzernamen und E-Mail-Adresse zu protokollieren. - + file Datei - + files Dateien - + %1 - %2 %3 %1 - %2 %3 - - + + Checkout Checke aus - + Checkout Detached HEAD? Losgelösten HEAD auschecken? - + Checkout Detached HEAD Losgelösten HEAD auschecken - + Checking out remote branch '%1' will result in a detached HEAD state. Do you want to reset the existing local branch '%2' to this commit instead? Den entfernten Branch '%1' auszuchecken wird in einem losgelösen HEAD resultieren. Möchtest Du stattdessen den bereits bestehenden lokalen Branch '%2' auf diesen Commit zurücksetzen? - + Reset Local Branch Lokalen Branch zurücksetzen - + Checking out remote branch '%1' will result in a detached HEAD state. Do you want to create a new local branch called '%2' to track it instead? Den entfernten Branch '%1' auszuchecken wird in einem losgelösen HEAD resultieren. Möchtest Du stattdessen einen lokalen Branch '%2' erstellen, der den entfernten Branch trackt? - + Create a local branch to start tracking remote changes and make new commits. Check out the detached HEAD to temporarily put your working directory into the state of the remote branch. Erstelle einen lokalen Branch, um Änderungen im Remote zu tracken und neue Commits zu machen. Checke den losgelösten HEAD aus, um temporär den Arbeitsordner auf den Status des entfernten Branches zu setzen. - + Create Local Branch Lokalen Branch erstellen - + checkout auschecken - + You may be able to reconcile your changes with the conflicting files by <a href='action:stash'>stashing</a> before you <a href='action:checkout?%1'>checkout '%2'</a>. Then <a href='action:unstash'>unstash</a> to restore your changes. Du kannst ggf. Deine Änderungen mit den konfliktierenden Dateien lösen, indem Du erst <a href='action:stash'>stashst</a>, dann <a href='action:checkout?%1'>'%2' auscheckst</a> und schließlich <a href='action:unstash'>unstashst</a> um Deine Änderungen wiederherzustellen. - + New Branch Neuer Branch - + create new branch erstelle neuen Branch - + (no branch) (kein Branch) - + WIP on %1: %2 %3 WIP auf %1: %2 %3 - + <i>working directory</i> <i>Arbeitsordner</i> - + Stash Stashe - + stash stashen - + Apply Stash Wende Stash an - + apply stash Stash anwenden - + Drop Stash Droppe Stash - + drop stash stash droppen - + Pop Stash Poppe Stash - + pop stash Stash poppen - + %1 as %2 %1 als %2 - + Tag Tagge - + tag taggen - - + + Amend Amende - + Amending commit %1 - + %1 to %2 update ref %1 nach %2 - - - - - - + + + + + + Reset Setze zurück @@ -4645,51 +4665,51 @@ Dies reverted den Commit %2. Bist Du sicher, dass Du '%1' amenden willst? - + Are you sure you want to reset '%1' to '%2'? Bist Du sicher, dass Du '%1' nach '%2' zurücksetzen willst? - + <p>Some commits may become unreachable from the current branch.</p> <p>Einige Commits können vom aktuellen Branch aus unerreichbar werden.</p> - + <p>Resetting will cause you to lose uncommitted changes. Untracked and ignored files will not be affected.</p> <p>Resetten kann zu verlorenen Commits führen. Ungetrackte und ignorierte Dateien werden davon nicht betroffen sein.</p> - + <p>Your branch appears to be up-to-date with its upstream branch. Resetting may cause your branch history to diverge from the remote branch history.</p> <p>Dein Branch scheint auf dem gleichen Stand wie sein Upstream-Branch zu sein. Zurücksetzen kann dazu führen, dass deine Branch-History von der des entfernten Branches divergiert.</p> - - + + amend amenden - + reset zurücksetzen - - + + %1 of %2 submodules %1 von %2 Submodulen - - + + Update Updaten - - + + update submodule Submodule updaten @@ -4699,112 +4719,112 @@ Dies reverted den Commit %2. - + Please resolve conflicts before continue - + Conflict - + Rebase finished - + Force Push to %1? - + You may want to integrate remote commits first by <a href='action:pull'>pulling</a>. Then <a href='action:push?to=%1'>push</a> again. - + If you really want the remote to lose commits, you may be able to <a href='action:push?to=%1&force=true'>force push</a>. - + Reset canceled. - + Untouched - + Invalid Submodule Repository Ungültiges Submodul-Repository - + The submodule '%1' doesn't have a valid repository. You may need to init and/or update the submodule to check out a repository. Das Submodul '%1' hat kein gültiges Repository. Ggf. musst Du das Submodul initialisieren und/oder updaten um das Repository auszuchecken. - + No terminal executable found - + No terminal executable was found. Please configure a terminal in the configuration. - + Open Configuration - + There was a merge conflict. Es gab einen Merge-Konflikt. - + Resolve conflicts, then commit to conclude the %1. See <a href='expand'>details</a>. Löse die Konflikte und committe dann, um das %1 abzuschließen. Siehe <a href='expand'>Details</a>. - + Resolve conflicts in each conflicted (!) file in one of the following ways: Löse Konflikte in jeder Datei mit Konflikten (!) auf einem der folgenden Wege: - + 1. Click the 'Ours' or 'Theirs' button to choose the correct change. Then click the 'Save' button to apply. 1. Klicke den 'Unsers'- oder 'Ihres'-Button um die korrekte Änderung auszuwählen. Klicke dann auf 'Speichern' zum Anwenden. - + 2. Edit the file in the editor to make a different change. Remember to remove conflict markers. 2. Bearbeite die Datei im Editor um eine andere Änderung zu verwernden. Vergiss nicht, die Konflikt-Marker zu entfernen. - + 3. Use an external merge tool. Right-click on the files in the list and choose 'External Merge'. 3. Benutze ein externes Merge-Tool. Rechts-Klicke auf die Datei in der Liste und wähle 'Externer Merge'. - + After all conflicts in the file are resolved, click the check box to mark it as resolved. Nachdem alle Konflikte in der Datei gelöst sind, klicke auf die Check-Box, um sie als gelöst zu markieren. - + After all conflicted files are staged, commit to conclude the %1. Nachdem alle Dateien mit Konflikten gestaged sind, commite, um das %1 abzuschließen. - + You can <a href='action:abort'>abort</a> the %1 to return the repository to its previous state. Du kannst das %1 <a href='action:abort'>abbrechen</a>, um das Repository in den vorherigen Zustand zu bringen. @@ -4817,12 +4837,12 @@ Dies reverted den Commit %2. Repository - + Unknown error Unbekannter Fehler - + git-lfs not found git-lfs nicht gefunden @@ -4871,32 +4891,32 @@ Dies reverted den Commit %2. Settings - + Prompt to edit stash message before stashing Auffordern, die Stash-Nachricht zu bearbeiten, bevor gestasht wird - + Prompt to edit commit message before merging Auffordern, die Commit-Nachricht zu bearbeiten, bevor gemerged wird - + Prompt to edit commit message before reverting Auffordern, die Commit-Nachricht zu bearbeiten, bevor reverted wird - + Prompt to edit commit message before cherry-picking Auffordern, die Commit-Nachricht zu bearbeiten, bevor gecherry-picked wird - + Prompt to stage directories Auffordern, Ordner zu stagen - + Prompt to stage large files Auffordern, große Dateien zu stagen @@ -4904,67 +4924,67 @@ Dies reverted den Commit %2. SettingsDialog - + Global git settings can be overridden for each repository in the corresponding repository configuration page. Globale GIT-Einstellungen können für jedes Repository in den entsprechenden Einstellungs-Seiten überschrieben werden. - + Edit Config File... Konfigurations-Datei bearbeiten... - + General Allgemein - + Diff Diff - + Tools Tools - + Window Fenster - + Editor Editor - + Update Update - + Plugins Plugins - + Misc Sonstiges - + Hotkeys Hotkeys - + Terminal Terminal - + Esc @@ -5282,7 +5302,7 @@ Dies reverted den Commit %2. - + Add @@ -5303,43 +5323,48 @@ x (number) determines the number of maximum files shown Entfernen - + + First template will be applied automatically + + + + Up - + Down - + Import - + Export - + Open File - - + + Gittyup Templates (*%1) - + Save Templates - + Replace Ersetzen @@ -5347,23 +5372,23 @@ x (number) determines the number of maximum files shown TerminalPanel - - + + Install Installieren - + Name: Name: - + Location: Ort: - + Uninstall Deinstallieren @@ -5610,38 +5635,38 @@ x (number) determines the number of maximum files shown TreeView - + Directory Ordner - + File Datei - + Remove or discard %1? - + Are you sure you want to remove or discard all changes in '%1'? - + This action cannot be undone. Die Aktion kann nicht rückgängig gemacht werden. - - + + Discard Verwerfen - + discard verwerfe @@ -5741,22 +5766,22 @@ x (number) determines the number of maximum files shown UpdatePanel - + Check for updates automatically Automatisch auf Updates prüfen - + Automatically download and install updates Automatisch Updates herunterladen und installieren - + Check Now Jetzt prüfen - + Software Update: Software-Update: @@ -5932,32 +5957,37 @@ x (number) determines the number of maximum files shown - - Theme: - Thema: - - - - Title: - Titel: - - - - Log: - Log: - - - - Tabs: - Tabs: - - - - View: + + Show Window Maximized when opened + Theme: + Thema: + + + + Title: + Titel: + + + + Log: + Log: + + + + Tabs: + Tabs: + + + + View: + + + + Prompt: Aufforderungen: diff --git a/l10n/gittyup_en.ts b/l10n/gittyup_en.ts index 02d27b99..44992e45 100644 --- a/l10n/gittyup_en.ts +++ b/l10n/gittyup_en.ts @@ -607,160 +607,160 @@ - + <b>Commit Message:</b> - - + + Spell Check Language - + The dictionary '%1' is invalid - + Spell checking is disabled. - + The choosen dictionary '%1.dic' is not a valid hunspell dictionary. - - + + Invalid dictionary '%1.dic' - + Edit User Dictionary - + Stage All - + Unstage All - - + + Commit - + Abort rebasing - + Continue rebasing - + Abort Merge - + %1 - + %1 and %2 - + %1, %2, and %3 - + Merge - + Revert - + Cherry-pick - + Rebase - + Abort %1 - + Commit Rebase - + Nothing staged - + %1 of %2 file staged - + %1 of %2 files staged - + %1 file partially staged - + %1 files partially staged - + %1 unresolved conflict - + %1 unresolved conflicts - + all conflicts resolved - + Commit Merge @@ -768,123 +768,123 @@ CommitList - + Remove Untracked Files - + Apply - + Pop - + Drop - + Unstar - + Star - + Add Tag... - + New Branch... - + Rename Branch - + Delete Branch - + Delete Tag - + Merge... - + Rebase... - + Squash... - + Revert - + Cherry-pick - - + + Checkout %1 - + Checkout - + Local branch is already checked out - + This is a bare repository - + Reset - + Soft - + Mixed - + Hard @@ -892,12 +892,12 @@ CommitModel - + Uncommitted changes - + Checking for uncommitted changes @@ -1168,24 +1168,24 @@ DetailView - - + + Author: - + reset - + Here you can set the author used for committing These settings will not be saved permanently - + Email: @@ -1204,36 +1204,46 @@ These settings will not be saved permanently + Wrap lines + + + + Context lines: - + + Wrap lines: + + + + Character Encoding: - + Ignore Whitespace (-w) - + Added files - + Deleted files - + Whitespace: - + Auto Collapse: @@ -1249,7 +1259,7 @@ These settings will not be saved permanently DiffTreeModel - + Submodule @@ -1257,12 +1267,12 @@ These settings will not be saved permanently DiffView - + Add new file - + Or drag files here to copy into the repository @@ -1270,40 +1280,25 @@ These settings will not be saved permanently DoubleTreeWidget - + Blame - + Show Blame Editor - + Diff - + Show Diff View - - - Single Tree View - - - - - List View - - - - - Hide Untracked Files - - DownloadDialog @@ -1357,47 +1352,57 @@ These settings will not be saved permanently EditorPanel - + + Show whitespace + + + + Tabs - + Spaces - + Show heat map - + Font: - + Font size: - + + Whitespace: + + + + Indent using: - + Indent width: - + Tab width: - + Blame margin: @@ -1782,12 +1787,12 @@ These settings will not be saved permanently - + Discard - + discard @@ -1974,88 +1979,88 @@ These settings will not be saved permanently HunkWidget - + Save - + Undo - + Use Ours - + Use Theirs - + Edit Hunk - + Discard Hunk - + Discard selected lines? - + Are you sure you want to discard the changes in hunk from line %1 to %2 in '%3'? - + Discard selected lines - + Are you sure you want to remove '%1'? - + This action cannot be undone. - - + + Collapse Hunk - - + + Expand Hunk - + Esc - + Fix - + Edit @@ -2313,59 +2318,59 @@ Examples MainWindow - + Invalid Git Repository - + %1 does not contain a valid git repository. - - + + %1 - %2 - + ahead: %1 - + behind: %1 - + up-to-date - - + + %1 (%2) - + MERGING - + REVERTING - + CHERRY-PICKING - + REBASING @@ -2922,12 +2927,12 @@ Examples MiscPanel - + Path to SSH config file: - + Path to default / fallback SSH key file: @@ -3096,32 +3101,32 @@ Examples QObject - + Expand all - + Collapse all - + Staged Files - + Unstaged Files - + Committed Files - + Workdir Files @@ -3130,6 +3135,21 @@ Examples Your global GIT configuration is invalid, Gittyup won't run properly until this is fixed + + + File Name + + + + + Relative Path + + + + + State + + RebaseConflictDialog @@ -3760,650 +3780,650 @@ was added to %1 - + Unable to %1 '%2' - %3 - + Unable to %1 - %2 - + %1 remotes - + Fetch All - + Fetch - - - + + + <i>no remote</i> - + Unable to fetch. No upstream is configured for the current branch, and there isn't a remote called 'origin'. - - + + Fetch canceled. - + fetch from - + You may disable ssl verification <a href='action:sslverifyrepo'>for this repository</a> or overall disable ssl verification <a href='action:sslverifygit'>for all repositories</a>. - - - + + + Everything up-to-date. - - - + + + <i>no branch</i> - + %1 from %2 - + Pull - + <i>no upstream</i> - + Merge - + %1 into %2 - + Fast-forward - + %2 to %1 - - + + Rebase - + %2 on %1 - + The repository is empty. - - + + The current branch '%1' has no upstream branch. - - + + Already up-to-date. - + Unable to fast-forward. - + fast-forward - + You may be able to reconcile your changes with the conflicting files by <a href='action:stash'>stashing</a> before you <a href='%1'>fast-forward</a>. Then <a href='action:unstash'>unstash</a> to restore your changes. - + If you want to create a new merge commit instead of fast-forwarding, you can <a href='%1'>merge without fast-forwarding </a> instead. - - - - + + + + merge - - + + You may be able to rebase by <a href='action:stash'>stashing</a> before trying to <a href='action:merge'>merge</a>. Then <a href='action:unstash'>unstash</a> to restore your changes. - - - + + + Abort - + Some merged files have unstaged changes - + abort merge - - - + + + revert - - - + + + cherry-pick - - - + + + rebase - + Continue ongoing rebase - + Invalid head. - + You may be able to rebase by <a href='action:stash'>stashing</a> before trying to <a href='action:rebase'>rebase</a>. Then <a href='action:unstash'>unstash</a> to restore your changes. - - + + %1/%2 - + %1 - %2 - + Apply - + %1 - %2 <i>already applied</i> - + %1 - %2 as %3 - - - + + + squash - + Revert - + Revert "%1" This reverts commit %2. - + <i>detached HEAD</i> - + %1 on %2 - + Cherry-pick - + Are you sure you want to force push? - + The remote will lose any commits that are reachable only from the overwritten reference. Dropped commits may be unexpectedly reintroduced by clones that already contain those commits locally. - + Force Push - + <i>no reference</i> - + Push - + Push (Force) - - + + %1 to %2 - - + + You are not currently on a branch. - + Create a commit to add the default '%1' branch. - + You can <a href='action:checkout'>checkout</a> a branch then <a href='action:push'>push</a> again, or <a href='action:push-to'>push to an explicit branch</a>. - + The current branch '%1' has no default remote. - + You may want to <a href='action:add-remote?name=origin'>add a remote named 'origin'</a>. Then <a href='action:push?set-upstream=true'>push and set the current branch's upstream</a> to begin tracking a remote branch called 'origin/%1'. - + You can also <a href='action:push-to'>push to an explicit URL</a> if you don't want to track a remote branch. - + To begin tracking a remote branch called '%1', <a href='action:push?set-upstream=true'>push and set the current branch's upstream</a>. - + To push without setting up tracking information, <a href='action:push?ref=%1'>push '%2'</a> explicitly. - + Push canceled. - + push to - + The tag update may cause the remote to lose commits. - + If you want to risk the remote losing commits, you can <a href='action:push?ref=%1&to=%2&force=true'>force push</a>. - + Commit? - + Are you sure you want to commit on a detached HEAD? - + <p>You are in a detached HEAD state. You can still commit, but the new commit will not be reachable from any branch. If you want to commit to an existing branch, checkout the branch first.</p> - - + + Commit - - + + <i>no commit</i> - + commit - + This commit was signed with a generated user name and email. - + Consider setting the user name and email in <a href='action:config?global=true'>global settings</a>. - + If you want to limit the name and email settings to this repository, <a href='action:config'>edit repository settings</a> instead. - + After settings have been updated, <a href='action:amend'> amend this commit</a> to record the new user name and email. - + file - + files - + %1 - %2 %3 - - + + Checkout - + Checkout Detached HEAD? - + Checkout Detached HEAD - + Checking out remote branch '%1' will result in a detached HEAD state. Do you want to reset the existing local branch '%2' to this commit instead? - + Reset Local Branch - + Checking out remote branch '%1' will result in a detached HEAD state. Do you want to create a new local branch called '%2' to track it instead? - + Create a local branch to start tracking remote changes and make new commits. Check out the detached HEAD to temporarily put your working directory into the state of the remote branch. - + Create Local Branch - + checkout - + You may be able to reconcile your changes with the conflicting files by <a href='action:stash'>stashing</a> before you <a href='action:checkout?%1'>checkout '%2'</a>. Then <a href='action:unstash'>unstash</a> to restore your changes. - + New Branch - + create new branch - + (no branch) - + WIP on %1: %2 %3 - + <i>working directory</i> - + Stash - + stash - + Apply Stash - + apply stash - + Drop Stash - + drop stash - + Pop Stash - + pop stash - + %1 as %2 - + Tag - + tag - - + + Amend - + Amending commit %1 - + %1 to %2 update ref - - - - - - + + + + + + Reset - + Are you sure you want to reset '%1' to '%2'? - + <p>Some commits may become unreachable from the current branch.</p> - + <p>Resetting will cause you to lose uncommitted changes. Untracked and ignored files will not be affected.</p> - + <p>Your branch appears to be up-to-date with its upstream branch. Resetting may cause your branch history to diverge from the remote branch history.</p> - - + + amend - + reset - - + + %1 of %2 submodules - - + + Update - - + + update submodule @@ -4413,112 +4433,112 @@ This reverts commit %2. - + Please resolve conflicts before continue - + Conflict - + Rebase finished - + Force Push to %1? - + You may want to integrate remote commits first by <a href='action:pull'>pulling</a>. Then <a href='action:push?to=%1'>push</a> again. - + If you really want the remote to lose commits, you may be able to <a href='action:push?to=%1&force=true'>force push</a>. - + Reset canceled. - + Untouched - + Invalid Submodule Repository - + The submodule '%1' doesn't have a valid repository. You may need to init and/or update the submodule to check out a repository. - + No terminal executable found - + No terminal executable was found. Please configure a terminal in the configuration. - + Open Configuration - + There was a merge conflict. - + Resolve conflicts, then commit to conclude the %1. See <a href='expand'>details</a>. - + Resolve conflicts in each conflicted (!) file in one of the following ways: - + 1. Click the 'Ours' or 'Theirs' button to choose the correct change. Then click the 'Save' button to apply. - + 2. Edit the file in the editor to make a different change. Remember to remove conflict markers. - + 3. Use an external merge tool. Right-click on the files in the list and choose 'External Merge'. - + After all conflicts in the file are resolved, click the check box to mark it as resolved. - + After all conflicted files are staged, commit to conclude the %1. - + You can <a href='action:abort'>abort</a> the %1 to return the repository to its previous state. @@ -4526,12 +4546,12 @@ This reverts commit %2. Repository - + Unknown error - + git-lfs not found @@ -4580,32 +4600,32 @@ This reverts commit %2. Settings - + Prompt to edit stash message before stashing - + Prompt to edit commit message before merging - + Prompt to edit commit message before reverting - + Prompt to edit commit message before cherry-picking - + Prompt to stage directories - + Prompt to stage large files @@ -4613,67 +4633,67 @@ This reverts commit %2. SettingsDialog - + Esc - + Global git settings can be overridden for each repository in the corresponding repository configuration page. - + Edit Config File... - + General - + Diff - + Tools - + Window - + Editor - + Update - + Plugins - + Misc - + Hotkeys - + Terminal @@ -4991,7 +5011,7 @@ This reverts commit %2. - + Add @@ -5012,43 +5032,48 @@ x (number) determines the number of maximum files shown - + + First template will be applied automatically + + + + Up - + Down - + Import - + Export - + Open File - - + + Gittyup Templates (*%1) - + Save Templates - + Replace @@ -5056,23 +5081,23 @@ x (number) determines the number of maximum files shown TerminalPanel - - + + Install - + Name: - + Location: - + Uninstall @@ -5311,38 +5336,38 @@ x (number) determines the number of maximum files shown TreeView - + Directory - + File - + Remove or discard %1? - + Are you sure you want to remove or discard all changes in '%1'? - + This action cannot be undone. - - + + Discard - + discard @@ -5435,22 +5460,22 @@ x (number) determines the number of maximum files shown UpdatePanel - + Check for updates automatically - + Automatically download and install updates - + Check Now - + Software Update: @@ -5622,32 +5647,37 @@ x (number) determines the number of maximum files shown - - Theme: - - - - - Title: - - - - - Log: - - - - - Tabs: - - - - - View: + + Show Window Maximized when opened + Theme: + + + + + Title: + + + + + Log: + + + + + Tabs: + + + + + View: + + + + Prompt: diff --git a/l10n/gittyup_es.ts b/l10n/gittyup_es.ts index 723d361c..18a52ad0 100644 --- a/l10n/gittyup_es.ts +++ b/l10n/gittyup_es.ts @@ -632,115 +632,115 @@ - + <b>Commit Message:</b> <b>Mensaje de Confirmación:</b> - - + + Spell Check Language Idioma del Corrector Ortográfico - + The dictionary '%1' is invalid El diccionario '%1' es inválido - + Spell checking is disabled. La corrección ortográfica está deshabilitada. - + The choosen dictionary '%1.dic' is not a valid hunspell dictionary. El diccionario elegido '%1.dic' no es un diccionario hunspell válido. - - + + Invalid dictionary '%1.dic' Diccionario inválido, '%1.dic' - + Edit User Dictionary Editar el Dicccionario de Usuario - + Stage All Preparar Todo - + Unstage All No Preparar Nada - - + + Commit Confirmar - + Abort rebasing - + Continue rebasing - + Abort Merge Abortar Fusión - + %1 %1 / %2 {1?} - + %1 and %2 - + %1, %2, and %3 - + Merge Fusionar - + Revert Revertir - + Cherry-pick Escoger - + Rebase Reorganizar - + Abort %1 Abortar %1 - + Commit Rebase @@ -761,47 +761,47 @@ Actualizar %1, %2 y %3 más archivos... - + Nothing staged Nada preparado - + %1 of %2 file staged Archivo preparado: %1 de %2 - + %1 of %2 files staged Archivo preparado: %1 de %2 - + %1 file partially staged %1 archivo parcialmente preparado - + %1 files partially staged %1 archivos parcialmente preparados - + %1 unresolved conflict %1 conflicto sin resolver - + %1 unresolved conflicts %1 conflictos sin resolver - + all conflicts resolved todos los conflictos resueltos - + Commit Merge Confirmación de Fusión @@ -809,42 +809,42 @@ CommitList - + Remove Untracked Files Remover archivos sin seguimiento - + Apply Aplicar - + Pop Retirar - + Drop Soltar - + Unstar Desmarcar como favorito - + Star Marcar como favorito - + Add Tag... Agregar etiqueta... - + New Branch... Nueva rama... @@ -857,83 +857,83 @@ Borrar Rama %1 - + Rename Branch - + Delete Branch - + Delete Tag Borrar Etiqueta - + Merge... Fusionar... - + Rebase... Reorganizar... - + Squash... Aplastar... - + Revert Revertir - + Cherry-pick Escoger - - + + Checkout %1 Revisar %1 - + Checkout Revisar - + Local branch is already checked out La rama local ya está revisada - + This is a bare repository Este es un repositorio vacío - + Reset Reestablecer - + Soft Suave - + Mixed Mezclado - + Hard Duro @@ -941,12 +941,12 @@ CommitModel - + Uncommitted changes Cambios sin confirmar - + Checking for uncommitted changes Revisando por cambios sin confirmar @@ -1221,24 +1221,24 @@ DetailView - - + + Author: Autor: - + reset reestablecer - + Here you can set the author used for committing These settings will not be saved permanently - + Email: Correo electrónico: @@ -1257,36 +1257,46 @@ These settings will not be saved permanently + Wrap lines + + + + Context lines: líneas de contexto: - + + Wrap lines: + + + + Character Encoding: Codificación de Caracteres: - + Ignore Whitespace (-w) Ignorar Espacio en Blanco (-w) - + Added files Archivos añadidos - + Deleted files Archivos borrados - + Whitespace: Espacio en blanco: - + Auto Collapse: Auto-ocultar: @@ -1302,7 +1312,7 @@ These settings will not be saved permanently DiffTreeModel - + Submodule Submódulo @@ -1310,12 +1320,12 @@ These settings will not be saved permanently DiffView - + Add new file Añadir nuevo archivo - + Or drag files here to copy into the repository O arrastra archivos aquí para copiarlos al repositorio @@ -1323,40 +1333,25 @@ These settings will not be saved permanently DoubleTreeWidget - + Blame - + Show Blame Editor - + Diff Diferencia - + Show Diff View Mostrar Vista de Diferencias - - - Single Tree View - - - - - List View - - - - - Hide Untracked Files - - DownloadDialog @@ -1410,47 +1405,57 @@ These settings will not be saved permanently EditorPanel - + + Show whitespace + + + + Tabs Pestañas - + Spaces Espacios - + Show heat map Mostrar mapa de calor - + Font: Fuente: - + Font size: Tamaño de fuente: - + + Whitespace: + Espacio en blanco: + + + Indent using: Indentar usando: - + Indent width: Ancho de indentación: - + Tab width: Ancho de la tabulación: - + Blame margin: Márgen de culpa: @@ -1902,12 +1907,12 @@ These settings will not be saved permanently Descartar Cambios - + Discard Descartar - + discard descartar @@ -2125,51 +2130,51 @@ These settings will not be saved permanently HunkWidget - + Save Guardar - + Undo Deshacer - + Use Ours Usar nuestro - + Use Theirs Usar el de ellos - + Edit Hunk Editar una parte - + Discard Hunk Descartar parte - + Discard selected lines? - + Are you sure you want to discard the changes in hunk from line %1 to %2 in '%3'? - + Discard selected lines @@ -2178,7 +2183,7 @@ These settings will not be saved permanently ¿Descartar parte? - + Are you sure you want to remove '%1'? ¿Estás seguro que deseas remover %1? @@ -2187,34 +2192,34 @@ These settings will not be saved permanently ¿Estás seguro que quieres descartar la parte que comienza en la línea %1 en %2? - + This action cannot be undone. Esta acción no puede ser deshecha. - - + + Collapse Hunk Ocultar parte - - + + Expand Hunk Expandir parte - + Esc - + Fix Solucionar - + Edit Editar @@ -2483,59 +2488,59 @@ Ejemplos MainWindow - + Invalid Git Repository Repositorio Git Inválido - + %1 does not contain a valid git repository. %1 no contiene un repositorio git válido. - - + + %1 - %2 %1 - %2 - + ahead: %1 adelante: %1 - + behind: %1 atrás: %1 - + up-to-date actualizado - - + + %1 (%2) %1 (%2) - + MERGING FUSIONANDO - + REVERTING REVIRTIENDO - + CHERRY-PICKING ESCOGIENDO - + REBASING REORGANIZANDO @@ -3204,12 +3209,12 @@ Ejemplos MiscPanel - + Path to SSH config file: Ruta al fichero de configuración SSH: - + Path to default / fallback SSH key file: Ruta a la clave SSH por Defecto/Respaldo: @@ -3378,32 +3383,32 @@ Ejemplos QObject - + Expand all - + Collapse all - + Staged Files - + Unstaged Files - + Committed Files - + Workdir Files @@ -3412,6 +3417,21 @@ Ejemplos Your global GIT configuration is invalid, Gittyup won't run properly until this is fixed + + + File Name + + + + + Relative Path + + + + + State + + RebaseConflictDialog @@ -4050,235 +4070,235 @@ was added to %1 - + Unable to %1 '%2' - %3 No es posible %1 %2 - %3 - + Unable to %1 - %2 No es posible %1 - %2 - + %1 remotes %1 remotos - + Fetch All Traer Todo - + Fetch Traer - - - + + + <i>no remote</i> <i>sin remoto</i> - + Unable to fetch. No upstream is configured for the current branch, and there isn't a remote called 'origin'. No se puede traet. No hay rama a seguir configurada para la rama actual, y no hay un remoto llamado 'origin'. - - + + Fetch canceled. Traer cancelado. - + fetch from Traer desde - + You may disable ssl verification <a href='action:sslverifyrepo'>for this repository</a> or overall disable ssl verification <a href='action:sslverifygit'>for all repositories</a>. - - - + + + Everything up-to-date. Todo está actualizado. - - - + + + <i>no branch</i> <i>sin rama</i> - + %1 from %2 %1 desde %2 - + Pull Combinar - + <i>no upstream</i> <i>sin rama a seguir</i> - + Merge Fusionar - + %1 into %2 %1 en %2 - + Fast-forward Adelantar - + %2 to %1 %2 para %1 - - + + Rebase Reorganizar - + %2 on %1 %2 sobre %1 - + The repository is empty. El repositorio está vacío. - - + + The current branch '%1' has no upstream branch. la rama actual %1 no tiene rama a seguir. - - + + Already up-to-date. Ya está actualizado. - + Unable to fast-forward. No se puede adelantar. - + fast-forward adelantar - + You may be able to reconcile your changes with the conflicting files by <a href='action:stash'>stashing</a> before you <a href='%1'>fast-forward</a>. Then <a href='action:unstash'>unstash</a> to restore your changes. Puedes reconciliar tus cambios con los archivos en conflicto <a href='action:stash'>haciendo un guardado rápido</a> antes de <a href='%1'>adelantar</a>. Después, <a href='action:unstash'>recupera el guardado</a> para reestablecer tus cambios. - + If you want to create a new merge commit instead of fast-forwarding, you can <a href='%1'>merge without fast-forwarding </a> instead. Si quieres crear una nueva confirmación de fusión en lugar de adelantar, puedes <a href='%1'>fusionar sin adelantar</a> en su lugar. - - - - + + + + merge fusionar - - + + You may be able to rebase by <a href='action:stash'>stashing</a> before trying to <a href='action:merge'>merge</a>. Then <a href='action:unstash'>unstash</a> to restore your changes. Puedes reorganizar <a href='action:stash'>haciendo un guardado rápido</a> antes de <a href='action:merge'>fusionar</a>. Después, <a href='action:unstash'>recupera el guardado</a> para reestablecer tus cambios. - - - + + + Abort Abortar - + Some merged files have unstaged changes Algunos archivos fusionados tienen cambios sin preparar - + abort merge abortar fusión - - - + + + revert revertir - - - + + + cherry-pick escoger - - - + + + rebase reorganizar - + Continue ongoing rebase - + Invalid head. - + You may be able to rebase by <a href='action:stash'>stashing</a> before trying to <a href='action:rebase'>rebase</a>. Then <a href='action:unstash'>unstash</a> to restore your changes. Puedes reorganizar <a href='action:stash'>haciendo un guardado rápido</a> antes de <a href='action:rebase'>reorganizar</a>. Después, <a href='action:unstash'>recupera el guardado</a> para reestablecer tus cambios. - - + + %1/%2 %1 / %2 - + %1 - %2 %1 - %2 - + Apply Aplicar @@ -4287,29 +4307,29 @@ was added to %1 Hubo un conflicto de fusión. La reorganización ha sido abortada - + %1 - %2 <i>already applied</i> %1 - %2 <i>ya se ha aplicado</i> - + %1 - %2 as %3 %1 - %2 como %3 - - - + + + squash aplastar - + Revert Revertir - + Revert "%1" This reverts commit %2. @@ -4318,17 +4338,17 @@ This reverts commit %2. Esto revierte la confirmación %2. - + <i>detached HEAD</i> <i>HEAD separado</i> - + %1 on %2 %1 sobre %2 - + Cherry-pick Escoger @@ -4337,99 +4357,99 @@ Esto revierte la confirmación %2. ¿Forzar Envío? - + Are you sure you want to force push? ¿Estás seguro que deseas forzar el envío? - + The remote will lose any commits that are reachable only from the overwritten reference. Dropped commits may be unexpectedly reintroduced by clones that already contain those commits locally. El remoto perderá cualquier confirmación que solo es alcanzable desde la referencia sobreescrita. Las confirmaciones descartadas podrían ser reintroducidas inesperadamente por clones que ya tengan esas confirmaciones localmente. - + Force Push Forzar Envío - + <i>no reference</i> <i>sin referencia</i> - + Push Enviar - + Push (Force) Envío (Forzar) - - + + %1 to %2 %1 para %2 - - + + You are not currently on a branch. No estás actualmente en una rama. - + Create a commit to add the default '%1' branch. Crea una confirmación para añadir la rama %1 por defecto. - + You can <a href='action:checkout'>checkout</a> a branch then <a href='action:push'>push</a> again, or <a href='action:push-to'>push to an explicit branch</a>. Tu puedes <a href='action:checkout'>revisar</a> una rama y depués <a href='action:push'>enviar</a> de nuevo, o <a href='action:push-to'>enviar a una rama explícita</a>. - + The current branch '%1' has no default remote. la rama actual %1 no tiene remoto por defecto. - + You may want to <a href='action:add-remote?name=origin'>add a remote named 'origin'</a>. Then <a href='action:push?set-upstream=true'>push and set the current branch's upstream</a> to begin tracking a remote branch called 'origin/%1'. Tu podrías querer <a href='action:add-remote?name=origin'>añadir un remoto llamado 'origin'</a>. Después <a href='action:push?set-upstream=true'>envía y configura la rama a seguir</a> para empezar a seguir una rama remota llamada 'origin/%1'. - + You can also <a href='action:push-to'>push to an explicit URL</a> if you don't want to track a remote branch. Tu también puedes <a href='action:push-to'>enviar a una URL explícita</a> si no quieres seguir una rama remota. - + To begin tracking a remote branch called '%1', <a href='action:push?set-upstream=true'>push and set the current branch's upstream</a>. Para empezar a seguir una rama remota llamada '%1', <a href='action:push?set-upstream=true'>envía y configura la rama a seguir</a>. - + To push without setting up tracking information, <a href='action:push?ref=%1'>push '%2'</a> explicitly. Para enviar sin configurar información de seguimiento, <a href='action:push?ref=%1'>envía '%2'</a> explícitamente. - + Push canceled. Envío cancelado. - + push to enviar a - + The tag update may cause the remote to lose commits. La actualización de la etiqueta puede causar que el remoto pierda confirmaciones. - + If you want to risk the remote losing commits, you can <a href='action:push?ref=%1&to=%2&force=true'>force push</a>. Si quieres arriesgar que el remoto pierda confirmaciones, tu puedes <a href='action:push?ref=%1&to=%2&force=true'>forzar el envío</a>. @@ -4442,227 +4462,227 @@ Esto revierte la confirmación %2. Si realmente que el remoto pierda confirmaciones. tu podrías <a href='action:push?force=true'>forzar el envío</a>. - + Commit? ¿Confirmar? - + Are you sure you want to commit on a detached HEAD? ¿Estás seguro que quieres confirmar en un HEAD separado? - + <p>You are in a detached HEAD state. You can still commit, but the new commit will not be reachable from any branch. If you want to commit to an existing branch, checkout the branch first.</p> <p>Estás en un estado separado de HEAD. Aun así, puedes confirmar, pero la nueva confirmación no será alcanzable desde ninguna rama. Si quieres confirmar a una rama existente, revisa primero la rama.</p> - - + + Commit Confirmar - - + + <i>no commit</i> <i>sin confirmación</i> - + commit confirmar - + This commit was signed with a generated user name and email. Esta confirmación fue firmada con un nombre de usuario y correo electrónico generado. - + Consider setting the user name and email in <a href='action:config?global=true'>global settings</a>. Considera configurar el nombre de usuario y correo electrónico en <a href='action:config?global=true'>configuración global</a>. - + If you want to limit the name and email settings to this repository, <a href='action:config'>edit repository settings</a> instead. Si quieres limitar la configuración de nombre y correo electrónico a este repositorio, <a href='action:config'>edita la configuración de repositorio</a>. - + After settings have been updated, <a href='action:amend'> amend this commit</a> to record the new user name and email. Después que la configuración haya sido actualizada, <a href='action:amend'>enmienda esta confirmación</a> para registrar el nuevo nombre de usuario y correo electrónico. - + file archivo - + files archivos - + %1 - %2 %3 %1 - %2 %3 - - + + Checkout Revisar - + Checkout Detached HEAD? ¿Revisar HEAD separado? - + Checkout Detached HEAD Revisar HEAD separado - + Checking out remote branch '%1' will result in a detached HEAD state. Do you want to reset the existing local branch '%2' to this commit instead? Revisar la rama remota '%1' resultará en un estado de HEAD separado . ¿Quieres restaurar la rama local existente '%2' a esta confirmación en su lugar? - + Reset Local Branch Restaurar Rama Local - + Checking out remote branch '%1' will result in a detached HEAD state. Do you want to create a new local branch called '%2' to track it instead? Revisar la rama remota '%1' resultará en un estado de HEAD separado . ¿Quieres crear una nueva rama local llamada '%2' para seguirla en su lugar? - + Create a local branch to start tracking remote changes and make new commits. Check out the detached HEAD to temporarily put your working directory into the state of the remote branch. Crea una rama local para empezar a seguir los cambios remotos y hacer nuevas confirmaciones. Revisa el HEAD separado para poner tu directorio de trabajo en el estado de la rama remota temporalmente. - + Create Local Branch Crear Rama Local - + checkout revisar - + You may be able to reconcile your changes with the conflicting files by <a href='action:stash'>stashing</a> before you <a href='action:checkout?%1'>checkout '%2'</a>. Then <a href='action:unstash'>unstash</a> to restore your changes. Puedes reconciliar tus cambios con los archivos en conflicto <a href='action:stash'>haciendo un guardado rápido</a> antes de <a href='action:checkout?%1'>revisar '%2'</a>. Después, <a href='action:unstash'>recupera el guardado</a> para reestablecer tus cambios. - + New Branch Nueva rama - + create new branch crear nueva rama - + (no branch) (sin rama) - + WIP on %1: %2 %3 WIP en %1: %2 %3 - + <i>working directory</i> <i>directorio de trabajo</i> - + Stash Guardado rápido - + stash guardado rápido - + Apply Stash Aplicar guardado rápido - + apply stash aplicar guardado rápido - + Drop Stash Descartar guardado rápido - + drop stash descartar guardado rápido - + Pop Stash Sacar Guardado Rápido - + pop stash sacar Guardado Rápido - + %1 as %2 %1 como %2 - + Tag Etiqueta - + tag etiqueta - - + + Amend Enmendar - + Amending commit %1 - + %1 to %2 update ref %1 para %2 - - - - - - + + + + + + Reset Reestablecer @@ -4679,51 +4699,51 @@ Esto revierte la confirmación %2. ¿Estás seguro que deseas enmendar %1? - + Are you sure you want to reset '%1' to '%2'? ¿Estás seguro que deseas reestablecer '%1' a '%2'? - + <p>Some commits may become unreachable from the current branch.</p> <p>Algunas confirmaciones pueden quedar inalcanzables desde la rama actual.</p> - + <p>Resetting will cause you to lose uncommitted changes. Untracked and ignored files will not be affected.</p> <p>Reestablecer causará que pierdas todos los cambios que no se han confirmado. Los archivos sin seguimiento e ignorados no serán afectados</p> - + <p>Your branch appears to be up-to-date with its upstream branch. Resetting may cause your branch history to diverge from the remote branch history.</p> <p>Tu rama parece estar actualizada con la rama que sigue. Reestablecer puede causar que tu historial de rama difiera del historial de la rama remota.</p> - - + + amend enmendar - + reset reestablecer - - + + %1 of %2 submodules %1 de %2 submódulos - - + + Update Actualizar - - + + update submodule Actualizar submódulo @@ -4733,112 +4753,112 @@ Esto revierte la confirmación %2. - + Please resolve conflicts before continue - + Conflict - + Rebase finished - + Force Push to %1? - + You may want to integrate remote commits first by <a href='action:pull'>pulling</a>. Then <a href='action:push?to=%1'>push</a> again. - + If you really want the remote to lose commits, you may be able to <a href='action:push?to=%1&force=true'>force push</a>. - + Reset canceled. - + Untouched - + Invalid Submodule Repository Repositorio de Submódulo inválido - + The submodule '%1' doesn't have a valid repository. You may need to init and/or update the submodule to check out a repository. El submódulo '%1' no tiene un repositorio válido. Podrías necesitar inicializar y/o actualizar el submódulo para que revise un repositorio. - + No terminal executable found - + No terminal executable was found. Please configure a terminal in the configuration. - + Open Configuration - + There was a merge conflict. Hubo un conflicto de fusión. - + Resolve conflicts, then commit to conclude the %1. See <a href='expand'>details</a>. Resuelve los conflictos, después confirma para concluir la %1. Ver <a href='expand'>detalles</a>. - + Resolve conflicts in each conflicted (!) file in one of the following ways: Resuelve los conflictos en cada archivo con conflicto (!) de una de las siguientes maneras: - + 1. Click the 'Ours' or 'Theirs' button to choose the correct change. Then click the 'Save' button to apply. 1. Presiona el botón 'Nuestro' o 'De Ellos' para escoger el cambio correcto. Después presiona el botón 'Guardar' para aplicar. - + 2. Edit the file in the editor to make a different change. Remember to remove conflict markers. 2. Edita el archivo en el editor para hacer un cambio diferente. Recuerda remover las marcas de conflicto. - + 3. Use an external merge tool. Right-click on the files in the list and choose 'External Merge'. 3. Usa una herramienta externa de fusión. Click derecho sobre los archivos de la liste y escoge 'Fusión externa'. - + After all conflicts in the file are resolved, click the check box to mark it as resolved. Después de resolver todos los conflictos en el archivo, márcalo como resuelto. - + After all conflicted files are staged, commit to conclude the %1. Después de preparar todos los archivos en conflicto, realiza una confirmación para concluir la %1. - + You can <a href='action:abort'>abort</a> the %1 to return the repository to its previous state. Tu puedes <a href='action:abort'>abortar</a>la %1 para retornar el repositorio a su estado previo. @@ -4846,12 +4866,12 @@ Esto revierte la confirmación %2. Repository - + Unknown error Error desconocido - + git-lfs not found git LFS no encontrado @@ -4900,32 +4920,32 @@ Esto revierte la confirmación %2. Settings - + Prompt to edit stash message before stashing Preguntar para editar el mensaje de guardado rápido antes de hacerlo - + Prompt to edit commit message before merging Preguntar para editar el mensaje de confirmación antes de fusionar - + Prompt to edit commit message before reverting Preguntar para editar el mensaje de guardado rápido antes de revertir - + Prompt to edit commit message before cherry-picking Preguntar para editar el mensaje de confirmación antes de escoger - + Prompt to stage directories Preguntar al preparar directorios - + Prompt to stage large files Preguntar al preparar ficheros pesados @@ -4933,67 +4953,67 @@ Esto revierte la confirmación %2. SettingsDialog - + Esc - + Global git settings can be overridden for each repository in the corresponding repository configuration page. La configuración global de git puede ser anulada por cada repositorio en la página de configuración de repositorio correspondiente. - + Edit Config File... Editar Archivo de Configuración... - + General General - + Diff Diferencia - + Tools Herramientas - + Window Ventana - + Editor Editor - + Update Actualizar - + Plugins - + Misc Varios - + Hotkeys - + Terminal @@ -5311,7 +5331,7 @@ Esto revierte la confirmación %2. - + Add @@ -5332,43 +5352,48 @@ x (number) determines the number of maximum files shown Remover - + + First template will be applied automatically + + + + Up - + Down - + Import - + Export - + Open File - - + + Gittyup Templates (*%1) - + Save Templates - + Replace Reemplazar @@ -5376,23 +5401,23 @@ x (number) determines the number of maximum files shown TerminalPanel - - + + Install Instalar - + Name: Nombre: - + Location: Ubicación: - + Uninstall Desinstalar @@ -5639,38 +5664,38 @@ x (number) determines the number of maximum files shown TreeView - + Directory Directorio - + File Archivo - + Remove or discard %1? - + Are you sure you want to remove or discard all changes in '%1'? - + This action cannot be undone. Esta acción no puede ser deshecha. - - + + Discard Descartar - + discard descartar @@ -5763,22 +5788,22 @@ x (number) determines the number of maximum files shown UpdatePanel - + Check for updates automatically Revisar por actualizaciones automáticamente - + Automatically download and install updates Descargar e instalar actualizaciones automáticamente - + Check Now Revisar Ahora - + Software Update: Actualización de Software: @@ -5954,32 +5979,37 @@ x (number) determines the number of maximum files shown - - Theme: - Tema: - - - - Title: - Título: - - - - Log: - Histórico: - - - - Tabs: - Pestañas: - - - - View: + + Show Window Maximized when opened + Theme: + Tema: + + + + Title: + Título: + + + + Log: + Histórico: + + + + Tabs: + Pestañas: + + + + View: + + + + Prompt: Pregunta: diff --git a/l10n/gittyup_ja.ts b/l10n/gittyup_ja.ts index a08a443c..b2ed9212 100644 --- a/l10n/gittyup_ja.ts +++ b/l10n/gittyup_ja.ts @@ -629,115 +629,115 @@ - + <b>Commit Message:</b> <b>コミットの説明:</b> - - + + Spell Check Language スペルチェックの言語 - + The dictionary '%1' is invalid 辞書 '%1' が無効です - + Spell checking is disabled. スペルチェックは無効化されました。 - + The choosen dictionary '%1.dic' is not a valid hunspell dictionary. 指定された辞書 '%1.dic' は有効な hunspell 辞書ではありません。 - - + + Invalid dictionary '%1.dic' 無効な辞書 '%1.dic' - + Edit User Dictionary ユーザー辞書を編集 - + Stage All 全てステージに上げる - + Unstage All 全てステージから降ろす - - + + Commit コミット - + Abort rebasing - + Continue rebasing - + Abort Merge マージを中断 - + %1 %1 - + %1 and %2 - + %1, %2, and %3 - + Merge マージ - + Revert - + Cherry-pick - + Rebase リベース - + Abort %1 %1を中断 - + Commit Rebase @@ -758,47 +758,47 @@ %1, %2, 他 %3 個のファイルの更新... - + Nothing staged ステージ上に項目なし - + %1 of %2 file staged %1 / %2 個のファイルをステージに上げました - + %1 of %2 files staged %1 / %2 個のファイルをステージに上げました - + %1 file partially staged %1 個のファイル一部分をステージに上げました - + %1 files partially staged %1 個のファイル一部分をステージに上げました - + %1 unresolved conflict %1 件の衝突が未解決です - + %1 unresolved conflicts %1 件の衝突が未解決です - + all conflicts resolved 全ての衝突を解決しました - + Commit Merge マージをコミット @@ -806,42 +806,42 @@ CommitList - + Remove Untracked Files 未追跡のファイルを削除 - + Apply 適用 - + Pop 引き出す - + Drop 削除 - + Unstar スターを外す - + Star スターを付ける - + Add Tag... タグを追加... - + New Branch... 新しいブランチ... @@ -854,83 +854,83 @@ ブランチ %1 を削除 - + Rename Branch - + Delete Branch - + Delete Tag タグを削除 - + Merge... マージ... - + Rebase... リベース... - + Squash... スカッシュ... - + Revert 取り消す - + Cherry-pick 取り込む - - + + Checkout %1 %1 をチェックアウト - + Checkout チェックアウト - + Local branch is already checked out ローカルブランチは既にチェックアウトされています - + This is a bare repository これはベアリポジトリです - + Reset リセット - + Soft 作業対象のリビジョンのみ - + Mixed 作業対象のリビジョンとステージ上の項目 - + Hard 作業ツリーを含む全て @@ -938,12 +938,12 @@ CommitModel - + Uncommitted changes コミットされていない変更 - + Checking for uncommitted changes コミットされていない変更を確認しています @@ -1218,24 +1218,24 @@ DetailView - - + + Author: 作者: - + reset リセット - + Here you can set the author used for committing These settings will not be saved permanently - + Email: E メール: @@ -1254,36 +1254,46 @@ These settings will not be saved permanently + Wrap lines + + + + Context lines: 周辺の行数: - + + Wrap lines: + + + + Character Encoding: 文字エンコード: - + Ignore Whitespace (-w) 空白を無視 (-w) - + Added files 追加されたファイル - + Deleted files 削除されたファイル - + Whitespace: 空白: - + Auto Collapse: 自動折り畳み: @@ -1299,7 +1309,7 @@ These settings will not be saved permanently DiffTreeModel - + Submodule サブモジュール @@ -1307,12 +1317,12 @@ These settings will not be saved permanently DiffView - + Add new file 新しいファイルを追加 - + Or drag files here to copy into the repository または、ここにファイルをドラッグして、リポジトリへコピーします @@ -1320,40 +1330,25 @@ These settings will not be saved permanently DoubleTreeWidget - + Blame - + Show Blame Editor - + Diff 差分 - + Show Diff View 差分ビューを表示 - - - Single Tree View - - - - - List View - - - - - Hide Untracked Files - - DownloadDialog @@ -1407,47 +1402,57 @@ These settings will not be saved permanently EditorPanel - + + Show whitespace + + + + Tabs タブ - + Spaces スペース - + Show heat map ヒートマップを表示 - + Font: フォント: - + Font size: フォントの大きさ: - + + Whitespace: + 空白: + + + Indent using: インデント文字: - + Indent width: インデントの幅: - + Tab width: タブの幅: - + Blame margin: 執筆者の履歴: @@ -1899,12 +1904,12 @@ These settings will not be saved permanently 変更を破棄 - + Discard 破棄 - + discard 破棄 @@ -2122,51 +2127,51 @@ These settings will not be saved permanently HunkWidget - + Save 保存 - + Undo 元に戻す - + Use Ours 手元のものを使う - + Use Theirs 向こうのものを使う - + Edit Hunk 差分を編集 - + Discard Hunk 差分を破棄 - + Discard selected lines? - + Are you sure you want to discard the changes in hunk from line %1 to %2 in '%3'? - + Discard selected lines @@ -2175,7 +2180,7 @@ These settings will not be saved permanently 差分を破棄しますか? - + Are you sure you want to remove '%1'? '%1' を削除しますか? @@ -2184,34 +2189,34 @@ These settings will not be saved permanently '%2' の差分内容 (開始行 %1) を破棄しますか? - + This action cannot be undone. この操作は元に戻せません。 - - + + Collapse Hunk 差分内容を折り畳む - - + + Expand Hunk 差分内容を広げる - + Esc Esc - + Fix 修正 - + Edit 編集 @@ -2480,59 +2485,59 @@ Examples MainWindow - + Invalid Git Repository 無効な Git リポジトリ - + %1 does not contain a valid git repository. %1 には有効な Git リポジトリが含まれていません。 - - + + %1 - %2 %1 - %2 - + ahead: %1 手元のブランチに %1 コミット済み - + behind: %1 向こうのブランチに新しく %1 コミットあり - + up-to-date 最新 - - + + %1 (%2) %1 (%2) - + MERGING マージ作業中 - + REVERTING コミットの取り消し作業中 - + CHERRY-PICKING コミットの取り込み作業中 - + REBASING リベース作業中 @@ -3193,12 +3198,12 @@ Examples MiscPanel - + Path to SSH config file: SSH 構成ファイルへのパス: - + Path to default / fallback SSH key file: 既定 / フォールバックの SSH 鍵ファイルへのパス: @@ -3367,32 +3372,32 @@ Examples QObject - + Expand all - + Collapse all - + Staged Files - + Unstaged Files - + Committed Files - + Workdir Files @@ -3401,6 +3406,21 @@ Examples Your global GIT configuration is invalid, Gittyup won't run properly until this is fixed + + + File Name + + + + + Relative Path + + + + + State + + RebaseConflictDialog @@ -4035,235 +4055,235 @@ was added to %1 - + Unable to %1 '%2' - %3 %1できませんでした: '%2' - %3 - + Unable to %1 - %2 %1できませんでした - %2 - + %1 remotes %1 個のリモート - + Fetch All 全てフェッチ - + Fetch フェッチ - - - + + + <i>no remote</i> <i>リモートなし</i> - + Unable to fetch. No upstream is configured for the current branch, and there isn't a remote called 'origin'. フェッチできませんでした。現在のブランチに上流が設定されておらず、'origin' というリモートもありません。 - - + + Fetch canceled. フェッチをキャンセルしました。 - + fetch from リモートからフェッチ - + You may disable ssl verification <a href='action:sslverifyrepo'>for this repository</a> or overall disable ssl verification <a href='action:sslverifygit'>for all repositories</a>. - - - + + + Everything up-to-date. 全て最新です。 - - - + + + <i>no branch</i> <i>ブランチなし</i> - + %1 from %2 %2 から %1 へ - + Pull プル - + <i>no upstream</i> <i>上流なし</i> - + Merge マージ - + %1 into %2 %1 を %2 へ - + Fast-forward 高速転送 - + %2 to %1 %2 を %1 へ - - + + Rebase リベース - + %2 on %1 %2 を %1 で - + The repository is empty. リポジトリが空です。 - - + + The current branch '%1' has no upstream branch. 現在のブランチ '%1' には上流のブランチがありません。 - - + + Already up-to-date. 既に最新です。 - + Unable to fast-forward. 高速転送できませんでした。 - + fast-forward 高速転送 - + You may be able to reconcile your changes with the conflicting files by <a href='action:stash'>stashing</a> before you <a href='%1'>fast-forward</a>. Then <a href='action:unstash'>unstash</a> to restore your changes. <a href='%1'>高速転送</a>する前に<a href='action:stash'>スタッシュへ預ける</a>ことで、衝突したファイルへの変更を調整できるかもしれません。今までに行った変更は、後で<a href='action:unstash'>スタッシュから引き出して</a>復元できます。 - + If you want to create a new merge commit instead of fast-forwarding, you can <a href='%1'>merge without fast-forwarding </a> instead. 新しいマージコミットを、高速転送せずに作成したい場合は、代わりに<a href='%1'>マージ (高速転送しない)</a>を使用できます。 - - - - + + + + merge マージ - - + + You may be able to rebase by <a href='action:stash'>stashing</a> before trying to <a href='action:merge'>merge</a>. Then <a href='action:unstash'>unstash</a> to restore your changes. <a href='action:merge'>マージ</a>する前に<a href='action:stash'>スタッシュへ預ける</a>ことで、リベースできるかもしれません。今までに行った変更は、後で<a href='action:unstash'>スタッシュから引き出して</a>復元できます。 - - - + + + Abort 中断 - + Some merged files have unstaged changes マージしたファイルのいくつかの変更が、まだステージに上がっていません - + abort merge マージを中断 - - - + + + revert 取り消し - - - + + + cherry-pick 取り込み - - - + + + rebase リベース - + Continue ongoing rebase - + Invalid head. - + You may be able to rebase by <a href='action:stash'>stashing</a> before trying to <a href='action:rebase'>rebase</a>. Then <a href='action:unstash'>unstash</a> to restore your changes. <a href='action:rebase'>リベース</a>する前に<a href='action:stash'>スタッシュへ預ける</a>ことで、リベースできるかもしれません。今までに行った変更は、後で<a href='action:unstash'>スタッシュから引き出して</a>復元できます。 - - + + %1/%2 %1/%2 - + %1 - %2 %1 - %2 - + Apply 適用 @@ -4272,29 +4292,29 @@ was added to %1 マージに衝突があります。リベースを中断しました - + %1 - %2 <i>already applied</i> %1 - %2 <i>既に適用されています</i> - + %1 - %2 as %3 %1 - %2 を %3 として - - - + + + squash スカッシュ - + Revert 取り消し - + Revert "%1" This reverts commit %2. @@ -4303,17 +4323,17 @@ This reverts commit %2. コミット %2 を取り消しました。 - + <i>detached HEAD</i> <i>作業中のリビジョン</i> - + %1 on %2 %2 に %1 を - + Cherry-pick 取り込み @@ -4322,99 +4342,99 @@ This reverts commit %2. 強制プッシュしますか? - + Are you sure you want to force push? 強制的にプッシュしますか? - + The remote will lose any commits that are reachable only from the overwritten reference. Dropped commits may be unexpectedly reintroduced by clones that already contain those commits locally. 上書きされた参照からでしか辿ることのできないコミットは、リモート上で一切利用できなくなります。また、ここでコミットを削除したとしても、クローンされた他のリポジトリにはコミットが残っているかもしれないため、不意に再度混入することもあり得ます。 - + Force Push 強制プッシュ - + <i>no reference</i> <i>参照なし</i> - + Push プッシュ - + Push (Force) プッシュ (強制) - - + + %1 to %2 %1 を %2 へ - - + + You are not currently on a branch. 現在どのブランチも選択されていません。 - + Create a commit to add the default '%1' branch. 既定のブランチ '%1' を追加するには、コミットを作成します。 - + You can <a href='action:checkout'>checkout</a> a branch then <a href='action:push'>push</a> again, or <a href='action:push-to'>push to an explicit branch</a>. ブランチを<a href='action:checkout'>チェックアウト</a>した後に、再度<a href='action:push'>プッシュ</a>できます。また、<a href='action:push-to'>明示的なブランチへプッシュ</a>することもできます。 - + The current branch '%1' has no default remote. 現在のブランチ '%1' には既定のリモートがありません。 - + You may want to <a href='action:add-remote?name=origin'>add a remote named 'origin'</a>. Then <a href='action:push?set-upstream=true'>push and set the current branch's upstream</a> to begin tracking a remote branch called 'origin/%1'. <a href='action:add-remote?name=origin'>'origin' という名前のリモートを追加</a>して、<a href='action:push?set-upstream=true'>現在のブランチをプッシュ、上流を設定</a>することにより、リモートブランチ 'origin/%1' の追跡を開始できます。 - + You can also <a href='action:push-to'>push to an explicit URL</a> if you don't want to track a remote branch. また、<a href='action:push-to'>明示的な URL へプッシュ</a>して、リモートブランチを追跡しないようにもできます。 - + To begin tracking a remote branch called '%1', <a href='action:push?set-upstream=true'>push and set the current branch's upstream</a>. '%1' というリモートブランチの追跡を開始するには、<a href='action:push?set-upstream=true'>現在のブランチをプッシュ、上流を設定</a>します。 - + To push without setting up tracking information, <a href='action:push?ref=%1'>push '%2'</a> explicitly. 追跡情報を設定せずにプッシュするには、明示的に <a href='action:push?ref=%1'>'%2' をプッシュ</a>します。 - + Push canceled. プッシュをキャンセルしました。 - + push to リモートへプッシュ - + The tag update may cause the remote to lose commits. タグを更新すると、リモート上のコミットが失われるかもしれません。 - + If you want to risk the remote losing commits, you can <a href='action:push?ref=%1&to=%2&force=true'>force push</a>. リモート上のコミット損失を覚悟しているなら、<a href='action:push?ref=%1&to=%2&force=true'>強制プッシュ</a>できます。 @@ -4427,227 +4447,227 @@ This reverts commit %2. リモート上のコミットが損失しても問題ないなら、<a href='action:push?force=true'>強制プッシュ</a>できます。 - + Commit? コミットしますか? - + Are you sure you want to commit on a detached HEAD? 作業中のリビジョンへコミットしますか? - + <p>You are in a detached HEAD state. You can still commit, but the new commit will not be reachable from any branch. If you want to commit to an existing branch, checkout the branch first.</p> <p>現在、どのブランチにも所属していない状態です。如何なるブランチを辿っても、ここで行ったコミットには到達できません。既存のブランチにコミットしたい場合は、まずそのブランチをチェックアウトしてください。</p> - - + + Commit コミット - - + + <i>no commit</i> <i>コミットなし</i> - + commit コミット - + This commit was signed with a generated user name and email. このコミットは、自動生成されたユーザー名と E メールで署名されました。 - + Consider setting the user name and email in <a href='action:config?global=true'>global settings</a>. <a href='action:config?global=true'>グローバル設定</a>で、ユーザー名と E メールを設定することをおすすめします。 - + If you want to limit the name and email settings to this repository, <a href='action:config'>edit repository settings</a> instead. このリポジトリ固有のユーザー名と E メールを設定したい場合は、代わりに<a href='action:config'>リポジトリの設定を編集</a>します。 - + After settings have been updated, <a href='action:amend'> amend this commit</a> to record the new user name and email. 設定を更新したら、<a href='action:amend'>最後のコミットを修正</a>して、新しいユーザー名と E メールで記録し直します。 - + file ファイル - + files ファイル - + %1 - %2 %3 %1 - %2 個の%3 - - + + Checkout チェックアウト - + Checkout Detached HEAD? 独立したリビジョンとしてチェックアウトしますか? - + Checkout Detached HEAD 独立したリビジョンとしてチェックアウト - + Checking out remote branch '%1' will result in a detached HEAD state. Do you want to reset the existing local branch '%2' to this commit instead? リモートブランチ '%1' をチェックアウトすると、どのブランチにも所属しない状態となります。代わりに既存のローカルブランチ '%2' を、このコミットに合わせてリセットしますか? - + Reset Local Branch ローカルブランチをリセット - + Checking out remote branch '%1' will result in a detached HEAD state. Do you want to create a new local branch called '%2' to track it instead? リモートブランチ '%1' をチェックアウトすると、どのブランチにも所属しない状態となります。代わりに新しい '%2' というローカルブランチを作成・追跡しますか? - + Create a local branch to start tracking remote changes and make new commits. Check out the detached HEAD to temporarily put your working directory into the state of the remote branch. 新しいローカルブランチを作成すると、リモートの変更の追跡や、コミットなどの作業を開始できます。独立したリビジョンとしてチェックアウトすると、リモートブランチの状態を、一時的に作業ディレクトリへ展開します。 - + Create Local Branch ローカルブランチを作成 - + checkout チェックアウト - + You may be able to reconcile your changes with the conflicting files by <a href='action:stash'>stashing</a> before you <a href='action:checkout?%1'>checkout '%2'</a>. Then <a href='action:unstash'>unstash</a> to restore your changes. <a href='action:checkout?%1'>'%2' をチェックアウト</a>する前に<a href='action:stash'>スタッシュへ預ける</a>ことで、衝突したファイルへの変更を調整できるかもしれません。今までに行った変更は、後で<a href='action:unstash'>スタッシュから引き出して</a>復元できます。 - + New Branch 新しいブランチ - + create new branch 新しいブランチを作成 - + (no branch) (ブランチなし) - + WIP on %1: %2 %3 作業途中の %1: %2 %3 - + <i>working directory</i> <i>作業ディレクトリ</i> - + Stash スタッシュへ預ける - + stash スタッシュへ収納 - + Apply Stash スタッシュを適用 - + apply stash スタッシュを適用 - + Drop Stash スタッシュから削除 - + drop stash スタッシュから削除 - + Pop Stash スタッシュから引き出す - + pop stash スタッシュから引き出し - + %1 as %2 %1 を %2 として - + Tag タグ付け - + tag タグを追加 - - + + Amend 修正 - + Amending commit %1 - + %1 to %2 update ref %1 を %2 へ - - - - - - + + + + + + Reset リセット @@ -4664,51 +4684,51 @@ This reverts commit %2. '%1' を修正しますか? - + Are you sure you want to reset '%1' to '%2'? '%1' を '%2' にリセットしますか? - + <p>Some commits may become unreachable from the current branch.</p> <p>現在のブランチからは、一部のコミットに辿り着けなくなるかもしれません。</p> - + <p>Resetting will cause you to lose uncommitted changes. Untracked and ignored files will not be affected.</p> <p>リセットすると、コミットされていない変更が失われます。未追跡のファイルや、無視されているファイルには影響しません。</p> - + <p>Your branch appears to be up-to-date with its upstream branch. Resetting may cause your branch history to diverge from the remote branch history.</p> <p>手元のブランチは既に、上流のブランチの最新版のようです。リセットすると、手元のブランチとリモートブランチとの履歴が分立するかもしれません。</p> - - + + amend 修正 - + reset リセット - - + + %1 of %2 submodules %1 / %2 個のサブモジュール - - + + Update 更新 - - + + update submodule サブモジュールを更新 @@ -4718,112 +4738,112 @@ This reverts commit %2. - + Please resolve conflicts before continue - + Conflict - + Rebase finished - + Force Push to %1? - + You may want to integrate remote commits first by <a href='action:pull'>pulling</a>. Then <a href='action:push?to=%1'>push</a> again. - + If you really want the remote to lose commits, you may be able to <a href='action:push?to=%1&force=true'>force push</a>. - + Reset canceled. - + Untouched - + Invalid Submodule Repository 無効なサブモジュールのリポジトリ - + The submodule '%1' doesn't have a valid repository. You may need to init and/or update the submodule to check out a repository. サブモジュール '%1' には有効なリポジトリがありません。リポジトリをチェックアウトする前に、サブモジュールの初期化や更新が必要かもしれません。 - + No terminal executable found - + No terminal executable was found. Please configure a terminal in the configuration. - + Open Configuration - + There was a merge conflict. マージする際に衝突がありました。 - + Resolve conflicts, then commit to conclude the %1. See <a href='expand'>details</a>. 衝突している部分を解決した後に、改めてコミットを行い、%1を確定させてください。詳細は<a href='expand'>こちら</a>。 - + Resolve conflicts in each conflicted (!) file in one of the following ways: これらの方法を使用して、衝突しているファイル (!) それぞれを解決できます: - + 1. Click the 'Ours' or 'Theirs' button to choose the correct change. Then click the 'Save' button to apply. 1. '手元のものを使う' か '向こうのものを使う' ボタンをクリックして、正しい変更を選びます。'保存' ボタンをクリックすると、選択を反映します。 - + 2. Edit the file in the editor to make a different change. Remember to remove conflict markers. 2. ファイルをエディターで開き、必要な修正を行います。衝突部分に付けられている印も、忘れずに取り除いてください。 - + 3. Use an external merge tool. Right-click on the files in the list and choose 'External Merge'. 3. 外部マージツールを使います。ファイル一覧の項目を右クリックし、'外部マージツール' を選びます。 - + After all conflicts in the file are resolved, click the check box to mark it as resolved. ファイルの衝突が全て解決できたら、チェックボックスをクリックし、解決済みとしてマークします。 - + After all conflicted files are staged, commit to conclude the %1. 衝突している全てのファイルをステージに上げたら、コミットを実行して%1を確定させます。 - + You can <a href='action:abort'>abort</a> the %1 to return the repository to its previous state. %1を<a href='action:abort'>中断</a>して、リポジトリを元の状態に戻すこともできます。 @@ -4831,12 +4851,12 @@ This reverts commit %2. Repository - + Unknown error 不明なエラー - + git-lfs not found git-lfs が見つかりませんでした @@ -4885,32 +4905,32 @@ This reverts commit %2. Settings - + Prompt to edit stash message before stashing スタッシュへ預ける前に、スタッシュ内容の説明を編集するか尋ねる - + Prompt to edit commit message before merging マージする前に、コミットの説明を編集するか尋ねる - + Prompt to edit commit message before reverting コミットを取り消す前に、コミットの説明を編集するか尋ねる - + Prompt to edit commit message before cherry-picking コミットを取り込む前に、コミットの説明を編集するか尋ねる - + Prompt to stage directories ディレクトリをステージに上げる前に尋ねる - + Prompt to stage large files 大きなファイルをステージに上げる前に尋ねる @@ -4918,67 +4938,67 @@ This reverts commit %2. SettingsDialog - + Esc Esc - + Global git settings can be overridden for each repository in the corresponding repository configuration page. Git のグローバル設定は、各リポジトリの設定から上書きできます。 - + Edit Config File... 設定ファイルを編集... - + General 一般 - + Diff 差分 - + Tools ツール - + Window ウィンドウ - + Editor エディター - + Update 更新 - + Plugins プラグイン - + Misc その他 - + Hotkeys - + Terminal 端末 @@ -5296,7 +5316,7 @@ This reverts commit %2. - + Add @@ -5317,43 +5337,48 @@ x (number) determines the number of maximum files shown 削除 - + + First template will be applied automatically + + + + Up - + Down - + Import - + Export - + Open File - - + + Gittyup Templates (*%1) - + Save Templates - + Replace 置換 @@ -5361,23 +5386,23 @@ x (number) determines the number of maximum files shown TerminalPanel - - + + Install インストール - + Name: 名前: - + Location: 場所: - + Uninstall アンインストール @@ -5624,38 +5649,38 @@ x (number) determines the number of maximum files shown TreeView - + Directory ディレクトリ - + File ファイル - + Remove or discard %1? - + Are you sure you want to remove or discard all changes in '%1'? - + This action cannot be undone. この操作は元に戻せません。 - - + + Discard 破棄 - + discard 破棄 @@ -5748,22 +5773,22 @@ x (number) determines the number of maximum files shown UpdatePanel - + Check for updates automatically 自動的に更新を確認 - + Automatically download and install updates 自動的に更新のダウンロードとインストールを行う - + Check Now 今すぐ確認 - + Software Update: ソフトウェアの更新: @@ -5939,32 +5964,37 @@ x (number) determines the number of maximum files shown - - Theme: - テーマ: - - - - Title: - タイトル: - - - - Log: - ログ: - - - - Tabs: - タブ: - - - - View: + + Show Window Maximized when opened + Theme: + テーマ: + + + + Title: + タイトル: + + + + Log: + ログ: + + + + Tabs: + タブ: + + + + View: + + + + Prompt: 質問: diff --git a/l10n/gittyup_pt.ts b/l10n/gittyup_pt.ts index 24d80f0b..9a8e86e6 100644 --- a/l10n/gittyup_pt.ts +++ b/l10n/gittyup_pt.ts @@ -629,115 +629,115 @@ - + <b>Commit Message:</b> <b>Mensagem de submissão:</b> - - + + Spell Check Language - + The dictionary '%1' is invalid - + Spell checking is disabled. - + The choosen dictionary '%1.dic' is not a valid hunspell dictionary. - - + + Invalid dictionary '%1.dic' - + Edit User Dictionary - + Stage All Adicionar tudo - + Unstage All Remover adições - - + + Commit Submeter - + Abort rebasing - + Continue rebasing - + Abort Merge Abortar união - + %1 %1 - + %1 and %2 - + %1, %2, and %3 - + Merge Unir - + Revert Reverter - + Cherry-pick - + Rebase Rebasear - + Abort %1 Abortar %1 - + Commit Rebase @@ -758,47 +758,47 @@ Actualizar %1, %2 e mais %3 ficheiros... - + Nothing staged Nada adicionado - + %1 of %2 file staged %1 de %2 ficheiro adicionado - + %1 of %2 files staged %1 de %2 ficheiros adicionados - + %1 file partially staged %1 ficheiro parcialmente adicionado - + %1 files partially staged %1 ficheiros parcialmente adicionados - + %1 unresolved conflict %1 conflito por resolver - + %1 unresolved conflicts %1 conflitos por resolver - + all conflicts resolved todos os conflitos resolvidos - + Commit Merge Submeter união @@ -806,42 +806,42 @@ CommitList - + Remove Untracked Files Remover ficheiros não rastreados - + Apply Aplicar - + Pop Aplicar e apagar - + Drop Largar - + Unstar Sem estrela - + Star Com estrela - + Add Tag... Adicionar etiqueta... - + New Branch... Novo ramo... @@ -854,83 +854,83 @@ Eliminar ramo %1 - + Rename Branch - + Delete Branch - + Delete Tag Eliminar etiqueta - + Merge... Unir... - + Rebase... Rebasear... - + Squash... Comprimir... - + Revert Reverter - + Cherry-pick Escolher este - - + + Checkout %1 Mudar para %1 - + Checkout Mudar - + Local branch is already checked out O ramo local já foi mudado - + This is a bare repository Este é um repositório em bruto - + Reset Repor - + Soft Suave - + Mixed Misto - + Hard Forçado @@ -938,12 +938,12 @@ CommitModel - + Uncommitted changes Alterações não submetidas - + Checking for uncommitted changes A procurar alterações não submetidas @@ -1218,24 +1218,24 @@ DetailView - - + + Author: Autor: - + reset repor - + Here you can set the author used for committing These settings will not be saved permanently - + Email: Email: @@ -1254,36 +1254,46 @@ These settings will not be saved permanently + Wrap lines + + + + Context lines: Linhas de contexto: - + + Wrap lines: + + + + Character Encoding: Codificação de caracteres: - + Ignore Whitespace (-w) Ignorar espaços (-w) - + Added files Ficheiros adicionados - + Deleted files Ficheiros eliminados - + Whitespace: Espaço: - + Auto Collapse: Colapso automático: @@ -1299,7 +1309,7 @@ These settings will not be saved permanently DiffTreeModel - + Submodule Sub-módulo @@ -1307,12 +1317,12 @@ These settings will not be saved permanently DiffView - + Add new file Adicionar novo ficheiro - + Or drag files here to copy into the repository Ou arrastar ficheiros para aqui e copiar para o repositório @@ -1320,40 +1330,25 @@ These settings will not be saved permanently DoubleTreeWidget - + Blame - + Show Blame Editor - + Diff Comparação - + Show Diff View Mostrar vista de comparação - - - Single Tree View - - - - - List View - - - - - Hide Untracked Files - - DownloadDialog @@ -1407,47 +1402,57 @@ These settings will not be saved permanently EditorPanel - + + Show whitespace + + + + Tabs Tabulações - + Spaces Espaços - + Show heat map Mostrar mapa de calor - + Font: Letra: - + Font size: Tamanho da letra: - + + Whitespace: + Espaço: + + + Indent using: Avançar com: - + Indent width: Largura do avanço: - + Tab width: Largura de tabulação: - + Blame margin: Margem de culpa: @@ -1899,12 +1904,12 @@ These settings will not be saved permanently Descartar alterações - + Discard Descartar - + discard descartar @@ -2124,51 +2129,51 @@ A ligação falhou HunkWidget - + Save Gravar - + Undo Desfazer - + Use Ours Usar o nosso - + Use Theirs Usar o deles - + Edit Hunk Editar pedaço - + Discard Hunk Descartar pedaço - + Discard selected lines? - + Are you sure you want to discard the changes in hunk from line %1 to %2 in '%3'? - + Discard selected lines @@ -2177,7 +2182,7 @@ A ligação falhou Descartar pedaço? - + Are you sure you want to remove '%1'? Tem a certeza de que deseja remover "%1"? @@ -2186,34 +2191,34 @@ A ligação falhou Tem a certeza de que deseja descartar o pedaço que comaçe na linha %1 em "%2"? - + This action cannot be undone. Esta acção não pode ser desfeita. - - + + Collapse Hunk Colapsar pedaço - - + + Expand Hunk Expandir pedaço - + Esc Esc - + Fix Reparar - + Edit Editar @@ -2481,59 +2486,59 @@ Exemplos MainWindow - + Invalid Git Repository Repositório git invaĺido - + %1 does not contain a valid git repository. %1 não contém um repositório git válido. - - + + %1 - %2 %1 - %2 - + ahead: %1 à frente: %1 - + behind: %1 atrás: %1 - + up-to-date actualizado - - + + %1 (%2) %1 (%2) - + MERGING A UNIR - + REVERTING A REVERTER - + CHERRY-PICKING A ESCOLHER PRECISAMENTE - + REBASING A REBASEAR @@ -3194,12 +3199,12 @@ Exemplos MiscPanel - + Path to SSH config file: Caminho para ficheiro de configuração SSH: - + Path to default / fallback SSH key file: Caminho predefinido/omissão de ficheiro-chave SSH: @@ -3368,32 +3373,32 @@ Exemplos QObject - + Expand all - + Collapse all - + Staged Files - + Unstaged Files - + Committed Files - + Workdir Files @@ -3402,6 +3407,21 @@ Exemplos Your global GIT configuration is invalid, Gittyup won't run properly until this is fixed + + + File Name + + + + + Relative Path + + + + + State + + RebaseConflictDialog @@ -4036,235 +4056,235 @@ was added to %1 - + Unable to %1 '%2' - %3 Impossível %1 '%2' - %3 - + Unable to %1 - %2 Impossível %1 - %2 - + %1 remotes %1 remotos - + Fetch All Obter tudo - + Fetch Obter - - - + + + <i>no remote</i> <i>sem remoto</i> - + Unable to fetch. No upstream is configured for the current branch, and there isn't a remote called 'origin'. Impossível obter. Não há montante configurado para o ramo actual e não há um remoto chamado "origin". - - + + Fetch canceled. Obter cancelado. - + fetch from obter de - + You may disable ssl verification <a href='action:sslverifyrepo'>for this repository</a> or overall disable ssl verification <a href='action:sslverifygit'>for all repositories</a>. - - - + + + Everything up-to-date. Tudo actualizado. - - - + + + <i>no branch</i> <i>sem ramo</i> - + %1 from %2 %1 de %2 - + Pull Puxar - + <i>no upstream</i> <i>sem montante</i> - + Merge Unir - + %1 into %2 %1 em %2 - + Fast-forward Avanço rápido - + %2 to %1 %2 para %1 - - + + Rebase Rebasear - + %2 on %1 %2 em %1 - + The repository is empty. - - + + The current branch '%1' has no upstream branch. O ramo %1 actual não tem um ramo a montante. - - + + Already up-to-date. Já está actualizado. - + Unable to fast-forward. Impossível avançar rapidamente. - + fast-forward avançar rapidamente - + You may be able to reconcile your changes with the conflicting files by <a href='action:stash'>stashing</a> before you <a href='%1'>fast-forward</a>. Then <a href='action:unstash'>unstash</a> to restore your changes. Poderá conseguir reconciliar as suas alterações com os ficheiros em conflito se <a href='action:stash'>ocultar</a> antes de <a href='%1'>avançar rapidamente</a>. Em seguida, <a href='action:unstash'>aplique</a> para restaurar as alterações. - + If you want to create a new merge commit instead of fast-forwarding, you can <a href='%1'>merge without fast-forwarding </a> instead. Se deseja criar uma nova submissão de união em vez de avançar rapidamente, pode antes <a href='%1'>unir sem avançar rapidamente</a>. - - - - + + + + merge unir - - + + You may be able to rebase by <a href='action:stash'>stashing</a> before trying to <a href='action:merge'>merge</a>. Then <a href='action:unstash'>unstash</a> to restore your changes. Poderá conseguir rebasear se <a href='action:stash'>ocultar</a> antes de tentar <a href='action:merge'>unir</a>. Em seguida, <a href='action:unstash'>aplique</a> para restaurar as alterações. - - - + + + Abort Abortar - + Some merged files have unstaged changes Alguns ficheiros unidos têm alterações não adicionadas. - + abort merge abortar união - - - + + + revert reverter - - - + + + cherry-pick escolher precisamente - - - + + + rebase rebasear - + Continue ongoing rebase - + Invalid head. - + You may be able to rebase by <a href='action:stash'>stashing</a> before trying to <a href='action:rebase'>rebase</a>. Then <a href='action:unstash'>unstash</a> to restore your changes. Poderá conseguir rebasear se <a href='action:stash'>ocultar</a> antes de tentar <a href='action:rebase'>rebasear</a>. Em seguida, <a href='action:unstash'>aplique</a> para restaurar as alterações. - - + + %1/%2 %1/%2 - + %1 - %2 %1 - %2 - + Apply Aplicar @@ -4273,29 +4293,29 @@ was added to %1 Houve um conflito na união. Rebasear abortado. - + %1 - %2 <i>already applied</i> %1 - %2 <i>já aplicado</i> - + %1 - %2 as %3 %1 - %2 como %3 - - - + + + squash comprimir - + Revert Reverter - + Revert "%1" This reverts commit %2. @@ -4304,17 +4324,17 @@ This reverts commit %2. Isto reverte a submissão %2. - + <i>detached HEAD</i> <i>HEAD desanexado</i> - + %1 on %2 %1 em %2 - + Cherry-pick Escolha precisa @@ -4323,99 +4343,99 @@ Isto reverte a submissão %2. Forçar envio? - + Are you sure you want to force push? Tem a certeza de que deseja forçar o envio? - + The remote will lose any commits that are reachable only from the overwritten reference. Dropped commits may be unexpectedly reintroduced by clones that already contain those commits locally. O remoto perderá todas as submissões só alcançáveis a partir da referência sobrescrita. Submissões largadas podem ser inesperadamente reintroduzidas por clones que já contêm essas submissões localmente. - + Force Push Forçar envio - + <i>no reference</i> <i>sem referência</i> - + Push Enviar - + Push (Force) Enviar (forçar) - - + + %1 to %2 %1 para %2 - - + + You are not currently on a branch. Actualmente não está num ramo. - + Create a commit to add the default '%1' branch. Cria uma submissão para adicionar o ramo "%1" predefinido. - + You can <a href='action:checkout'>checkout</a> a branch then <a href='action:push'>push</a> again, or <a href='action:push-to'>push to an explicit branch</a>. Pode <a href='action:checkout'>mudar</a> um ramo e depois <a href='action:push'>enviar</a> novamente, ou <a href='action:push-to'>enviar para um ramo explícito</a>. - + The current branch '%1' has no default remote. O ramo "%1" actual não tem um remoto predefinido. - + You may want to <a href='action:add-remote?name=origin'>add a remote named 'origin'</a>. Then <a href='action:push?set-upstream=true'>push and set the current branch's upstream</a> to begin tracking a remote branch called 'origin/%1'. Poderá querer <a href='action:add-remote?name=origin'>adicionar um remoto chamado "origin"</a>. Em seguida, <a href='action:push?set-upstream=true'>envie e defina o montante do ramo actual</a> para começar a rastrear um ramo remoto chamado "origin/%1". - + You can also <a href='action:push-to'>push to an explicit URL</a> if you don't want to track a remote branch. Também pode <a href='action:push-to'>enviar para um URL explícito</a>, se não deseja rastrear um ramo remoto. - + To begin tracking a remote branch called '%1', <a href='action:push?set-upstream=true'>push and set the current branch's upstream</a>. Para começar a rastrear um ramo remoto chamado "%1", <a href='action:push?set-upstream=true'>envie e defina o montante do ramo actual</a>. - + To push without setting up tracking information, <a href='action:push?ref=%1'>push '%2'</a> explicitly. Para enviar sem definir informação de rastreio, <a href='action:push?ref=%1'>envie "%2"</a> explicitamente. - + Push canceled. Envio cancelado. - + push to enviar para - + The tag update may cause the remote to lose commits. A actualização da etiqueta pode provocar perda de submissões no remoto. - + If you want to risk the remote losing commits, you can <a href='action:push?ref=%1&to=%2&force=true'>force push</a>. Se deseja arriscar perder submissões no remoto, pode <a href='action:push?ref=%1&to=%2&force=true'>forçar o envio</a>. @@ -4428,227 +4448,227 @@ Isto reverte a submissão %2. Se realmente deseja que o remoto perca submissões, poderá ser capaz de <a href='action:push?force=true'>forçar o envio</a>. - + Commit? Submeter? - + Are you sure you want to commit on a detached HEAD? Tem a certeza de que deseja submeter num HEAD desanexado? - + <p>You are in a detached HEAD state. You can still commit, but the new commit will not be reachable from any branch. If you want to commit to an existing branch, checkout the branch first.</p> <p>Está num estado de HEAD desanexado. Ainda pode submeter, mas a nova submissão não estará alcançável por nenhum ramo. Se deseja submeter num ramo existente, mude o ramo primeiro.</p> - - + + Commit Submeter - - + + <i>no commit</i> <i>sem submissão</i> - + commit submeter - + This commit was signed with a generated user name and email. A submissão foi assinada com um utilizador e um email gerados. - + Consider setting the user name and email in <a href='action:config?global=true'>global settings</a>. Considere definir o utilizador e o email nas <a href='action:config?global=true'>definições globais</a>. - + If you want to limit the name and email settings to this repository, <a href='action:config'>edit repository settings</a> instead. Se deseja limitar as definições de nome e email to a este repositório, <a href='action:config'>edite antes as definições do repositório</a>. - + After settings have been updated, <a href='action:amend'> amend this commit</a> to record the new user name and email. Após actualizar as definições, <a href='action:amend'> emende esta submissão</a> para registar os novos utilizador e email. - + file ficheiro - + files ficheiros - + %1 - %2 %3 %1 - %2 %3 - - + + Checkout Mudar - + Checkout Detached HEAD? Mudar HEAD desanexado? - + Checkout Detached HEAD Mudar HEAD desanexado - + Checking out remote branch '%1' will result in a detached HEAD state. Do you want to reset the existing local branch '%2' to this commit instead? Mudar o ramo remoto "%1" resultará num estado de HEAD desanexado. Deseja antes repor o ramo local "%2" existente para esta submissão? - + Reset Local Branch Repor ramo local - + Checking out remote branch '%1' will result in a detached HEAD state. Do you want to create a new local branch called '%2' to track it instead? Mudar o ramo remoto "%1" resultará num estado de HEAD desanexado. Deseja antes criar um novo ramo local chamado "%2" para rastrear? - + Create a local branch to start tracking remote changes and make new commits. Check out the detached HEAD to temporarily put your working directory into the state of the remote branch. Criar um novo ramo para começar a rastrear alterações remotas e fazer novas submissões. Mudar o HEAD desanexado para pôr temporariamente a sua pasta de trabalho no estado do ramo remoto. - + Create Local Branch Criar ramo local - + checkout mudar - + You may be able to reconcile your changes with the conflicting files by <a href='action:stash'>stashing</a> before you <a href='action:checkout?%1'>checkout '%2'</a>. Then <a href='action:unstash'>unstash</a> to restore your changes. Poderá reconciliar as suas alterações com os ficheiros em conflito <a href='action:stash'>ocultando</a> antes de <a href='action:checkout?%1'>mudar "%2"</a>. Em seguida, <a href='action:unstash'>aplique</a> para restaurar as alterações. - + New Branch Novo ramo - + create new branch criar novo ramo - + (no branch) (sem ramo) - + WIP on %1: %2 %3 WIP em %1: %2 %3 - + <i>working directory</i> <i>pasta de trabalho</i> - + Stash Ocultar - + stash ocultar - + Apply Stash Aplicar oculto - + apply stash aplicar oculto - + Drop Stash Largar oculto - + drop stash largar oculto - + Pop Stash Aplicar e apagar oculto - + pop stash aplicar e apagar oculto - + %1 as %2 %1 como %2 - + Tag Etiqueta - + tag etiqueta - - + + Amend Emendar - + Amending commit %1 - + %1 to %2 update ref %1 para %2 - - - - - - + + + + + + Reset Repor @@ -4665,51 +4685,51 @@ Isto reverte a submissão %2. Tem a certeza de que deseja emendar "%1"? - + Are you sure you want to reset '%1' to '%2'? Tem a certeza de que deseja repor "%1" para "%2"? - + <p>Some commits may become unreachable from the current branch.</p> <p>Algumas submissões podem ficar inalcançáveis a partir do ramo actual.</p> - + <p>Resetting will cause you to lose uncommitted changes. Untracked and ignored files will not be affected.</p> <p>Repor causará a perda de alterações não submetidas. Ficheiros não rastreados e ignorados não serão afectados.</p> - + <p>Your branch appears to be up-to-date with its upstream branch. Resetting may cause your branch history to diverge from the remote branch history.</p> <p>O seu ramo parece estar actualizado com o ramo a montante. Repor pode fazer com que o histórico do seu ramo divirja do histórico do ramo remoto.</p> - - + + amend emendar - + reset repor - - + + %1 of %2 submodules %1 de %2 sub-módulos - - + + Update Actualizar - - + + update submodule actualizar sub-módulo @@ -4719,112 +4739,112 @@ Isto reverte a submissão %2. - + Please resolve conflicts before continue - + Conflict - + Rebase finished - + Force Push to %1? - + You may want to integrate remote commits first by <a href='action:pull'>pulling</a>. Then <a href='action:push?to=%1'>push</a> again. - + If you really want the remote to lose commits, you may be able to <a href='action:push?to=%1&force=true'>force push</a>. - + Reset canceled. - + Untouched - + Invalid Submodule Repository Repositório de sub-módulo inválido - + The submodule '%1' doesn't have a valid repository. You may need to init and/or update the submodule to check out a repository. O sub-módulo "%1" não tem um repositório válido. Pode ter de inicializar e/ou actualizar o sub-módulo para mudar um repositório. - + No terminal executable found - + No terminal executable was found. Please configure a terminal in the configuration. - + Open Configuration - + There was a merge conflict. Houve um conflito de união. - + Resolve conflicts, then commit to conclude the %1. See <a href='expand'>details</a>. Resolva os conflitos e submeta para concluir a %1. Veja os <a href='expand'>detalhes</a>. - + Resolve conflicts in each conflicted (!) file in one of the following ways: Resolva os conflitos em cada ficheiros (!) de uma das seguintes formas: - + 1. Click the 'Ours' or 'Theirs' button to choose the correct change. Then click the 'Save' button to apply. 1. Clique em "Nosso" ou "Deles" para escolher a alteração correcta. Em seguida, clique em "Gravar" para aplicar. - + 2. Edit the file in the editor to make a different change. Remember to remove conflict markers. 2. Edite o ficheiro no editor para fazer uma alteração diferente. Lembre-se de resolver os marcadores de conflito. - + 3. Use an external merge tool. Right-click on the files in the list and choose 'External Merge'. 3. Use uma ferramenta externa de união. Clique com o botão direito nos ficheiros da lista e escolha "União externa". - + After all conflicts in the file are resolved, click the check box to mark it as resolved. Após resolver todos os conflitos no ficheiro, clique na caixa para o marcar como resolvido. - + After all conflicted files are staged, commit to conclude the %1. Após adicionar todos os ficheiros em conflito, submeta para concluir a %1. - + You can <a href='action:abort'>abort</a> the %1 to return the repository to its previous state. Pode <a href='action:abort'>abortar</a> a %1 para devolver o repositório ao seu estado anterior. @@ -4832,12 +4852,12 @@ Isto reverte a submissão %2. Repository - + Unknown error Erro desconhecido - + git-lfs not found git lfs não encontrado @@ -4886,32 +4906,32 @@ Isto reverte a submissão %2. Settings - + Prompt to edit stash message before stashing Pedir para editar mensagem de ocultação antes de ocultar - + Prompt to edit commit message before merging Pedir para editar mensagem de submissão antes de unir - + Prompt to edit commit message before reverting Pedir para editar mensagem de submissão antes de reverter - + Prompt to edit commit message before cherry-picking Pedir para editar mensagem de submissão antes de escolher precisamente - + Prompt to stage directories Pedir para adicionar pastas - + Prompt to stage large files Pedir para adicionar ficheiros grandes @@ -4919,67 +4939,67 @@ Isto reverte a submissão %2. SettingsDialog - + Esc Esc - + Global git settings can be overridden for each repository in the corresponding repository configuration page. As definições globais do git podem ser sobrepostas para cada repositório na correspondente página de configuração do repositório. - + Edit Config File... Editar ficheiro de configuração... - + General Geral - + Diff Comparação - + Tools Ferramentas - + Window Janela - + Editor Editor - + Update Actualizar - + Plugins Extensões - + Misc Misto - + Hotkeys - + Terminal Terminal @@ -5297,7 +5317,7 @@ Isto reverte a submissão %2. - + Add @@ -5318,43 +5338,48 @@ x (number) determines the number of maximum files shown Remover - + + First template will be applied automatically + + + + Up - + Down - + Import - + Export - + Open File - - + + Gittyup Templates (*%1) - + Save Templates - + Replace Substituir @@ -5362,23 +5387,23 @@ x (number) determines the number of maximum files shown TerminalPanel - - + + Install Instalar - + Name: Nome: - + Location: Localização: - + Uninstall Desinstalar @@ -5625,38 +5650,38 @@ x (number) determines the number of maximum files shown TreeView - + Directory Pasta - + File Ficheiro - + Remove or discard %1? - + Are you sure you want to remove or discard all changes in '%1'? - + This action cannot be undone. Esta acção não pode ser desfeita. - - + + Discard Descartar - + discard descartar @@ -5749,22 +5774,22 @@ x (number) determines the number of maximum files shown UpdatePanel - + Check for updates automatically Procurar actualizações automaticamente - + Automatically download and install updates Transferir e instalar actualizações automaticamente - + Check Now Procurar agora - + Software Update: Actualização do programa: @@ -5940,32 +5965,37 @@ x (number) determines the number of maximum files shown - - Theme: - Tema: - - - - Title: - Título: - - - - Log: - Diário: - - - - Tabs: - Separadores: - - - - View: + + Show Window Maximized when opened + Theme: + Tema: + + + + Title: + Título: + + + + Log: + Diário: + + + + Tabs: + Separadores: + + + + View: + + + + Prompt: Pedir: diff --git a/l10n/gittyup_pt_BR.ts b/l10n/gittyup_pt_BR.ts index 70eb6c77..7414996c 100644 --- a/l10n/gittyup_pt_BR.ts +++ b/l10n/gittyup_pt_BR.ts @@ -731,125 +731,125 @@ - + <b>Commit Message:</b> Mensagem que irá ser apresentada nas alterações referente a esse commit. <b>Mensagem do Commit:</b> - - + + Spell Check Language Idioma da verificação ortográfica... Verificação ortográfica - + The dictionary '%1' is invalid O dicionário '%1' é inválido... O dicionário '%1' é inválido - + Spell checking is disabled. A verificação ortográfica está desativada... A verificação ortográfica está desativada. - + The choosen dictionary '%1.dic' is not a valid hunspell dictionary. O dicionário escolhido '%1.dic' não é um dicionário hunspell válido... O dicionário escolhido '%1.dic' não é um dicionário hunspell válido. - - + + Invalid dictionary '%1.dic' Dicionário inválido '%1.dic'... Dicionário inválido '%1.dic' - + Edit User Dictionary Editar dicionário do usuário... Editar dicionário do usuário - + Stage All Adiciona as modificações na staging área... Add as modificações a staging área - + Unstage All Remove todas as alterações da staging área... Remover as modificações da staging área - - + + Commit Confirma as alterações... Commitar - + Abort rebasing - + Continue rebasing - + Abort Merge Abortar merge - + %1 - + %1 and %2 - + %1, %2, and %3 - + Merge - + Revert Reverter - + Cherry-pick - + Rebase Rebase - + Abort %1 Abortar %1 - + Commit Rebase @@ -874,55 +874,55 @@ Modificações efetuadas em %1, %2 e %3 outros arquivos... - + Nothing staged Não há nada stagiado. Nada preparado - + %1 of %2 file staged Adicionando arquivo na stage área. %1 de %2 arquivo preparado - + %1 of %2 files staged Adicionando arquivos na stage área. %1 de %2 arquivos preparados - + %1 file partially staged Preparando arquivo na stage área. %1 arquivo parcialmente preparado - + %1 files partially staged Preparando arquivos na stage área. %1 arquivos parcialmente preparados - + %1 unresolved conflict Há conflito não resolvido. %1 conflito não resolvido - + %1 unresolved conflicts Há conflitos não resolvidos. %1 conflitos não resolvidos - + all conflicts resolved Conflitos resolvidos. Todos os conflitos foram resolvidos - + Commit Merge Confirmar a Mesclagem... Commit Merge @@ -931,49 +931,49 @@ CommitList - + Remove Untracked Files Remover arquivos não rastreados Remover arquivos não rastreados - + Apply Apply, deixa na lista de stash para possível reutilização posterior. Aplique - + Pop Joga fora o stash (mais alto, por padrão) depois de aplicá-lo. Pop - + Drop Remove um único estado escondido da lista de stash depois de aplica-lo, stash do topo da árvore de trabalho. Drop - + Unstar Unstar, remove estrela do repositório selecionado. Desmarcar Estrela - + Star Star, marca com estrela o repositório selecionado. Marcar com Estrela - + Add Tag... Adiciona uma Tag. Add Tag... - + New Branch... Cria um novo Branch. Novo Branch... @@ -989,94 +989,94 @@ Deletar Branch %1 - + Rename Branch - + Delete Branch - + Delete Tag Deletar Tag - + Merge... Mescla o Branch atual no Branch específicado, cria sempre um commit referente a mesclagem. Merge... - + Rebase... Isso move toda a ramificação de recurso para começar na ponta da ramificação específicada, mas em vez de usar um commit de mesclagem, o rebase reescreve o histórico do projeto criando commits totalmente novos para cada commit na ramificação original, diferenciando-se do (Merge) que gera um commit da mesclagem. Rebase... - + Squash... Efetua um merge com o parâmetro --squash... Merge --squash... - + Revert Revert, a operação de reversão vai pegar o commit especificado, inverter as alterações dele e criar um "commit de reversão" novo. Os indicadores de referência são então atualizados para apontar para o commit de reversão novo, tornando o commit na ponta do branch. Reverter - + Cherry-pick (Cherry-pick) Anexa o commit selecionado no branch atual. (Cherry-pick) Coletar-commit - - + + Checkout %1 Verifica o branch pai e atualiza o branch local. Checkout %1 - + Checkout Checkout - + Local branch is already checked out O Branch local já foi verificado na saída. O Branch local já está verificado na saída - + This is a bare repository Este é um repositório vazio. Este é um repositório vazio - + Reset Reset é um comando poderoso usado para desfazer alterações locais no estado de um repositório Git. O git reset opera nas "três árvores do Git". Resetar - + Soft Atualiza os indicadores de ref e a redefinição para aí. Soft - + Mixed Os indicadores de ref são atualizados. O Índice de staging é redefinido para o estado da confirmação especificada. Mixed - + Hard Os indicadores de ref do Histórico de confirmações são atualizados para a confirmação especificada. Então, o Índice de staging e o Diretório de trabalho são redefinidos para corresponder à confirmação especificada. Hard @@ -1085,13 +1085,13 @@ CommitModel - + Uncommitted changes Alterações não confirmadas Alterações não confirmadas - + Checking for uncommitted changes Verificando alterações não confirmadas Verificando alterações não confirmadas @@ -1409,24 +1409,24 @@ DetailView - - + + Author: Autor: - + reset - + Here you can set the author used for committing These settings will not be saved permanently - + Email: E-mail: @@ -1447,42 +1447,52 @@ These settings will not be saved permanently + Wrap lines + + + + Context lines: Linhas de contexto. Linhas de contexto: - + + Wrap lines: + + + + Character Encoding: Codificação de caracteres: Codificação de caracteres: - + Ignore Whitespace (-w) Ignorar espaço em branco (-w) Ignorar espaço em branco (-w) - + Added files Arquivos adicionados Arquivos adicionados - + Deleted files Arquivos excluídos Arquivos excluídos - + Whitespace: Espaço em branco. Espaço em branco: - + Auto Collapse: Recolhe automaticamente. Recolher automaticamente: @@ -1500,7 +1510,7 @@ These settings will not be saved permanently DiffTreeModel - + Submodule Submódulo @@ -1508,13 +1518,13 @@ These settings will not be saved permanently DiffView - + Add new file Adiciona novo arquivo. Adicionar novo arquivo - + Or drag files here to copy into the repository Arraste os arquivos para copiar para o repositório. Ou arraste os arquivos aqui para copiar para o repositório @@ -1523,40 +1533,25 @@ These settings will not be saved permanently DoubleTreeWidget - + Blame - + Show Blame Editor - + Diff Diff - + Show Diff View Mostrar comparação - - - Single Tree View - - - - - List View - - - - - Hide Untracked Files - - DownloadDialog @@ -1618,55 +1613,65 @@ These settings will not be saved permanently EditorPanel - + + Show whitespace + + + + Tabs Separadores Separadores - + Spaces Espaços Espaços - + Show heat map Mostrar mapa de calor. Mostrar mapa de calor - + Font: Fonte. Fonte: - + Font size: Tamanho da fonte. Tamanho da fonte: - + + Whitespace: + Espaço em branco: + + + Indent using: Recuo... Recuar usando: - + Indent width: Largura do recuo. Largura do recuo: - + Tab width: Largura da guia. Largura da guia: - + Blame margin: Margem de culpa. Margem de culpa: @@ -2192,13 +2197,13 @@ These settings will not be saved permanently Descartar mudanças - + Discard Descarta... Descartar - + discard Descarta... descartar @@ -2448,57 +2453,57 @@ These settings will not be saved permanently HunkWidget - + Save Salvar... Salvar - + Undo Desfazer... Desfazer - + Use Ours Use o meu... Use o meu - + Use Theirs Use o outro... Use o outro - + Edit Hunk Editar alteração(ões)... Editar alteração(ões) - + Discard Hunk Descarta alteração(ões)... Descartar alteração(ões) - + Discard selected lines? - + Are you sure you want to discard the changes in hunk from line %1 to %2 in '%3'? - + Discard selected lines @@ -2508,7 +2513,7 @@ These settings will not be saved permanently Descartar alteração(ões)? - + Are you sure you want to remove '%1'? Confirmação de remoção... Tem certeza de que deseja remover '%1'? @@ -2519,39 +2524,39 @@ These settings will not be saved permanently Tem certeza de que deseja descartar as alterações inicianda na linha %1 em '%2'? - + This action cannot be undone. Informe de que a ação naõ pode ser desfeita... Essa ação não pode ser desfeita. - - + + Collapse Hunk Recolhe trecho alterado... Recolher alteração(ões) - - + + Expand Hunk Expande trecho alterado... Expandir alteração(ões) - + Esc Esc... Esc - + Fix Resolve problema... Resolver - + Edit Editar... Editar @@ -2855,69 +2860,69 @@ Exemplos MainWindow - + Invalid Git Repository Repositório Git inválido... Repositório Git inválido - + %1 does not contain a valid git repository. %1 não contém um repositório git válido. %1 não contém um repositório git válido. - - + + %1 - %2 %1 - %2 %1 - %2 - + ahead: %1 à frente: %1 à frente: %1 - + behind: %1 atrás: %1 atrás: %1 - + up-to-date atualizado até à data... atualizado até à data - - + + %1 (%2) %1 (%2) %1 (%2) - + MERGING Mesclar... MESCLAR - + REVERTING Reverte... REVERTER - + CHERRY-PICKING Coleta o commit especificado no branch atual. COLETAR-COMMIT - + REBASING Mescla os commits do branch especificado no branch atual, colocando os commits do branch especificado antes dos commits do branch filho seguindo sua cadeia. REBASING @@ -3705,13 +3710,13 @@ Exemplos MiscPanel - + Path to SSH config file: Caminho para o arquivo de configuração SSH... Caminho para o arquivo de configuração SSH: - + Path to default / fallback SSH key file: Caminho para o arquivo de chave SSH padrão / substituto... Caminho para o arquivo de chave SSH padrão / substituto: @@ -3909,32 +3914,32 @@ Exemplos QObject - + Expand all - + Collapse all - + Staged Files - + Unstaged Files - + Committed Files - + Workdir Files @@ -3943,6 +3948,21 @@ Exemplos Your global GIT configuration is invalid, Gittyup won't run properly until this is fixed + + + File Name + + + + + Relative Path + + + + + State + + RebaseConflictDialog @@ -4593,652 +4613,652 @@ was added to %1 - + Unable to %1 '%2' - %3 - + Unable to %1 - %2 - + %1 remotes - + Fetch All Fetch tudo - + Fetch Fetch - - - + + + <i>no remote</i> - + Unable to fetch. No upstream is configured for the current branch, and there isn't a remote called 'origin'. - - + + Fetch canceled. - + fetch from - + You may disable ssl verification <a href='action:sslverifyrepo'>for this repository</a> or overall disable ssl verification <a href='action:sslverifygit'>for all repositories</a>. - - - + + + Everything up-to-date. - - - + + + <i>no branch</i> - + %1 from %2 - + Pull Pull - + <i>no upstream</i> - + Merge - + %1 into %2 - + Fast-forward - + %2 to %1 - - + + Rebase Rebase - + %2 on %1 - + The repository is empty. - - + + The current branch '%1' has no upstream branch. - - + + Already up-to-date. - + Unable to fast-forward. - + fast-forward - + You may be able to reconcile your changes with the conflicting files by <a href='action:stash'>stashing</a> before you <a href='%1'>fast-forward</a>. Then <a href='action:unstash'>unstash</a> to restore your changes. - + If you want to create a new merge commit instead of fast-forwarding, you can <a href='%1'>merge without fast-forwarding </a> instead. - - - - + + + + merge merge - - + + You may be able to rebase by <a href='action:stash'>stashing</a> before trying to <a href='action:merge'>merge</a>. Then <a href='action:unstash'>unstash</a> to restore your changes. - - - + + + Abort Abortar - + Some merged files have unstaged changes - + abort merge - - - + + + revert - - - + + + cherry-pick - - - + + + rebase - + Continue ongoing rebase - + Invalid head. - + You may be able to rebase by <a href='action:stash'>stashing</a> before trying to <a href='action:rebase'>rebase</a>. Then <a href='action:unstash'>unstash</a> to restore your changes. - - + + %1/%2 - + %1 - %2 %1 - %2 - + Apply Aplique - + %1 - %2 <i>already applied</i> - + %1 - %2 as %3 - - - + + + squash - + Revert Reverter - + Revert "%1" This reverts commit %2. - + <i>detached HEAD</i> - + %1 on %2 - + Cherry-pick - + Are you sure you want to force push? - + The remote will lose any commits that are reachable only from the overwritten reference. Dropped commits may be unexpectedly reintroduced by clones that already contain those commits locally. - + Force Push - + <i>no reference</i> - + Push Push - + Push (Force) - - + + %1 to %2 - - + + You are not currently on a branch. - + Create a commit to add the default '%1' branch. - + You can <a href='action:checkout'>checkout</a> a branch then <a href='action:push'>push</a> again, or <a href='action:push-to'>push to an explicit branch</a>. - + The current branch '%1' has no default remote. - + You may want to <a href='action:add-remote?name=origin'>add a remote named 'origin'</a>. Then <a href='action:push?set-upstream=true'>push and set the current branch's upstream</a> to begin tracking a remote branch called 'origin/%1'. - + You can also <a href='action:push-to'>push to an explicit URL</a> if you don't want to track a remote branch. - + To begin tracking a remote branch called '%1', <a href='action:push?set-upstream=true'>push and set the current branch's upstream</a>. - + To push without setting up tracking information, <a href='action:push?ref=%1'>push '%2'</a> explicitly. - + Push canceled. Push cancelado. - + push to - + The tag update may cause the remote to lose commits. - + If you want to risk the remote losing commits, you can <a href='action:push?ref=%1&to=%2&force=true'>force push</a>. - + Commit? - + Are you sure you want to commit on a detached HEAD? - + <p>You are in a detached HEAD state. You can still commit, but the new commit will not be reachable from any branch. If you want to commit to an existing branch, checkout the branch first.</p> - - + + Commit Commitar - - + + <i>no commit</i> - + commit - + This commit was signed with a generated user name and email. - + Consider setting the user name and email in <a href='action:config?global=true'>global settings</a>. - + If you want to limit the name and email settings to this repository, <a href='action:config'>edit repository settings</a> instead. - + After settings have been updated, <a href='action:amend'> amend this commit</a> to record the new user name and email. - + file - + files - + %1 - %2 %3 %1 - %2 %3 {1 ?} - - + + Checkout Checkout - + Checkout Detached HEAD? - + Checkout Detached HEAD - + Checking out remote branch '%1' will result in a detached HEAD state. Do you want to reset the existing local branch '%2' to this commit instead? - + Reset Local Branch - + Checking out remote branch '%1' will result in a detached HEAD state. Do you want to create a new local branch called '%2' to track it instead? - + Create a local branch to start tracking remote changes and make new commits. Check out the detached HEAD to temporarily put your working directory into the state of the remote branch. - + Create Local Branch - + checkout - + You may be able to reconcile your changes with the conflicting files by <a href='action:stash'>stashing</a> before you <a href='action:checkout?%1'>checkout '%2'</a>. Then <a href='action:unstash'>unstash</a> to restore your changes. - + New Branch - + create new branch - + (no branch) - + WIP on %1: %2 %3 - + <i>working directory</i> - + Stash - + stash - + Apply Stash - + apply stash - + Drop Stash - + drop stash - + Pop Stash Joga fora o Stash (mais alto, por padrão) depois de aplicá-lo. Descartar Stash - + pop stash Joga fora o stash (mais alto, por padrão) depois de aplicá-lo. descartar stash - + %1 as %2 - + Tag Etiquetas - + tag - - + + Amend - + Amending commit %1 - + %1 to %2 update ref - - - - - - + + + + + + Reset Resetar - + Are you sure you want to reset '%1' to '%2'? - + <p>Some commits may become unreachable from the current branch.</p> - + <p>Resetting will cause you to lose uncommitted changes. Untracked and ignored files will not be affected.</p> - + <p>Your branch appears to be up-to-date with its upstream branch. Resetting may cause your branch history to diverge from the remote branch history.</p> - - + + amend - + reset - - + + %1 of %2 submodules - - + + Update - - + + update submodule @@ -5248,112 +5268,112 @@ This reverts commit %2. - + Please resolve conflicts before continue - + Conflict - + Rebase finished - + Force Push to %1? - + You may want to integrate remote commits first by <a href='action:pull'>pulling</a>. Then <a href='action:push?to=%1'>push</a> again. - + If you really want the remote to lose commits, you may be able to <a href='action:push?to=%1&force=true'>force push</a>. - + Reset canceled. - + Untouched - + Invalid Submodule Repository - + The submodule '%1' doesn't have a valid repository. You may need to init and/or update the submodule to check out a repository. - + No terminal executable found - + No terminal executable was found. Please configure a terminal in the configuration. - + Open Configuration - + There was a merge conflict. - + Resolve conflicts, then commit to conclude the %1. See <a href='expand'>details</a>. - + Resolve conflicts in each conflicted (!) file in one of the following ways: - + 1. Click the 'Ours' or 'Theirs' button to choose the correct change. Then click the 'Save' button to apply. - + 2. Edit the file in the editor to make a different change. Remember to remove conflict markers. - + 3. Use an external merge tool. Right-click on the files in the list and choose 'External Merge'. - + After all conflicts in the file are resolved, click the check box to mark it as resolved. - + After all conflicted files are staged, commit to conclude the %1. - + You can <a href='action:abort'>abort</a> the %1 to return the repository to its previous state. @@ -5361,12 +5381,12 @@ This reverts commit %2. Repository - + Unknown error - + git-lfs not found @@ -5415,32 +5435,32 @@ This reverts commit %2. Settings - + Prompt to edit stash message before stashing - + Prompt to edit commit message before merging - + Prompt to edit commit message before reverting - + Prompt to edit commit message before cherry-picking - + Prompt to stage directories - + Prompt to stage large files @@ -5448,67 +5468,67 @@ This reverts commit %2. SettingsDialog - + Esc Esc - + Global git settings can be overridden for each repository in the corresponding repository configuration page. - + Edit Config File... Editar arquivo de configuração... - + General Geral - + Diff Diff - + Tools Ferramentas - + Window Janela - + Editor - + Update - + Plugins Plugins - + Misc - + Hotkeys - + Terminal @@ -5834,7 +5854,7 @@ This reverts commit %2. - + Add @@ -5855,43 +5875,48 @@ x (number) determines the number of maximum files shown - + + First template will be applied automatically + + + + Up - + Down - + Import - + Export - + Open File - - + + Gittyup Templates (*%1) - + Save Templates - + Replace Substituir @@ -5899,23 +5924,23 @@ x (number) determines the number of maximum files shown TerminalPanel - - + + Install - + Name: Nome: - + Location: - + Uninstall @@ -6154,38 +6179,38 @@ x (number) determines the number of maximum files shown TreeView - + Directory Diretório - + File Arquivo - + Remove or discard %1? - + Are you sure you want to remove or discard all changes in '%1'? - + This action cannot be undone. Essa ação não pode ser desfeita. - - + + Discard Descartar - + discard descartar @@ -6278,22 +6303,22 @@ x (number) determines the number of maximum files shown UpdatePanel - + Check for updates automatically - + Automatically download and install updates - + Check Now - + Software Update: @@ -6465,32 +6490,37 @@ x (number) determines the number of maximum files shown - - Theme: - - - - - Title: - - - - - Log: - - - - - Tabs: - - - - - View: + + Show Window Maximized when opened + Theme: + + + + + Title: + + + + + Log: + + + + + Tabs: + + + + + View: + + + + Prompt: diff --git a/l10n/gittyup_ru.ts b/l10n/gittyup_ru.ts index ba79c48f..4046c40c 100644 --- a/l10n/gittyup_ru.ts +++ b/l10n/gittyup_ru.ts @@ -629,115 +629,115 @@ - + <b>Commit Message:</b> <b>Сообщение коммита:</b> - - + + Spell Check Language - + The dictionary '%1' is invalid - + Spell checking is disabled. - + The choosen dictionary '%1.dic' is not a valid hunspell dictionary. - - + + Invalid dictionary '%1.dic' - + Edit User Dictionary - + Stage All Добавить всё - + Unstage All Отменить добавление всего - - + + Commit Коммит - + Abort rebasing - + Continue rebasing - + Abort Merge Прервать слияние - + %1 - + %1 and %2 - + %1, %2, and %3 - + Merge Слить - + Revert Откатить - + Cherry-pick - + Rebase Перебазировать - + Abort %1 Прервать %1 - + Commit Rebase @@ -758,47 +758,47 @@ Обновить %1 и %2 и ещё %3 файла... - + Nothing staged Ничего не добавлено - + %1 of %2 file staged %1 из %2 файл добавлен - + %1 of %2 files staged %1 из %2 файлы добавлены - + %1 file partially staged %1 файл частично добавлен - + %1 files partially staged %1 файлы частично добавлены - + %1 unresolved conflict %1 неразрешённый конфликт - + %1 unresolved conflicts %1 неразрешённый конфликтов - + all conflicts resolved все конфликты разрешены - + Commit Merge Закоммитить слияние @@ -806,42 +806,42 @@ CommitList - + Remove Untracked Files Удалить неотслеживаемые файлы - + Apply Применить - + Pop Вытолкнуть - + Drop Выбросить - + Unstar Снять отметку - + Star Отметить - + Add Tag... Добавить метку... - + New Branch... Новая ветка... @@ -854,83 +854,83 @@ Удалить ветку %1 - + Rename Branch - + Delete Branch - + Delete Tag Удалить метку - + Merge... Слить... - + Rebase... Перебазировать... - + Squash... Объединить... - + Revert Откатить - + Cherry-pick - - + + Checkout %1 Перейти на %1 - + Checkout Перейти - + Local branch is already checked out Локальная ветка уже извлечена - + This is a bare repository Это - "голый" репозиторий - + Reset Сбросить - + Soft Мягкий - + Mixed Смешанный - + Hard Жесткий @@ -938,12 +938,12 @@ CommitModel - + Uncommitted changes Незакоммиченные изменения - + Checking for uncommitted changes Проверяем на незакоммиченные изменения @@ -1218,24 +1218,24 @@ DetailView - - + + Author: Автор: - + reset сбросить - + Here you can set the author used for committing These settings will not be saved permanently - + Email: Почта: @@ -1254,36 +1254,46 @@ These settings will not be saved permanently + Wrap lines + + + + Context lines: Строки контекста: - + + Wrap lines: + + + + Character Encoding: Кодировка символов: - + Ignore Whitespace (-w) Игнорировать непечатаемые (-w) - + Added files Добавленные файлы - + Deleted files Удалить файлы - + Whitespace: Непечатаемые: - + Auto Collapse: Авто-сворачивание: @@ -1299,7 +1309,7 @@ These settings will not be saved permanently DiffTreeModel - + Submodule Подмодуль @@ -1307,12 +1317,12 @@ These settings will not be saved permanently DiffView - + Add new file Добавить новый файл - + Or drag files here to copy into the repository Или перетащите файлы сюда, чтобы скопировать их в репозиторий @@ -1320,40 +1330,25 @@ These settings will not be saved permanently DoubleTreeWidget - + Blame - + Show Blame Editor - + Diff - + Show Diff View Показать просмотрщик диффов - - - Single Tree View - - - - - List View - - - - - Hide Untracked Files - - DownloadDialog @@ -1407,47 +1402,57 @@ These settings will not be saved permanently EditorPanel - + + Show whitespace + + + + Tabs Табы - + Spaces Пробелы - + Show heat map Показать тепловую карту - + Font: Шрифт: - + Font size: Размер шрифта: - + + Whitespace: + Непечатаемые: + + + Indent using: Отступать используя: - + Indent width: Ширина отступа: - + Tab width: Ширина таба: - + Blame margin: Граница blame: @@ -1899,12 +1904,12 @@ These settings will not be saved permanently Отменить изменения - + Discard Удалить - + discard убрать @@ -2122,51 +2127,51 @@ These settings will not be saved permanently HunkWidget - + Save Сохранить - + Undo Отменить - + Use Ours Использовать "Нашу" - + Use Theirs Использовать "Их" - + Edit Hunk Редактировать hunk - + Discard Hunk Отклонить hunk - + Discard selected lines? - + Are you sure you want to discard the changes in hunk from line %1 to %2 in '%3'? - + Discard selected lines @@ -2175,7 +2180,7 @@ These settings will not be saved permanently Отклонить hunk? - + Are you sure you want to remove '%1'? Вы уверены, что хотите удалить '%1'? @@ -2184,34 +2189,34 @@ These settings will not be saved permanently Вы уверены, что хотите отклонить hunk в строке %1 в '%2'? - + This action cannot be undone. Это дествие не может быть отменено. - - + + Collapse Hunk Свернуть hunk - - + + Expand Hunk Развернуть hunk - + Esc - + Fix Поправить - + Edit Редактировать @@ -2479,59 +2484,59 @@ Examples MainWindow - + Invalid Git Repository Неправильный Git-репозиторий - + %1 does not contain a valid git repository. %1 не содержит правильный git-репозиторий. - - + + %1 - %2 - + ahead: %1 обгоняет: %1 - + behind: %1 отстаёт: %1 - + up-to-date уже самое новое - - + + %1 (%2) - + MERGING СЛИВАЕМ - + REVERTING ОТКАТЫВАЕМ - + CHERRY-PICKING - + REBASING ПЕРЕБАЗИРУЕМ @@ -3092,12 +3097,12 @@ Examples MiscPanel - + Path to SSH config file: Путь к конфигу SSH: - + Path to default / fallback SSH key file: Путь к запасному / по-умолчанию файлу ключа SSH: @@ -3266,32 +3271,32 @@ Examples QObject - + Expand all - + Collapse all - + Staged Files - + Unstaged Files - + Committed Files - + Workdir Files @@ -3300,6 +3305,21 @@ Examples Your global GIT configuration is invalid, Gittyup won't run properly until this is fixed + + + File Name + + + + + Relative Path + + + + + State + + RebaseConflictDialog @@ -3934,235 +3954,235 @@ was added to %1 - + Unable to %1 '%2' - %3 Не смог %1 '%2' - %3 - + Unable to %1 - %2 Не смог %1 - %2 - + %1 remotes - + Fetch All Забрать всё - + Fetch Забрать - - - + + + <i>no remote</i> <i>нет remote</i> - + Unable to fetch. No upstream is configured for the current branch, and there isn't a remote called 'origin'. Не могу забрать. Upstream не сконфигурирован для текущей ветки, и remote 'origin' не существует. - - + + Fetch canceled. Забор отменён. - + fetch from забрать из - + You may disable ssl verification <a href='action:sslverifyrepo'>for this repository</a> or overall disable ssl verification <a href='action:sslverifygit'>for all repositories</a>. - - - + + + Everything up-to-date. Всё - новейшее. - - - + + + <i>no branch</i> <i>нет ветки</i> - + %1 from %2 %1 из %2 - + Pull Утянуть - + <i>no upstream</i> <i>нет upstream</i> - + Merge Слить - + %1 into %2 %1 в %2 - + Fast-forward - + %2 to %1 %2 на %1 - - + + Rebase Перебазировать - + %2 on %1 %2 на %1 - + The repository is empty. - - + + The current branch '%1' has no upstream branch. Текущая ветка '%1' не имеет upstream-ветки. - - + + Already up-to-date. Уже самое новое. - + Unable to fast-forward. Не могу fast-forward. - + fast-forward - + You may be able to reconcile your changes with the conflicting files by <a href='action:stash'>stashing</a> before you <a href='%1'>fast-forward</a>. Then <a href='action:unstash'>unstash</a> to restore your changes. Вы могли бы согласовать ваши изменения с конфликтующими файлами путём <a href='action:stash'>схоронения</a> перед тем как вы <a href='%1'>fast-forwardните</a>. Потом <a href='action:unstash'>вытащите из схрона</a> для возвращения ваших изменений. - + If you want to create a new merge commit instead of fast-forwarding, you can <a href='%1'>merge without fast-forwarding </a> instead. Если вы хотите создать новый коммит слияния вместо fast-forwardа, вы можете <a href='%1'>слить без fast-forwardа</a>. - - - - + + + + merge слить - - + + You may be able to rebase by <a href='action:stash'>stashing</a> before trying to <a href='action:merge'>merge</a>. Then <a href='action:unstash'>unstash</a> to restore your changes. Вы могли бы перебазировать путём <a href='action:stash'>схоронения</a> перед попыткой <a href='action:merge'>слить</a>. Затем <a href='action:unstash'>вытащите из схрона</a> для восстановления ваших изменений. - - - + + + Abort Прервать - + Some merged files have unstaged changes В некоторых слитых файлах есть недобавленные изменения - + abort merge прервать слияние - - - + + + revert откатить - - - + + + cherry-pick - - - + + + rebase перебазировать - + Continue ongoing rebase - + Invalid head. - + You may be able to rebase by <a href='action:stash'>stashing</a> before trying to <a href='action:rebase'>rebase</a>. Then <a href='action:unstash'>unstash</a> to restore your changes. Вы могли бы перебазировать путём <a href='action:stash'>схоронения</a> перед попыткой <a href='action:merge'>перебазировать</a>. Затем <a href='action:unstash'>вытащите из схрона</a> для восстановления ваших изменений. - - + + %1/%2 - + %1 - %2 - + Apply Применить @@ -4171,46 +4191,46 @@ was added to %1 Конфликт слияния. Перебазирование прервано - + %1 - %2 <i>already applied</i> %1 - %2 <i>уже применён</i> - + %1 - %2 as %3 %1 - %2 как %3 - - - + + + squash объединить - + Revert Откатить - + Revert "%1" This reverts commit %2. - + <i>detached HEAD</i> <i>отсоединённая HEAD</i> - + %1 on %2 %1 на %2 - + Cherry-pick @@ -4219,99 +4239,99 @@ This reverts commit %2. Принудительно запушить? - + Are you sure you want to force push? Хотите насильно запушить? - + The remote will lose any commits that are reachable only from the overwritten reference. Dropped commits may be unexpectedly reintroduced by clones that already contain those commits locally. remote потеряет коммиты, которые достижимы только из перезаписанной ссылки. Выброшенные коммиты могут быть неожиданно возвращены клонами, которые уже содержат эти коммиты локально. - + Force Push Принудительный пуш - + <i>no reference</i> <i>нет ссылки</i> - + Push Запушить - + Push (Force) Запушить (принудительно) - - + + %1 to %2 %1 в %2 - - + + You are not currently on a branch. Вы сейчас не на ветке. - + Create a commit to add the default '%1' branch. Создать коммит и добавить по-умолчанию ветку '%1'. - + You can <a href='action:checkout'>checkout</a> a branch then <a href='action:push'>push</a> again, or <a href='action:push-to'>push to an explicit branch</a>. Вы можете <a href='action:checkout'>перейти на</a> ветку, затем <a href='action:push'>запушить</a> снова, или <a href='action:push-to'>запушить на явную ветку</a>. - + The current branch '%1' has no default remote. Текущая ветка '%1' не имеет remote по-умолчанию. - + You may want to <a href='action:add-remote?name=origin'>add a remote named 'origin'</a>. Then <a href='action:push?set-upstream=true'>push and set the current branch's upstream</a> to begin tracking a remote branch called 'origin/%1'. Ва могли хотеть <a href='action:add-remote?name=origin'>добавить remote, названное 'origin'</a>. Тогда <a href='action:push?set-upstream=true'>запушьте и установите upstream текущей ветки</a>, чтобы начать отслеживать удаленную ветку, названную 'origin/%1'. - + You can also <a href='action:push-to'>push to an explicit URL</a> if you don't want to track a remote branch. Вы также можете <a href='action:push-to'>запушить на явный URL</a>, если не хотите отслеживать remote branch. - + To begin tracking a remote branch called '%1', <a href='action:push?set-upstream=true'>push and set the current branch's upstream</a>. Чтобы начать отслеживать удаленную ветку, названную called '%1', <a href='action:push?set-upstream=true'>запушьте и установите upstream для текущей ветки</a>. - + To push without setting up tracking information, <a href='action:push?ref=%1'>push '%2'</a> explicitly. Чтобы запушить без установки информации для отслеживания, <a href='action:push?ref=%1'>запушьте '%2'</a> явно. - + Push canceled. Пуш отменён. - + push to запушить в - + The tag update may cause the remote to lose commits. Обновление метки может привести к потере коммитов у remote. - + If you want to risk the remote losing commits, you can <a href='action:push?ref=%1&to=%2&force=true'>force push</a>. Если вы хотите рискнуть потерей коммитов у remote, вы можете <a href='action:push?ref=%1&to=%2&force=true'>запушить принудительно</a>. @@ -4324,227 +4344,227 @@ This reverts commit %2. Если вы действительно хотите, чтобы remote потеряло коммиты, вы могли бы <a href='action:push?force=true'>запушить принудительно</a>. - + Commit? Закоммитить? - + Are you sure you want to commit on a detached HEAD? Вы уверенны, что хотите закоммитить поверх отсоединённой HEAD? - + <p>You are in a detached HEAD state. You can still commit, but the new commit will not be reachable from any branch. If you want to commit to an existing branch, checkout the branch first.</p> <p>Вы - в состоянии с отсоединённой HEAD. Вы всё ещё можете коммитить, но новый коммит не будет доступен из какой-либо ветки. Если вы хотите закоммитить на существующую ветку, сперва извлеките ветку.</p> - - + + Commit Коммит - - + + <i>no commit</i> <i>нет коммита</i> - + commit коммит - + This commit was signed with a generated user name and email. Этот коммит был подписан сгенерированными именем пользователя и почтой. - + Consider setting the user name and email in <a href='action:config?global=true'>global settings</a>. Рассмотрите вариант установки имени и почты в <a href='action:config?global=true'>глобальных настройках</a>. - + If you want to limit the name and email settings to this repository, <a href='action:config'>edit repository settings</a> instead. Если вы хотите ограничить настройки имени и почты только этим репозиторием, <a href='action:config'>отредактируйте настройки репозитория</a> вместо этого. - + After settings have been updated, <a href='action:amend'> amend this commit</a> to record the new user name and email. После того, как настройки были обновлены, <a href='action:amend'> дополните этот коммит</a> для записи нового имени пользователя и почты. - + file файл - + files файлы - + %1 - %2 %3 - - + + Checkout Перейти - + Checkout Detached HEAD? Перейти на отсоединённую HEAD? - + Checkout Detached HEAD Перейти на отсоединённую HEAD - + Checking out remote branch '%1' will result in a detached HEAD state. Do you want to reset the existing local branch '%2' to this commit instead? Извлечение удаленной ветки '%1' приведёт к состоянию отсоединённой HEAD. Хотите сбросить существующую локальную ветку '%2' на этот коммит вместо этого? - + Reset Local Branch Сбросить локальную ветку - + Checking out remote branch '%1' will result in a detached HEAD state. Do you want to create a new local branch called '%2' to track it instead? Извлечение удаленной ветки '%1' приведёт к состоянию отсоединённой HEAD. Хотите создать новую локальную ветку, названную '%2', чтобы отслеживать её, вместо этого? - + Create a local branch to start tracking remote changes and make new commits. Check out the detached HEAD to temporarily put your working directory into the state of the remote branch. Создайте локальную ветку чтобы начать отслеживать изменения remote и создайте новые коммиты. Извлеките отсоединённую HEAD чтобы временно перевести вашу рабочую директорию в состояние удаленной ветки. - + Create Local Branch Создать локальную ветку - + checkout перейти - + You may be able to reconcile your changes with the conflicting files by <a href='action:stash'>stashing</a> before you <a href='action:checkout?%1'>checkout '%2'</a>. Then <a href='action:unstash'>unstash</a> to restore your changes. Вы могли бы согласовать ваши изменения с конфликтующими файлами путём <a href='action:stash'>схоронения</a> перед тем как вы <a href='action:checkout?%1'>извлечёте'%2'</a>. Потом <a href='action:unstash'>вытащите из схрона</a> для возвращения ваших изменений. - + New Branch Новая ветка - + create new branch создать новую ветку - + (no branch) (без ветки) - + WIP on %1: %2 %3 WIP на %1: %2 %3 - + <i>working directory</i> <i>рабочая копия</i> - + Stash Схрон - + stash схрон - + Apply Stash Применить схрон - + apply stash применить схрон - + Drop Stash Выбросить содержимое схрона - + drop stash выбросить содержимое схрона - + Pop Stash Извлечь из копилки - + pop stash вынуть из схрона - + %1 as %2 %1 как %2 - + Tag Метка - + tag метка - - + + Amend Дополнить - + Amending commit %1 - + %1 to %2 update ref %1 в %2 - - - - - - + + + + + + Reset Сбросить @@ -4561,51 +4581,51 @@ This reverts commit %2. Вы уверены, что хотите дополнить '%1'? - + Are you sure you want to reset '%1' to '%2'? Вы уверены, что хотите сбросить '%1' на '%2'? - + <p>Some commits may become unreachable from the current branch.</p> <p>Некоторые коммиты могут стать недостижимы из текущей ветки.</p> - + <p>Resetting will cause you to lose uncommitted changes. Untracked and ignored files will not be affected.</p> <p>Сброс приведёт к тому, что вы потеряете незакоммиченные изменения. Неотслеживаемые и игнорируемые файлы не будут затронуты.</p> - + <p>Your branch appears to be up-to-date with its upstream branch. Resetting may cause your branch history to diverge from the remote branch history.</p> <p>Ваша ветка кажется уже самой новой, соответствующей своей upstream-ветке. Сброс может привести историю вашей ветки к расхождению с историей ветки remote.</p> - - + + amend дополнить - + reset сбросить - - + + %1 of %2 submodules %1 из %2 подмодулей - - + + Update Обновить - - + + update submodule обновить подмодуль @@ -4615,112 +4635,112 @@ This reverts commit %2. - + Please resolve conflicts before continue - + Conflict - + Rebase finished - + Force Push to %1? - + You may want to integrate remote commits first by <a href='action:pull'>pulling</a>. Then <a href='action:push?to=%1'>push</a> again. - + If you really want the remote to lose commits, you may be able to <a href='action:push?to=%1&force=true'>force push</a>. - + Reset canceled. - + Untouched - + Invalid Submodule Repository Неправильный репозиторий подмодуля - + The submodule '%1' doesn't have a valid repository. You may need to init and/or update the submodule to check out a repository. Подмодуль '%1' не имеет верного репозитория. Вам может быть нужно инициализировать и/или обновить подмодуль для извлечения репозитория. - + No terminal executable found - + No terminal executable was found. Please configure a terminal in the configuration. - + Open Configuration - + There was a merge conflict. Конфликт слияния. - + Resolve conflicts, then commit to conclude the %1. See <a href='expand'>details</a>. Разрешите конфликты, затем закоммитьте, чтобы завершить %1. См. <a href='expand'>подробности</a>. - + Resolve conflicts in each conflicted (!) file in one of the following ways: Разрешите конфликты в каждом конфликтующем (!) файле одним из следующих способов: - + 1. Click the 'Ours' or 'Theirs' button to choose the correct change. Then click the 'Save' button to apply. 1. Щёлкните кнопку 'Наш' или 'Их', чтобы выбрать правильное изменение. Затем щёлкните кнопку 'Сохранить', чтобы применить. - + 2. Edit the file in the editor to make a different change. Remember to remove conflict markers. 2. Редактируйте файл в редакторе, чтобы сделать разные изменения. Не забудьте удалить маркеры конфликта. - + 3. Use an external merge tool. Right-click on the files in the list and choose 'External Merge'. 3. Используйте внешний инструмент слияния. Щелчок правой на файлах в списке, и выберите 'Внешнее слияние'. - + After all conflicts in the file are resolved, click the check box to mark it as resolved. После того, как все конфликты разрешены, кликните флажок, чтобы пометить их разрешёнными. - + After all conflicted files are staged, commit to conclude the %1. После того, как все конфликтующие файлы добавлены, закоммитьте, чтобы завершить %1. - + You can <a href='action:abort'>abort</a> the %1 to return the repository to its previous state. Вы можете <a href='action:abort'>прервать</a> %1 , чтобы вернуть репозиторий в предыдущее состояние. @@ -4728,12 +4748,12 @@ This reverts commit %2. Repository - + Unknown error Неизвестная ошибка - + git-lfs not found git-lfs не найдена @@ -4782,32 +4802,32 @@ This reverts commit %2. Settings - + Prompt to edit stash message before stashing Запрашивать редактировани сообщения коммита перед действиями со схроном - + Prompt to edit commit message before merging Запрашивать редактировани сообщения коммита перед слиянием - + Prompt to edit commit message before reverting Запрашивать редактировани сообщения коммита перед откатом - + Prompt to edit commit message before cherry-picking Запрашивать редактировани сообщения коммита перед cherry-picking - + Prompt to stage directories Подтверждать добавление директорий - + Prompt to stage large files Подтверждать добавление больших файлов @@ -4815,67 +4835,67 @@ This reverts commit %2. SettingsDialog - + Esc - + Global git settings can be overridden for each repository in the corresponding repository configuration page. Глобальные настройки git могут быть переопределены для каждого репозитория в его настройках. - + Edit Config File... Редактировать конфиг... - + General Общие - + Diff - + Tools Инструменты - + Window Окно - + Editor Редактор - + Update Обновить - + Plugins Плагины - + Misc Прочее - + Hotkeys - + Terminal Терминал @@ -5193,7 +5213,7 @@ This reverts commit %2. - + Add @@ -5214,43 +5234,48 @@ x (number) determines the number of maximum files shown Удалить - + + First template will be applied automatically + + + + Up - + Down - + Import - + Export - + Open File - - + + Gittyup Templates (*%1) - + Save Templates - + Replace Заменить @@ -5258,23 +5283,23 @@ x (number) determines the number of maximum files shown TerminalPanel - - + + Install Установить - + Name: Имя: - + Location: Место: - + Uninstall Отменить установку @@ -5521,38 +5546,38 @@ x (number) determines the number of maximum files shown TreeView - + Directory Директория - + File Файл - + Remove or discard %1? - + Are you sure you want to remove or discard all changes in '%1'? - + This action cannot be undone. Это дествие не может быть отменено. - - + + Discard - + discard @@ -5645,22 +5670,22 @@ x (number) determines the number of maximum files shown UpdatePanel - + Check for updates automatically Проверять обновления автоматически - + Automatically download and install updates Автоматически загружать и ставить обновления - + Check Now Проверить сейчас - + Software Update: Обновление ПО: @@ -5836,32 +5861,37 @@ x (number) determines the number of maximum files shown - - Theme: - Тема: - - - - Title: - Название: - - - - Log: - Журнал: - - - - Tabs: - Вкладки: - - - - View: + + Show Window Maximized when opened + Theme: + Тема: + + + + Title: + Название: + + + + Log: + Журнал: + + + + Tabs: + Вкладки: + + + + View: + + + + Prompt: diff --git a/l10n/gittyup_zh_CN.ts b/l10n/gittyup_zh_CN.ts index 6fce7338..54e8c262 100644 --- a/l10n/gittyup_zh_CN.ts +++ b/l10n/gittyup_zh_CN.ts @@ -629,115 +629,115 @@ - + <b>Commit Message:</b> <b>提交消息:</b> - - + + Spell Check Language 拼写检查语言 - + The dictionary '%1' is invalid 字典 '%1' 无效 - + Spell checking is disabled. 拼写检查被禁用。 - + The choosen dictionary '%1.dic' is not a valid hunspell dictionary. 选定的字典 '%1.dic' 不是有效的 hunspell 字典。 - - + + Invalid dictionary '%1.dic' 无效的字典 '%1.dic' - + Edit User Dictionary 编辑用户字典 - + Stage All 全部暂存 - + Unstage All 全部取消暂存 - - + + Commit 提交 - + Abort rebasing - + Continue rebasing - + Abort Merge 中止合并(Merge) - + %1 %1 - + %1 and %2 - + %1, %2, and %3 - + Merge 合并 - + Revert 还原 - + Cherry-pick 拣选操作 - + Rebase - + Abort %1 中止%1 - + Commit Rebase @@ -758,47 +758,47 @@ 更新%1,%2和%3多个文件... - + Nothing staged 没有暂存 - + %1 of %2 file staged 已暂存%2个文件中的%1个 - + %1 of %2 files staged 已暂存%2个文件中的%1个 - + %1 file partially staged %1文件已部分暂存 - + %1 files partially staged 部分暂存了%1个文件 - + %1 unresolved conflict %1个未解决的冲突 - + %1 unresolved conflicts %1个未解决的冲突 - + all conflicts resolved 所有冲突已解决 - + Commit Merge 提交合并 @@ -806,42 +806,42 @@ CommitList - + Remove Untracked Files 删除未跟踪的文件 - + Apply 应用 - + Pop 填充(Pop) - + Drop 丢弃(Drop) - + Unstar 取消星标 - + Star 星标 - + Add Tag... 添加标签... - + New Branch... 新建分支... @@ -854,83 +854,83 @@ 删除分支%1 - + Rename Branch - + Delete Branch - + Delete Tag 删除标签 - + Merge... 合并... - + Rebase... 变基... - + Squash... 聚合(Squash)... - + Revert 还原 - + Cherry-pick 拣选操作 - - + + Checkout %1 检出%1 - + Checkout 检出 - + Local branch is already checked out 本地分支已检出 - + This is a bare repository 这是一个纯仓库 - + Reset 重置 - + Soft 软性 - + Mixed 混合 - + Hard 硬性 @@ -938,12 +938,12 @@ CommitModel - + Uncommitted changes 未提交的更改 - + Checking for uncommitted changes 检查未提交的更改 @@ -1218,24 +1218,24 @@ DetailView - - + + Author: 作者: - + reset 重置 - + Here you can set the author used for committing These settings will not be saved permanently - + Email: 电子邮件: @@ -1254,36 +1254,46 @@ These settings will not be saved permanently + Wrap lines + + + + Context lines: 内容行: - + + Wrap lines: + + + + Character Encoding: 字符编码: - + Ignore Whitespace (-w) 忽略空格(-w) - + Added files 添加的文件 - + Deleted files 删除的文件 - + Whitespace: 空格: - + Auto Collapse: 自动收合: @@ -1299,7 +1309,7 @@ These settings will not be saved permanently DiffTreeModel - + Submodule 子模块 @@ -1307,12 +1317,12 @@ These settings will not be saved permanently DiffView - + Add new file 追加新文件 - + Or drag files here to copy into the repository 或将文件拖到此处以复制到仓库中 @@ -1320,40 +1330,25 @@ These settings will not be saved permanently DoubleTreeWidget - + Blame - + Show Blame Editor - + Diff 比较 - + Show Diff View 显示差异视图 - - - Single Tree View - - - - - List View - - - - - Hide Untracked Files - - DownloadDialog @@ -1407,47 +1402,57 @@ These settings will not be saved permanently EditorPanel - + + Show whitespace + + + + Tabs 标签页 - + Spaces 空间 - + Show heat map 显示热图 - + Font: 字体: - + Font size: 字体大小: - + + Whitespace: + 空格: + + + Indent using: 缩进使用: - + Indent width: 缩进宽度: - + Tab width: 标签页宽度: - + Blame margin: 追踪边际: @@ -1899,12 +1904,12 @@ These settings will not be saved permanently 放弃更改 - + Discard 丢弃 - + discard 丢弃 @@ -2122,51 +2127,51 @@ These settings will not be saved permanently HunkWidget - + Save 保存 - + Undo 撤消 - + Use Ours 使用我们的 - + Use Theirs 用他们的 - + Edit Hunk 编辑补丁片段 - + Discard Hunk 放弃补丁片段 - + Discard selected lines? - + Are you sure you want to discard the changes in hunk from line %1 to %2 in '%3'? - + Discard selected lines @@ -2175,7 +2180,7 @@ These settings will not be saved permanently 您确定要放弃补丁片段吗? - + Are you sure you want to remove '%1'? 您确定要删除'%1'吗? @@ -2184,34 +2189,34 @@ These settings will not be saved permanently 您确定要舍弃'%2'中从行%1开始的块吗? - + This action cannot be undone. 此操作无法撤消。 - - + + Collapse Hunk 收合补丁片段 - - + + Expand Hunk 展开补丁片段 - + Esc 退出 - + Fix 固定 - + Edit 编辑 @@ -2479,59 +2484,59 @@ Examples MainWindow - + Invalid Git Repository 无效的Git仓库 - + %1 does not contain a valid git repository. %1没有包含有效的git仓库。 - - + + %1 - %2 %1 - %2 - + ahead: %1 前进:%1 - + behind: %1 后面:%1 - + up-to-date 最新 - - + + %1 (%2) %1 (%2) - + MERGING 合并 - + REVERTING 还原 - + CHERRY-PICKING 拣选操作 - + REBASING 变基 @@ -3192,12 +3197,12 @@ Examples MiscPanel - + Path to SSH config file: SSH配置文件的路径: - + Path to default / fallback SSH key file: 默认/后备SSH密钥文件的路径: @@ -3366,32 +3371,32 @@ Examples QObject - + Expand all - + Collapse all - + Staged Files - + Unstaged Files - + Committed Files - + Workdir Files @@ -3400,6 +3405,21 @@ Examples Your global GIT configuration is invalid, Gittyup won't run properly until this is fixed + + + File Name + + + + + Relative Path + + + + + State + + RebaseConflictDialog @@ -4034,235 +4054,235 @@ was added to %1 - + Unable to %1 '%2' - %3 无法%1'%2'-%3 - + Unable to %1 - %2 无法%1-%2 - + %1 remotes %1个远程 - + Fetch All 获取全部 - + Fetch 获取 - - - + + + <i>no remote</i> <i>没有远程</i> - + Unable to fetch. No upstream is configured for the current branch, and there isn't a remote called 'origin'. 无法获取。当前分支未配置上游,也没有名为“origin”的远程服务器。 - - + + Fetch canceled. 获取已取消。 - + fetch from 获取自 - + You may disable ssl verification <a href='action:sslverifyrepo'>for this repository</a> or overall disable ssl verification <a href='action:sslverifygit'>for all repositories</a>. - - - + + + Everything up-to-date. 一切都是最新的。 - - - + + + <i>no branch</i> <i>没有分支</i> - + %1 from %2 来自%2的%1 - + Pull 拉取 - + <i>no upstream</i> <i>没有上游</i> - + Merge 合并 - + %1 into %2 %1到%2 - + Fast-forward 快进 - + %2 to %1 %2至%1 - - + + Rebase 变基 - + %2 on %1 %1上的%2 - + The repository is empty. 该库为空。 - - + + The current branch '%1' has no upstream branch. 当前分支'%1'没有上游分支。 - - + + Already up-to-date. 已经是最新的。 - + Unable to fast-forward. 无法快进。 - + fast-forward 快进 - + You may be able to reconcile your changes with the conflicting files by <a href='action:stash'>stashing</a> before you <a href='%1'>fast-forward</a>. Then <a href='action:unstash'>unstash</a> to restore your changes. 在<a href='%1'>快进</a>之前,您可以通过<a href='action:stash'>备份未提交修改到贮藏区</a>来协调更改与冲突的文件。然后用<a href='action:unstash'>应用备份并从贮藏区删除</a>来恢复您的更改。 - + If you want to create a new merge commit instead of fast-forwarding, you can <a href='%1'>merge without fast-forwarding </a> instead. 如果要创建新的合并提交而不是快进,则可用<a href='%1'>合并而不快进</a>代替。 - - - - + + + + merge 合并 - - + + You may be able to rebase by <a href='action:stash'>stashing</a> before trying to <a href='action:merge'>merge</a>. Then <a href='action:unstash'>unstash</a> to restore your changes. 在尝试<a href='action:mash'>合并</a>之前,您可以通过<a href='action:stash'>备份未提交修改到贮藏区</a>进行调整。然后用<a href='action:unstash'>应用备份并从贮藏区删除</a>来恢复您的更改。 - - - + + + Abort 中止 - + Some merged files have unstaged changes 某些合并的文件具有未暂存的更改 - + abort merge 中止 - - - + + + revert 还原 - - - + + + cherry-pick 拣选操作 - - - + + + rebase 变基 - + Continue ongoing rebase - + Invalid head. - + You may be able to rebase by <a href='action:stash'>stashing</a> before trying to <a href='action:rebase'>rebase</a>. Then <a href='action:unstash'>unstash</a> to restore your changes. 在尝试<a href='action:rebase'>变基</a>之前,您可以通过<a href='action:stash'>备份未提交修改到贮藏区</a>进行调整。然后用<a href='action:unstash'>应用备份并从贮藏区删除</a>来恢复您的更改。 - - + + %1/%2 %1/%2 - + %1 - %2 %1 - %2 - + Apply 应用 @@ -4271,29 +4291,29 @@ was added to %1 有合并冲突。 变基已中止 - + %1 - %2 <i>already applied</i> %1 - %2 <i>已应用</i> - + %1 - %2 as %3 %1 - %2作为%3 - - - + + + squash 聚合(Squash) - + Revert 还原 - + Revert "%1" This reverts commit %2. @@ -4302,17 +4322,17 @@ This reverts commit %2. 这将还原提交%2。 - + <i>detached HEAD</i> <i>游离的头</i> - + %1 on %2 %2上的%1 - + Cherry-pick 拣选操作 @@ -4321,99 +4341,99 @@ This reverts commit %2. 强制推送? - + Are you sure you want to force push? 您确定要强制推送吗? - + The remote will lose any commits that are reachable only from the overwritten reference. Dropped commits may be unexpectedly reintroduced by clones that already contain those commits locally. 远程将丢失所有只能从覆盖的引用访问的提交。已在本地包含那些提交的克隆可能会意外地重新引入已删除的提交。 - + Force Push 强制推送 - + <i>no reference</i> <i>没有引用</i> - + Push 推送 - + Push (Force) 推送(强制) - - + + %1 to %2 %1至%2 - - + + You are not currently on a branch. 您目前不在一个分支上。 - + Create a commit to add the default '%1' branch. 新建一个提交以添加默认的'%1'分支。 - + You can <a href='action:checkout'>checkout</a> a branch then <a href='action:push'>push</a> again, or <a href='action:push-to'>push to an explicit branch</a>. 您可以先<a href='action:checkout'>检出</a>分支,然后再次<a href='action:push'>推送</a>,或<a href='action:push-to'>推送到显式分支</a>。 - + The current branch '%1' has no default remote. 当前分支'%1'没有默认的远程分支。 - + You may want to <a href='action:add-remote?name=origin'>add a remote named 'origin'</a>. Then <a href='action:push?set-upstream=true'>push and set the current branch's upstream</a> to begin tracking a remote branch called 'origin/%1'. 您可能想要执行<a href='action:add-remote?name=origin'>添加一个名为“origin”的远程仓库</a>。然后<a href='action:push?set-upstream=true'>推送并设置为当前分支的上游</a>,以开始跟踪名为“origin/%1”的远程分支。 - + You can also <a href='action:push-to'>push to an explicit URL</a> if you don't want to track a remote branch. 如果您不想跟踪远程分支,也可以<a href='action:push-to'>推送到显式URL </a>。 - + To begin tracking a remote branch called '%1', <a href='action:push?set-upstream=true'>push and set the current branch's upstream</a>. 要开始跟踪名为'%1'的远程分支,请<a href='action:push?set-upstream=true'> 推送并设置当前分支的上游</a>。 - + To push without setting up tracking information, <a href='action:push?ref=%1'>push '%2'</a> explicitly. 要在不设置跟踪信息的情况下进行推送,请显式地<a href='action:push?ref=%1'>推送'%2'</a>。 - + Push canceled. 推送已取消。 - + push to 推送到 - + The tag update may cause the remote to lose commits. 标签更新可能会导致远程分支丢失提交。 - + If you want to risk the remote losing commits, you can <a href='action:push?ref=%1&to=%2&force=true'>force push</a>. 如果您想冒远程分支丢失提交的风险,可以<a href='action:push?ref=%1&to=%2&force=true'>强制推送</a>。 @@ -4426,227 +4446,227 @@ This reverts commit %2. 如果您确实希望远程分支丢失提交,则可以<a href='action:push?force=true'>强制推送</a>。 - + Commit? 提交? - + Are you sure you want to commit on a detached HEAD? 您确定要提交到游离的HEAD吗? - + <p>You are in a detached HEAD state. You can still commit, but the new commit will not be reachable from any branch. If you want to commit to an existing branch, checkout the branch first.</p> <p>您处于分离的HEAD状态。您仍然可以提交,但是新的提交将无法从任何分支访问。如果要提交到现有分支,请首先检出该分支。</p> - - + + Commit 提交 - - + + <i>no commit</i> <i>没有提交</i> - + commit 提交 - + This commit was signed with a generated user name and email. 该提交已使用生成的用户名和电子邮件进行了签名。 - + Consider setting the user name and email in <a href='action:config?global=true'>global settings</a>. 请考虑在<a href='action:config?global=true'>全局设置</a>中设置用户名和电子邮件。 - + If you want to limit the name and email settings to this repository, <a href='action:config'>edit repository settings</a> instead. 如果要限制此仓库的名称和电子邮件设置,请<a href='action:config'>编辑仓库设置</a>。 - + After settings have been updated, <a href='action:amend'> amend this commit</a> to record the new user name and email. 设置更新后,<a href='action:amend'>修改此提交</a>以记录新的用户名和电子邮件。 - + file 文件 - + files 多个文件 - + %1 - %2 %3 %1 - %2 %3 - - + + Checkout 检出 - + Checkout Detached HEAD? 检出游离的HEAD? - + Checkout Detached HEAD 检出游离的HEAD - + Checking out remote branch '%1' will result in a detached HEAD state. Do you want to reset the existing local branch '%2' to this commit instead? 检出远程分支'%1'将导致游离的HEAD状态。您是否想将现有的本地分支'%2'重置为此提交? - + Reset Local Branch 重置本地分支 - + Checking out remote branch '%1' will result in a detached HEAD state. Do you want to create a new local branch called '%2' to track it instead? 检出远程分支'%1'将导致游离的HEAD状态。您是否要新建一个名为'%2'的新本地分支来跟踪它? - + Create a local branch to start tracking remote changes and make new commits. Check out the detached HEAD to temporarily put your working directory into the state of the remote branch. 新建本地分支以开始跟踪远程更改并进行新的提交。检出游离的HEAD,以将您的工作目录暂时置于远程分支的状态。 - + Create Local Branch 新建本地分支 - + checkout 检出 - + You may be able to reconcile your changes with the conflicting files by <a href='action:stash'>stashing</a> before you <a href='action:checkout?%1'>checkout '%2'</a>. Then <a href='action:unstash'>unstash</a> to restore your changes. 在执行<a href='action:checkout?%1'>检出'%2'</a>之前,您可以通过<a href='action:stash'>备份未提交修改到贮藏区</a>使协调更改与冲突的文件。然后用<a href='action:unstash'>应用备份并从贮藏区删除</a>来恢复您的更改。 - + New Branch 新建分支 - + create new branch 创建新的分支 - + (no branch) (无分支) - + WIP on %1: %2 %3 WIP 在 %1:%2 %3 - + <i>working directory</i> <i>工作目录</i> - + Stash 贮藏 - + stash 贮藏 - + Apply Stash 应用备份 - + apply stash 应用备份 - + Drop Stash 从贮藏区删除备份 - + drop stash 从贮藏区删除备份 - + Pop Stash 应用备份并从贮藏区删除 - + pop stash 应用备份并从贮藏区删除 - + %1 as %2 %1作为%2 - + Tag 标签 - + tag 标签 - - + + Amend 修改 - + Amending commit %1 - + %1 to %2 update ref %1至%2 - - - - - - + + + + + + Reset 重置 @@ -4663,51 +4683,51 @@ This reverts commit %2. 您确定要修改'%1'吗? - + Are you sure you want to reset '%1' to '%2'? 您确定要将“%1”重置为“%2”吗? - + <p>Some commits may become unreachable from the current branch.</p> <p>某些提交可能会从当前分支变为不可访问。</p> - + <p>Resetting will cause you to lose uncommitted changes. Untracked and ignored files will not be affected.</p> <p>重置将导致您丢失未提交的更改。未跟踪和忽略的文件不会受到影响。</p> - + <p>Your branch appears to be up-to-date with its upstream branch. Resetting may cause your branch history to diverge from the remote branch history.</p> <p>您的分支似乎是其上游分支的最新信息。重置可能会导致您的分支历史记录与远程分支历史记录有所不同。</p> - - + + amend 修改 - + reset 重置 - - + + %1 of %2 submodules %1个子模块(共%2个) - - + + Update 更新 - - + + update submodule 更新子模块 @@ -4717,112 +4737,112 @@ This reverts commit %2. - + Please resolve conflicts before continue - + Conflict - + Rebase finished - + Force Push to %1? - + You may want to integrate remote commits first by <a href='action:pull'>pulling</a>. Then <a href='action:push?to=%1'>push</a> again. - + If you really want the remote to lose commits, you may be able to <a href='action:push?to=%1&force=true'>force push</a>. - + Reset canceled. - + Untouched - + Invalid Submodule Repository 无效的子模块仓库 - + The submodule '%1' doesn't have a valid repository. You may need to init and/or update the submodule to check out a repository. 子模块'%1'没有有效的仓库。您可能需要初始化和/或更新子模块以检出仓库。 - + No terminal executable found - + No terminal executable was found. Please configure a terminal in the configuration. - + Open Configuration - + There was a merge conflict. 发生合并冲突。 - + Resolve conflicts, then commit to conclude the %1. See <a href='expand'>details</a>. 解决冲突,然后提交以结束%1。请参见<a href='expand'>详细信息</a>。 - + Resolve conflicts in each conflicted (!) file in one of the following ways: 通过以下方式中任意一种来解决每个冲突(!)文件中的冲突: - + 1. Click the 'Ours' or 'Theirs' button to choose the correct change. Then click the 'Save' button to apply. 1.点击“我们的”或“他们的”按钮以选择正确的更改。然后点击“保存”按钮以应用。 - + 2. Edit the file in the editor to make a different change. Remember to remove conflict markers. 2.在编辑器中编辑文件以进行其他更改。记住要删除冲突标记。 - + 3. Use an external merge tool. Right-click on the files in the list and choose 'External Merge'. 3.使用外部合并工具。右键单击列表中的文件,然后选择“外部合并”。 - + After all conflicts in the file are resolved, click the check box to mark it as resolved. 解决文件中的所有冲突后,单击复选框将其标记为已解决。 - + After all conflicted files are staged, commit to conclude the %1. 暂存所有有冲突的文件后,提交以结束%1。 - + You can <a href='action:abort'>abort</a> the %1 to return the repository to its previous state. 您可以<a href='action:abort'>中止</a>%1以便将仓库恢复到之前的状态。 @@ -4830,12 +4850,12 @@ This reverts commit %2. Repository - + Unknown error 未知错误 - + git-lfs not found 找不到git-lfs @@ -4884,32 +4904,32 @@ This reverts commit %2. Settings - + Prompt to edit stash message before stashing 在执行贮存操作前提示编辑贮存消息 - + Prompt to edit commit message before merging 合并前提示编辑提交消息 - + Prompt to edit commit message before reverting 还原前提示编辑提交消息 - + Prompt to edit commit message before cherry-picking 在拣选操作之前提示编辑提交消息 - + Prompt to stage directories 提示暂存目录 - + Prompt to stage large files 提示暂存大文件 @@ -4917,67 +4937,67 @@ This reverts commit %2. SettingsDialog - + Esc 退出 - + Global git settings can be overridden for each repository in the corresponding repository configuration page. 可以在相应的仓库配置页面中为每个仓库覆盖全局git设置。 - + Edit Config File... 编辑配置文件... - + General 一般 - + Diff 比较 - + Tools 工具 - + Window 窗口 - + Editor 编辑器 - + Update 更新 - + Plugins 插件 - + Misc 其他 - + Hotkeys - + Terminal 终端 @@ -5295,7 +5315,7 @@ This reverts commit %2. - + Add @@ -5316,43 +5336,48 @@ x (number) determines the number of maximum files shown 删除 - + + First template will be applied automatically + + + + Up - + Down - + Import - + Export - + Open File - - + + Gittyup Templates (*%1) - + Save Templates - + Replace 替换 @@ -5360,23 +5385,23 @@ x (number) determines the number of maximum files shown TerminalPanel - - + + Install 安装 - + Name: 名称: - + Location: 位置: - + Uninstall 卸载 @@ -5623,38 +5648,38 @@ x (number) determines the number of maximum files shown TreeView - + Directory 目录 - + File 文件 - + Remove or discard %1? - + Are you sure you want to remove or discard all changes in '%1'? - + This action cannot be undone. 此操作无法撤消。 - - + + Discard 丢弃 - + discard 丢弃 @@ -5747,22 +5772,22 @@ x (number) determines the number of maximum files shown UpdatePanel - + Check for updates automatically 自动检查更新 - + Automatically download and install updates 自动下载并安装更新 - + Check Now 现在检查 - + Software Update: 软件更新: @@ -5938,32 +5963,37 @@ x (number) determines the number of maximum files shown - - Theme: - 主题: - - - - Title: - 标题: - - - - Log: - 日志: - - - - Tabs: - 标签页: - - - - View: + + Show Window Maximized when opened + Theme: + 主题: + + + + Title: + 标题: + + + + Log: + 日志: + + + + Tabs: + 标签页: + + + + View: + + + + Prompt: 提示: From 37c8034e317b287c2c29aaf4a18813e07e017ac8 Mon Sep 17 00:00:00 2001 From: Micha WERLE Date: Sat, 27 Apr 2024 13:05:18 +0900 Subject: [PATCH 4/4] feat(whitespace): add german translation for "Show whitespace" Add german translations for the new "Show whitespace" settings in the Settings dialog. --- l10n/gittyup_de.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/l10n/gittyup_de.ts b/l10n/gittyup_de.ts index 96a72400..ce626444 100644 --- a/l10n/gittyup_de.ts +++ b/l10n/gittyup_de.ts @@ -1419,7 +1419,7 @@ These settings will not be saved permanently Show whitespace - + Leerzeichen zeigen @@ -1449,7 +1449,7 @@ These settings will not be saved permanently Whitespace: - Whitespace: + Leerzeichen: