diff --git a/l10n/gittyup_de.ts b/l10n/gittyup_de.ts index ce6264446..5141c3dd6 100644 --- a/l10n/gittyup_de.ts +++ b/l10n/gittyup_de.ts @@ -28,39 +28,31 @@ Privacy Datenschutz - - Usage reporting has been disabled. Restart the application for changes to take effect. - Telemetrie wurde deaktiviert. Bitte starte die Anwendung neu, damit die Änderungen aktiv werden. - - - Usage Reporting Disabled - Telemetrie wurde deaktiviert - Account - + Connection failed Verbinden fehlgeschlagen - + <b>Note:</b> Basic authentication is not supported if you have two-factor authentication enabled. Use a <a href='https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/'>personal access token</a> in the password field instead. <b>Hinweis:</b> Standard-Authentifizierung ist nicht unterstützt, wenn Du Zwei-Faktor-Authentifizierung aktiviert hast. Benutze stattdessen ein <a href='https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/'>persönliches Zugriffs-Token</a> im Passwort-Feld. - + <b>Note:</b> Only Basic authentication is currently supported - + <b>Note:</b> Basic authentication is not supported. Use a <a href='https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html'>personal access token</a> in the password field instead. <b>Hinweis:</b> Standard-Authentifizierung ist nicht unterstützt. Benutze stattdessen ein <a href='https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html'>persönliches Zugriffs-Token</a> im Passwort-Feld. - + Authentication failed Anmeldung fehlgeschlagen @@ -158,162 +150,162 @@ AdvancedSearchWidget - + Author: Author: - + Author name Name des Authors - + Email: E-Mail: - + Author email E-Mail des Authors - + Message: Nachricht: - + Commit message Commit-Nachricht - + Date: Datum: - + Specific commit date Bestimmtes Commit-Datum - + After: Nach: - + Commits after date Commits nach Datum - + Before: Vor: - + Commits before date Commits vor Datum - + File: Datei: - + File name Dateiname - + Path: Pfad: - + File path Dateipfad - + Scope: Scope: - + Hunk header text Hunk-Kopfzeilen - + Context: Kontext: - + Diff context (white) Unterschieds-Kontext (weiß) - + Addition: Hinzugekommen: - + Diff addition (green) Im Diff hinzugekommen (grün) - + Deletion: Löschungen: - + Diff deletion (red) Im Diff gelöscht (rot) - + Comment: Kommentar: - + Source code comment Quellcode-Kommentar - + String: String: - + Source code string literal String-Literal im Quellcode - + Identifier: Identifizierer: - + Source code identifier Identifizierer im Quellcode - + Search Suche - + Return @@ -349,12 +341,12 @@ Application - + SSL Errors SSL-Fehler - + Failed to set up SSL session. Do you want to ignore these errors? SSL-Sitzung konnte nicht initialisiert werden. Willst Du den Fehler ignorieren? @@ -362,59 +354,45 @@ AuthorCommitterDate - + Author/Committer: - + Author: - + Committer: - - Beanstalk - - Connection failed - Verbinden fehlgeschlagen - - - - Bitbucket - - Connection failed - Verbinden fehlgeschlagen - - BlameEditor - + Untitled Ohne Titel - + Not Tracked Nicht getrackt - + HEAD HEAD - + Working Copy Arbeitskopie - + Save File Datei speichern @@ -422,12 +400,12 @@ BlameMargin - + Not Committed Nicht committed - + Invalid Signature Ungültige Signatur @@ -546,27 +524,27 @@ CommitDetail - + Copy Kopieren - + Range: Bereich: - + Id: ID: - + initial commit Initialer Commit - + Parents: @@ -624,181 +602,165 @@ CommitEditor - + T - + <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 - Update %1 - %1 aktualisiert - - - Update %1 and %2 - %1 und %2 aktualisiert - - - Update %1, %2, and %3 - %1, %2 und %3 aktualisiert - - - Update %1, %2, and %3 more files... - %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,131 +768,123 @@ 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... - Delete Tag %1 - Tag %1 löschen - - - Delete Branch %1 - 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 +892,12 @@ CommitModel - + Uncommitted changes Uncommittete Änderungen - + Checking for uncommitted changes Prüfe auf uncommittete Änderungen @@ -951,7 +905,7 @@ CommitToolBar - + Show All Branches Zeige alle Branches @@ -961,42 +915,47 @@ Zeige den ausgewählten Branch - + + Show Selected Branch, First Parent Only + + + + Sort by Date Nach Datum sortieren - + Sort Topologically Nach Topologie sortieren - + Show Graph Graph zeigen - + Show Clean Status Sauberen Status zeigen - + Compact Mode Kompakter Modus - + Show Author - + Show Date - + Show Id @@ -1004,56 +963,89 @@ ConfigDialog - + General Allgemein - + Diff Diff - + Remotes Remotes - + Branches Branches - + Submodules Submodule - + Search Suche - + Plugins Plugins - + LFS LFS - + Edit Config File... Konfigurations-Datei bearbeiten... - + Esc + + CredentialHelper + + + Caching the credentials in the RAM. Required to enter credentials on every startup + + + + + Storing the credentials unencrypted on disk, protected only by filesystem permissions <a href="https://git-scm.com/docs/git-credential-store">git-credential-store</a> + + + + + MacOS credential manager + + + + + Windows credential manager + + + + + Secret Service D-Bus client library + + + + + Prefer <a href="https://wiki.gnome.org/Projects/Libsecret">libsecret</a> over gnome-keyring if available + + + DateSelectionGroupWidget @@ -1077,13 +1069,6 @@ - - DefaultContentWidget - - Binary file of size %1, no preview available. - Binärdatei mit %1 Daten, keine Vorschau verfügbar. - - DefaultWidget @@ -1111,10 +1096,6 @@ Add %1 account %1-Account hinzufügen - - View getting started videos - Hilfe-Videos ansehen - Contact us for support @@ -1154,17 +1135,17 @@ Pushe - + Push canceled. Pushen abgebrochen. - + Unable to push to %1 - %2 Kann nicht nach %1 pushen - %2 - + The branch is not fully merged. Deleting it may cause some commits to be lost. Der Branch ist nicht vollständig gemergt. Ihn zu löschen kann dazu führen, dass einige Commits verloren gehen. @@ -1202,22 +1183,22 @@ Pushe - + Push canceled. Pushen abgebrochen. - + Unable to push to %1 - %2 Kann nicht nach %1 pushen - %2 - + Delete Tag Lösche Tag - + delete tag lösche Tag @@ -1225,24 +1206,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: @@ -1250,65 +1231,57 @@ These settings will not be saved permanently DiffPanel - + lines Zeilen - + System Locale System-Region - + Wrap lines - + Context lines: Kontext-Zeilen: - + Wrap lines: - + Character Encoding: Zeichensatz: - + Ignore Whitespace (-w) Whitespace ignorieren (-w) - Compact mode - Kompakter Modus - - - + Added files Hinzugefügte Dateien - + Deleted files Gelöschte Dateien - + Whitespace: Whitespace: - Compact mode: - Kompakter Modus: - - - + Auto Collapse: Automatisch zuklappen: @@ -1316,10 +1289,15 @@ These settings will not be saved permanently DiffTool - + External Diff Externes Diff + + + External Diff to Working Copy + + DiffTreeModel @@ -1332,12 +1310,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 @@ -1417,57 +1395,57 @@ These settings will not be saved permanently EditorPanel - + Show whitespace Leerzeichen zeigen - + Tabs Tabs - + Spaces Leerzeichen - + Show heat map Heat-Map anzeigen - + Font: Schriftart: - + Font size: Schriftgröße: - + Whitespace: Leerzeichen: - + Indent using: Einzug mit: - + Indent width: Einzugs-Breite: - + Tab width: Tab-Breite: - + Blame margin: Blame-Seitenrand: @@ -1539,429 +1517,345 @@ These settings will not be saved permanently Die ausgewählte Datei hat keine %1 Revision. - + + Bash Not Found Bash nicht gefunden - + + Bash was not found on your PATH. Bash wurde in deinem PATH nicht gefunden. - + + Bash is required to execute external tools. Bash ist erforderlich, um externe Tools auszuführen. - + Stage Stagen - + Unstage Unstagen - + Discard Changes Änderungen verwerfen - + Discard Changes? Änderungen verwerfen? - + Are you sure you want to discard changes in the selected files? Bist Du sicher, dass Du die Änderungen in den ausgewählten Dateien verwerfen willst? - + This action cannot be undone. Die Aktion kann nicht rückgängig gemacht werden. - + (Submodule) - + %1 files %1 Dateien - + Discard Verwerfen - + discard verwerfe - + Remove Untracked Files Ungetrackte Dateien entfernen - + Ignore Ignorieren - + Checkout Auschecken - + Unlock Entsperren - + Lock Sperren - + Copy File Name Dateiname kopieren - + Filter History History filtern - + Navigate to Navigiere zu - + Next Revision Nächste Revision - + next nächste - + Previous Revision Vorherige Revision - + previous vorherige - + Unset Executable Nicht als ausführbar markieren - + Set Executable Als ausführbar markieren - + Save Selected Version as ... - + Select new file directory - + Saving files - + Saving files of selected version to disk - + Save file - + Invalid Blob - + Open this version - + Opening file - + Open - + open file - + Blob is invalid. - - + + Unable to checkout bare repositories - + Unable to open files from bare repository - + The file is already in the current working directory - + edit Editor - + diff Diff - + merge Merge - + External Tool Not Found Externes Tool nicht gefunden - + Failed to execute external %1 tool. %1-Tool konnte nicht ausgeführt werden. - - FileList - - Sort By - Sortieren nach - - - Select - Auswählen - - - Staged First - Gestagte zuerst - - - Directory First - Ordner zuerst - - - Case Sensitive - Groß- / Kleinschreibung beachten - - - Name - Name - - - Status - Status - - - Ignore Whitespace (-w) - Whitespace ignorieren (-w) - - - Hide untracked files - Ungetrackte Dateien verstecken - - - Compact mode - Kompakter Modus - - - Added - Hinzugefügt - - - Deleted - Gelöscht - - - Modified - Geändert - - - Renamed - Umbenannt - - - Copied - Kopiert - - - Ignored - Ignoriert - - - Untracked - Nicht getrackt - - - Unreadable - Unlesbar - - - Conflicted - Mit konflikten - - - Unmodified - Unverändert - - - Type Change - Typen-Änderung - - FileWidget - + LFS LFS - - + + Unlock Entsperren - - + + Lock Sperren - - + + Show Object Objekt anzeigen - + Edit File Datei bearbeiten - + Discard File Datei verwerfen - + Directory Ordner - + File Datei - + Remove %1? %1 löschen? - + Discard Changes? Änderungen verwerfen? - + Are you sure you want to remove '%1'? Bist Du sicher, dass Du '%1' löschen willst? - + Are you sure you want to discard all changes in '%1'? Bist Du sicher, dass Du alle Änderungen in '%1' verwerfen willst? - + This action cannot be undone. Die Aktion kann nicht rückgängig gemacht werden. - + Remove %1 %1 löschen - + Discard Changes Änderungen verwerfen - + Discard Verwerfen - + discard verwerfe - - + + Collapse File Datei zuklappen - - + + Expand File Datei aufklappen - + Show Pointer Pointer anzeigen @@ -2002,136 +1896,122 @@ These settings will not be saved permanently GeneralPanel - - + + Fetch every Fetchen alle - - + + minutes Minuten - - + + Push after each commit Nach jedem Commit pushen - Update submodules after pull - Submodule nach pull aktualisieren - - - - + + Update submodules after pull and clone - - + + Prune when fetching Beim Fetchen aufräumen - + No translation Keine Übersetzung - - + + User name: Benutzername: - - + + User email: E-Mail-Adresse: - - + + Automatic actions: Automatische Aktionen: - - + + Language: Sprache: - + Store credentials in secure storage Zugangsdaten in sicherem Speicher hinterlegen - Allow collection of usage data - Benutzungsdaten erfassen - - - + <a href='view'>View privacy policy</a> <a href='view'>Datenschutzerklärung ansehen</a> - + Credential store type: - - Only allow a single running instance - Nur eine laufende Instanz zulassen - - - - Credentials: - Zugangsdaten: + + Available Credential stores: + - Usage reporting: - Telemetrie: + + Only allow a single running instance + Nur eine laufende Instanz zulassen - Terminal emulator command: - Terminal-Emulator-Befehl: + + No credential store set + - File manager command: - Dateimanager-Befehl: + + No credential store is set. Go to the application settings to set the desired credential store + - - Single instance: - Einzelne Instanz: + + + - - - GitHub - Connection failed - Verbinden fehlgeschlagen + + Available Credential stores + - Failed to authenticate with GitHub! - Anmledung an GitHub fehlgeschladen! + + Credentials: + Zugangsdaten: - Successfully authenticated with GitHub! - Anmeldung an GitHub erfolgreich! + + Single instance: + Einzelne Instanz: GitLab - - Connection failed - Verbinden fehlgeschlagen - Authentication failed @@ -2141,7 +2021,7 @@ These settings will not be saved permanently Header - + Filter %1 Filtere %1 @@ -2170,26 +2050,26 @@ These settings will not be saved permanently HunkWidget + - Save Speichern + - Undo Rückgängig + - Use Ours Unseres benutzen + - Use Theirs Ihres benutzen @@ -2218,19 +2098,11 @@ These settings will not be saved permanently Discard selected lines - - Discard Hunk? - Hunk verwerfen? - Are you sure you want to remove '%1'? Bist Du sicher, dass Du '%1' entfernen willst? - - Are you sure you want to discard the hunk starting at line %1 in '%2'? - Bist Du sicher, dass Du die Änderungen im Hunk ab Zeile %1 in '%2' verwerfen willst? - This action cannot be undone. @@ -2277,13 +2149,6 @@ These settings will not be saved permanently - - ImageContentWidget - - <b>Size:</b> %1 - <b>Größe:</b> %1 - - Images @@ -2327,12 +2192,12 @@ These settings will not be saved permanently LfsPanel - + Initialize LFS LFS initialisieren - + Specify a glob pattern for tracking large files. Generally, large files are greater than 500kB, change frequently, @@ -2357,92 +2222,92 @@ Beispiele - + Pattern: Muster: - + Track Tracken - + days Tage - + Fetch LFS objects from all references for the past LFS-Objekte von allen Referenzen aus der Vergangenheit fetchen - + reference days or Referenz-Tage oder - + commit days Commit-Tage - + View Environment Umgebung ansehen - + git-lfs env (read only) git-lfs env (nur lesen) - + Deinitialize LFS LFS deinitialisieren - + Deinitialize LFS? LFS deinitialisieren? - + Are you sure you want uninstall LFS from this repository? Bist Du sicher, dass Du LFS aus diesem Repository deinstallieren willst? - + Deinitialize Deinitialisieren - + Server URL: Server-URL: - + Prune Offset: Prune-Offset: - + Fetch Recent: Neue holen: - + Advanced: Erweitert: - + Included patterns: - + Excluded patterns: @@ -2526,7 +2391,7 @@ Beispiele LogView - + Copy Kopieren @@ -2534,59 +2399,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 @@ -3045,10 +2910,6 @@ Beispiele Hide Log Log verstecken - - Show Diff View - Unterschiede anzeigen - Merge @@ -3135,14 +2996,6 @@ Beispiele Choose a reference to squash into '%1'. Wähle eine Referenz aus, die nach %1 gesquasht werden soll. - - Choose a reference to merge into <b>%1</b>. - Wähle eine Referenz aus, die nach <b>%1</b> gemergt werden soll. - - - Choose a reference to rebase <b>%1</b> on. - Wähle eine Referenz aus, die auf <b>%1</b> gerebased werden soll. - MergeTool @@ -3155,12 +3008,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: @@ -3273,7 +3126,7 @@ Beispiele PullRequestButton - + Create Pull Request Pull-Request erstellen @@ -3359,7 +3212,7 @@ Beispiele - + Your global GIT configuration is invalid, Gittyup won't run properly until this is fixed @@ -3402,19 +3255,6 @@ Beispiele Would you like to fix the merge conflict and continue? - - Keep rebase - Rebase behalten - - - The rebase caused a merge conflict. -As GitAhead currently doesn't support working on rebase conflicts, -you have the option to continue solving the conflict using the command line - Der Rebase hat einen Merge-Konflikt ausgelöst. -Da GitAhead derzeit keine Unterstützung zum Arbeiten mit Rebase- -Konflikten hat, hast Du die Option, mithilfe der Kommandozeile den -Konflikt zu beheben - Reference @@ -3435,17 +3275,17 @@ Konflikt zu beheben ReferenceModel - + Branches Branches - + Remotes Remotes - + Tags Tags @@ -3453,65 +3293,57 @@ Konflikt zu beheben ReferenceView - + Branch Branch - + Remote Remote - + Tag Tag - + Checkout Auschecken - + Rename Umbenennen - + Delete Löschen - + Push Tag to %1 Pushe Tag nach %1 - + Squash... Squashen... - Delete Tag - Lösche Tag - - - delete tag - lösche Tag - - - + New Local Branch Neuer lokaler Branch - + Merge... Mergen... - + Rebase... Rebasen... @@ -3519,7 +3351,7 @@ Konflikt zu beheben RefreshButton - + Refresh Aktualisieren @@ -3527,7 +3359,7 @@ Konflikt zu beheben RemoteButton - + 999+ 999+ @@ -3535,59 +3367,59 @@ Konflikt zu beheben RemoteCallbacks - + remote: %1 remote: %1 - + failed to execute pre-push hook: bash not found Ausführen des Pre-Push-Hooks fehlgeschlagen: Bash nicht gefunden - + failed to execute pre-push hook: %1 Ausführen des Pre-Push-Hooks fehlgeschlagen: %1 - + HTTPS Credentials HTTPS-Zugangsdaten - + SSH Passphrase SSH-Passphrase - + Username: Benutzername: - + Password: Passwort: - + Passphrase: Passphrase: - - + + authentication canceled Authentifizierung abgebrochen - + From %1 Von %1 - - + + To %1 Nach %1 @@ -3692,10 +3524,6 @@ Konflikt zu beheben Choose protocol to authenticate with the remote. Wähle ein Protokoll zur Authentifizierung am Remote. - - Enter the URL of the remote repository. - Gib die URL des entfernten Repositories ein. - Enter the URL of the remote repository or browse for a local directory @@ -3743,17 +3571,17 @@ Konflikt zu beheben RemotesPanel - + Delete Remote? Remote löschen? - + Are you sure you want to delete '%1'? Bist Du sicher, dass Du '%1' löschen willst? - + Delete Löschen @@ -3827,10 +3655,6 @@ Konflikt zu beheben Search Suche - - The indexer worker process crashed. If this problem persists please contact us at support@gitahead.com. - Der Indexer-Arbeitsprozess ist abgestürzt. Falls das Problem bestehen bleibt, bitte kontaktiere uns unter support@gitahead.com. - Indexer Crashed @@ -4058,8 +3882,8 @@ was added to %1 - - + + <i>no remote</i> <i>kein Remote</i> @@ -4070,7 +3894,7 @@ was added to %1 - + Fetch canceled. Fetchen abgebrochen. @@ -4086,216 +3910,213 @@ was added to %1 - - + + 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 - There was a merge conflict. The rebase has been left open - Es gab einen Merge-Konflikt. Der Rebase wurde offen gelassen - - - There was a merge conflict. The rebase has been aborted - 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. @@ -4304,412 +4125,388 @@ 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 - Force Push? - 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>. - You may want to integrate remote commits first by <a href='action:pull'>pulling</a>. Then <a href='action:push'>push</a> again. - Ggf. möchtest Du entfernte commits integrieren, indem du <a href='action:pull'>pullst</a> und danach erneut <a href='action:push'>pushst</a>. - - - If you really want the remote to lose commits, you may be able to <a href='action:push?force=true'>force push</a>. - 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 - Amend? - Amenden? - - - Reset? - Zurücksetzen? - - - Are you sure you want to amend '%1'? - 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 @@ -4719,112 +4516,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. @@ -4837,12 +4634,12 @@ Dies reverted den Commit %2. Repository - + Unknown error Unbekannter Fehler - + git-lfs not found git-lfs nicht gefunden @@ -4858,32 +4655,32 @@ Dies reverted den Commit %2. SearchPanel - + Enable indexing Indizierung aktivieren - + terms Terme - + lines Zeilen - + Limit commits to: Beschränke Commits auf: - + Diff context: Diff-Kontext: - + Remove Index Index entfernen @@ -4891,32 +4688,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 @@ -4924,67 +4721,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 @@ -5015,89 +4812,89 @@ Dies reverted den Commit %2. SideBar - + Close Schließen - - - + + + Remove Entfernen - + Authorize Authorisieren - + Clone Repository Repository klonen - + Open Existing Repository Bestehendes Repository öffnen - + Open Repository Repository öffnen - + Initialize New Repository Neues Repository initialisieren - + Add %1 Account %1-Account hinzufügen - + <p>Are you sure you want to remove the remote repository association for %1?</p><p>The local clone itself will not be affected.</p> <p>Bist Du sicher, dass Du die Zuordnung zum entfernten Repository für %1 entfernen willst?</p><p>Der lokale Klon selber wird nicht betroffen sein.</p> - + Remove Repository Association? Zuordnung zu entferntem Repository entfernen? - + Clear All Recent 'Zuletzt geöffnet' leeren - + Show Full Path Vollständigen Pfad anzeigen - + Filter Non-existent Paths Non-Existente Pfade filtern - + Refresh Remote Accounts Entfernte Accounts aktualisieren - + Show Full Name Vollständigen Namen anzeigen - + <p>Are you sure you want to remove the %1 account for '%2'?</p><p>Only the account association will be removed. Remote configurations and local clones will not be affected.</p> <p>Bist Du sicher, dass Du den %1-Account für '%2' entfernen möchtest?</p><p>Nur die Account-Zuordnung ist davon betroffen; Remote-Einstellungen und lokale Klone werden nicht betroffen sein.</p> - + Remove Account? Account entfernen? @@ -5244,12 +5041,12 @@ Dies reverted den Commit %2. Submodul deinitialisieren? - + The submodule working directory contains uncommitted changes that will be lost if you continue. Der Arbeitsorder des Submoduls enthält uncommittete Änderungen, die verloren gehen, wenn Du fortfährst. - + Deinitialize Deinitialisieren @@ -5372,23 +5169,23 @@ x (number) determines the number of maximum files shown TerminalPanel - - + + Install Installieren - + Name: Name: - + Location: Ort: - + Uninstall Deinstallieren @@ -5396,42 +5193,38 @@ x (number) determines the number of maximum files shown TextEdit - + Replace... - + Replace All... - + Ignore Ignorieren - + Ignore All - + Add to User Dictionary - + Do not Ignore ThemeDialog - - Native Theme - Natives Thema - A flexible look matching system colors @@ -5471,112 +5264,108 @@ x (number) determines the number of maximum files shown ToolBar - + Show repository sidebar Repository-Seitenleiste anzeigen - + Previous Vorheriges - + Next Nächstes - + Fetch Fetchen - + Pull Pullen - + Merge - + Rebase - + Push Pushen - + Checkout Auschecken - + Stash Stashen - + Pop Stash Stash poppen - + Open Terminal Terminal öffnen - + Open file manager Dateimanager öffnen - + Configure Settings Einstellungen - + Repository settings - + Application settings - - + + Show Log Log anzeigen - + Double Tree View - Diff View - Unterschiede anzeigen - - - + Tree View Baumansicht benutzen - + Show Starred Commits Favorisierte Commits anzeigen - + Hide Log Log verstecken @@ -5584,42 +5373,42 @@ x (number) determines the number of maximum files shown ToolsPanel - + Keep backup of merge files (.orig) Backups von Merge-Dateien (.orig) behalten - + External editor: Externer Editor: - + External diff: Externes Diff: - + External merge: Externes Merge: - + Backup files: Backup-Dateien: - + Terminal emulator command: Terminal-Emulator-Befehl: - + File manager command: Dateimanager-Befehl: - + Configure Konfigurieren @@ -5689,13 +5478,6 @@ x (number) determines the number of maximum files shown Groß- / Kleinschreibung beachten - - UntrackedDirWidget - - A directory containing no tracked file. - Ein Ordner ohne getrackte Dateien. - - UpToDateDialog @@ -5766,22 +5548,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: @@ -5817,44 +5599,39 @@ x (number) determines the number of maximum files shown Kann nicht auf Updates prüfen - + Unable to download update Kann Update nicht herunterladen - + Unable to open temporary file Kann temporäre Datei nicht öffnen - + Unable to install update Kann Update nicht installieren - + Some windows failed to close. You can download the binary manually from %1 - Some windows failed to close - Einige Fenster konnten nicht geschlossen werden - - - + Unknown install error Unbekannter Installations-Fehler - - + + Installer script failed: %1 Installer-Skript schlug fehl: %1 - - - + + Helper application failed to start Helfer-Programm konnte nicht gestartet werden @@ -5863,131 +5640,116 @@ x (number) determines the number of maximum files shown Installer failed to start Installer konnte nicht gestartet werden - - - The disk image failed to mount successfully - Das Volumen-Abbild konnte nicht eingehangen werden - - - - The existing bundle could not be moved to the trash - Das bereits vorhandene Paket konnte nicht in den Papierkorb verschoben werden - - - - The new bundle could not be copied into place - Das neue Paket konnte nicht an den Zielort verschoben werden - WindowPanel - + Add New Theme Neues Thema hinzufügen - + Edit Current Theme Aktuelles Thema bearbeiten - + Create Theme Thema erstellen - + Theme Name Name des Themas - + Restart? Neustart? - + The application must be restarted for the theme change to take effect. Die Anwendung muss neu gestartet werden, damit die Änderungen am Thema übernommen werden. - + Do you want to restart now? Möchtest Du jetzt neu starten? - + Restart Neustart - + Later Später - + Show full repository path Zeige vollen Repository-Pfad - + Hide automatically Automatisch verstecken - + Open submodules in tabs Submodule in Tabs öffnen - + Open all repositories in tabs Alle Repositories in Tabs öffnen - + Hide Menubar - + Show Avatars - + Show Window Maximized when opened - + Theme: Thema: - + Title: Titel: - + Log: Log: - + Tabs: Tabs: - + View: - + Prompt: Aufforderungen: @@ -5995,29 +5757,29 @@ x (number) determines the number of maximum files shown _FileWidget::Header - - + + Use Theirs: Delete - - + + Use Ours: Delete - + both: %1 - + ours: %1 - + theirs: %1 diff --git a/l10n/gittyup_en.ts b/l10n/gittyup_en.ts index 44992e452..6aed74b46 100644 --- a/l10n/gittyup_en.ts +++ b/l10n/gittyup_en.ts @@ -32,27 +32,27 @@ Account - + Connection failed - + <b>Note:</b> Basic authentication is not supported if you have two-factor authentication enabled. Use a <a href='https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/'>personal access token</a> in the password field instead. - + <b>Note:</b> Only Basic authentication is currently supported - + <b>Note:</b> Basic authentication is not supported. Use a <a href='https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html'>personal access token</a> in the password field instead. - + Authentication failed @@ -150,162 +150,162 @@ AdvancedSearchWidget - + Author: - + Author name - + Email: - + Author email - + Message: - + Commit message - + Date: - + Specific commit date - + After: - + Commits after date - + Before: - + Commits before date - + File: - + File name - + Path: - + File path - + Scope: - + Hunk header text - + Context: - + Diff context (white) - + Addition: - + Diff addition (green) - + Deletion: - + Diff deletion (red) - + Comment: - + Source code comment - + String: - + Source code string literal - + Identifier: - + Source code identifier - + Search - + Return @@ -341,12 +341,12 @@ Application - + SSL Errors - + Failed to set up SSL session. Do you want to ignore these errors? @@ -354,17 +354,17 @@ AuthorCommitterDate - + Author/Committer: - + Author: - + Committer: @@ -372,27 +372,27 @@ BlameEditor - + Untitled - + Not Tracked - + HEAD - + Working Copy - + Save File @@ -400,12 +400,12 @@ BlameMargin - + Not Committed - + Invalid Signature @@ -524,27 +524,27 @@ CommitDetail - + Copy - + Range: - + Id: - + initial commit - + Parents: @@ -602,165 +602,165 @@ CommitEditor - + T - + <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 @@ -905,7 +905,7 @@ CommitToolBar - + Show All Branches @@ -915,42 +915,47 @@ - + + Show Selected Branch, First Parent Only + + + + Sort by Date - + Sort Topologically - + Show Graph - + Show Clean Status - + Compact Mode - + Show Author - + Show Date - + Show Id @@ -958,56 +963,89 @@ ConfigDialog - + Esc - + General - + Diff - + Remotes - + Branches - + Submodules - + Search - + Plugins - + LFS - + Edit Config File... + + CredentialHelper + + + Caching the credentials in the RAM. Required to enter credentials on every startup + + + + + Storing the credentials unencrypted on disk, protected only by filesystem permissions <a href="https://git-scm.com/docs/git-credential-store">git-credential-store</a> + + + + + MacOS credential manager + + + + + Windows credential manager + + + + + Secret Service D-Bus client library + + + + + Prefer <a href="https://wiki.gnome.org/Projects/Libsecret">libsecret</a> over gnome-keyring if available + + + DateSelectionGroupWidget @@ -1097,17 +1135,17 @@ - + Push canceled. - + Unable to push to %1 - %2 - + The branch is not fully merged. Deleting it may cause some commits to be lost. @@ -1145,22 +1183,22 @@ - + Push canceled. - + Unable to push to %1 - %2 - + Delete Tag - + delete tag @@ -1168,24 +1206,24 @@ DetailView - - + + Author: - + reset - + Here you can set the author used for committing These settings will not be saved permanently - + Email: @@ -1193,57 +1231,57 @@ These settings will not be saved permanently DiffPanel - + lines - + System Locale - + Wrap lines - + Context lines: - + Wrap lines: - + Character Encoding: - + Ignore Whitespace (-w) - + Added files - + Deleted files - + Whitespace: - + Auto Collapse: @@ -1251,10 +1289,15 @@ These settings will not be saved permanently DiffTool - + External Diff + + + External Diff to Working Copy + + DiffTreeModel @@ -1267,12 +1310,12 @@ These settings will not be saved permanently DiffView - + Add new file - + Or drag files here to copy into the repository @@ -1352,57 +1395,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: @@ -1474,234 +1517,237 @@ These settings will not be saved permanently - + + Bash Not Found - + + Bash was not found on your PATH. - + + Bash is required to execute external tools. - + Stage - + Unstage - + Discard Changes - + Discard Changes? - + Are you sure you want to discard changes in the selected files? - + This action cannot be undone. - + (Submodule) - + %1 files - + Discard - + discard - + Remove Untracked Files - + Ignore - + Checkout - + Unlock - + Lock - + Copy File Name - + Filter History - + Navigate to - + Next Revision - + next - + Previous Revision - + previous - + Unset Executable - + Set Executable - + Save Selected Version as ... - + Select new file directory - + Saving files - + Saving files of selected version to disk - + Save file - + Invalid Blob - + Open this version - + Opening file - + Open - + open file - + Blob is invalid. - - + + Unable to checkout bare repositories - + Unable to open files from bare repository - + The file is already in the current working directory - + edit - + diff - + merge - + External Tool Not Found - + Failed to execute external %1 tool. @@ -1709,107 +1755,107 @@ These settings will not be saved permanently FileWidget - + LFS - - + + Unlock - - + + Lock - - + + Show Object - + Edit File - + Discard File - + Directory - + File - + Remove %1? - + Discard Changes? - + Are you sure you want to remove '%1'? - + Are you sure you want to discard all changes in '%1'? - + This action cannot be undone. - + Remove %1 - + Discard Changes - + Discard - + discard - - + + Collapse File - - + + Expand File - + Show Pointer @@ -1850,94 +1896,119 @@ These settings will not be saved permanently GeneralPanel - - + + Fetch every - - + + minutes - - + + Push after each commit - - + + Prune when fetching - + No translation - + Store credentials in secure storage - - + + Update submodules after pull and clone - + <a href='view'>View privacy policy</a> - - + + User name: - - + + User email: - - + + Automatic actions: - - + + Language: - + Credentials: - + Credential store type: - + + Available Credential stores: + + + + Only allow a single running instance - + Single instance: + + + No credential store set + + + + + No credential store is set. Go to the application settings to set the desired credential store + + + + + + + + + + Available Credential stores + + GitLab @@ -1950,7 +2021,7 @@ These settings will not be saved permanently Header - + Filter %1 @@ -1979,26 +2050,26 @@ These settings will not be saved permanently HunkWidget + - Save + - Undo + - Use Ours + - Use Theirs @@ -2121,12 +2192,12 @@ These settings will not be saved permanently LfsPanel - + Initialize LFS - + Specify a glob pattern for tracking large files. Generally, large files are greater than 500kB, change frequently, @@ -2141,92 +2212,92 @@ Examples - + Pattern: - + Track - + days - + Fetch LFS objects from all references for the past - + reference days or - + commit days - + View Environment - + git-lfs env (read only) - + Deinitialize LFS - + Deinitialize LFS? - + Are you sure you want uninstall LFS from this repository? - + Deinitialize - + Server URL: - + Prune Offset: - + Fetch Recent: - + Advanced: - + Included patterns: - + Excluded patterns: @@ -2310,7 +2381,7 @@ Examples LogView - + Copy @@ -2318,59 +2389,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 @@ -2927,12 +2998,12 @@ Examples MiscPanel - + Path to SSH config file: - + Path to default / fallback SSH key file: @@ -3045,7 +3116,7 @@ Examples PullRequestButton - + Create Pull Request @@ -3131,7 +3202,7 @@ Examples - + Your global GIT configuration is invalid, Gittyup won't run properly until this is fixed @@ -3194,17 +3265,17 @@ Would you like to fix the merge conflict and continue? ReferenceModel - + Branches - + Remotes - + Tags @@ -3212,57 +3283,57 @@ Would you like to fix the merge conflict and continue? ReferenceView - + Branch - + Remote - + Tag - + Checkout - + Rename - + Delete - + Push Tag to %1 - + New Local Branch - + Merge... - + Rebase... - + Squash... @@ -3270,7 +3341,7 @@ Would you like to fix the merge conflict and continue? RefreshButton - + Refresh @@ -3278,7 +3349,7 @@ Would you like to fix the merge conflict and continue? RemoteButton - + 999+ @@ -3286,59 +3357,59 @@ Would you like to fix the merge conflict and continue? RemoteCallbacks - + remote: %1 - + failed to execute pre-push hook: bash not found - + failed to execute pre-push hook: %1 - + HTTPS Credentials - + SSH Passphrase - + Username: - + Password: - + Passphrase: - - + + authentication canceled - + From %1 - - + + To %1 @@ -3490,17 +3561,17 @@ Would you like to fix the merge conflict and continue? RemotesPanel - + Delete Remote? - + Are you sure you want to delete '%1'? - + Delete @@ -3806,8 +3877,8 @@ was added to %1 - - + + <i>no remote</i> @@ -3818,7 +3889,7 @@ was added to %1 - + Fetch canceled. @@ -3834,596 +3905,601 @@ was added to %1 - - + + 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 @@ -4433,112 +4509,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. @@ -4546,12 +4622,12 @@ This reverts commit %2. Repository - + Unknown error - + git-lfs not found @@ -4567,32 +4643,32 @@ This reverts commit %2. SearchPanel - + Enable indexing - + terms - + lines - + Limit commits to: - + Diff context: - + Remove Index @@ -4600,32 +4676,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 @@ -4633,67 +4709,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 @@ -4724,89 +4800,89 @@ This reverts commit %2. SideBar - + Close - - - + + + Remove - + Authorize - + Clone Repository - + Open Existing Repository - + Open Repository - + Initialize New Repository - + Add %1 Account - + <p>Are you sure you want to remove the remote repository association for %1?</p><p>The local clone itself will not be affected.</p> - + Remove Repository Association? - + Clear All Recent - + Show Full Path - + Filter Non-existent Paths - + Refresh Remote Accounts - + Show Full Name - + <p>Are you sure you want to remove the %1 account for '%2'?</p><p>Only the account association will be removed. Remote configurations and local clones will not be affected.</p> - + Remove Account? @@ -4953,12 +5029,12 @@ This reverts commit %2. - + The submodule working directory contains uncommitted changes that will be lost if you continue. - + Deinitialize @@ -5081,23 +5157,23 @@ x (number) determines the number of maximum files shown TerminalPanel - - + + Install - + Name: - + Location: - + Uninstall @@ -5105,32 +5181,32 @@ x (number) determines the number of maximum files shown TextEdit - + Replace... - + Replace All... - + Ignore - + Ignore All - + Add to User Dictionary - + Do not Ignore @@ -5176,108 +5252,108 @@ x (number) determines the number of maximum files shown ToolBar - + Show repository sidebar - + Previous - + Next - + Fetch - + Pull - + Merge - + Rebase - + Push - + Checkout - + Stash - + Pop Stash - + Open Terminal - + Open file manager - + Configure Settings - + Repository settings - + Application settings - - + + Show Log - + Double Tree View - + Tree View - + Show Starred Commits - + Hide Log @@ -5285,42 +5361,42 @@ x (number) determines the number of maximum files shown ToolsPanel - + Keep backup of merge files (.orig) - + External editor: - + External diff: - + External merge: - + Backup files: - + Terminal emulator command: - + File manager command: - + Configure @@ -5460,22 +5536,22 @@ x (number) determines the number of maximum files shown UpdatePanel - + Check for updates automatically - + Automatically download and install updates - + Check Now - + Software Update: @@ -5506,24 +5582,8 @@ x (number) determines the number of maximum files shown - - The disk image failed to mount successfully - - - - - The existing bundle could not be moved to the trash - - - - - The new bundle could not be copied into place - - - - - - + + Helper application failed to start @@ -5538,33 +5598,33 @@ x (number) determines the number of maximum files shown - + Unable to download update - + Unable to open temporary file - + Unable to install update - + Some windows failed to close. You can download the binary manually from %1 - + Unknown install error - - + + Installer script failed: %1 @@ -5572,112 +5632,112 @@ x (number) determines the number of maximum files shown WindowPanel - + Add New Theme - + Edit Current Theme - + Create Theme - + Theme Name - + Restart? - + The application must be restarted for the theme change to take effect. - + Do you want to restart now? - + Restart - + Later - + Show full repository path - + Hide automatically - + Open submodules in tabs - + Open all repositories in tabs - + Hide Menubar - + Show Avatars - + Show Window Maximized when opened - + Theme: - + Title: - + Log: - + Tabs: - + View: - + Prompt: @@ -5685,29 +5745,29 @@ x (number) determines the number of maximum files shown _FileWidget::Header - - + + Use Theirs: Delete - - + + Use Ours: Delete - + both: %1 - + ours: %1 - + theirs: %1 diff --git a/l10n/gittyup_es.ts b/l10n/gittyup_es.ts index 18a52ad06..69ae34818 100644 --- a/l10n/gittyup_es.ts +++ b/l10n/gittyup_es.ts @@ -28,39 +28,31 @@ Privacy Privacidad - - Usage reporting has been disabled. Restart the application for changes to take effect. - El reporte de uso ha sido deshabilitado. Reinicia la aplicación para que los cambios tengan efecto. - - - Usage Reporting Disabled - Reporte de Uso Deshabilitado - Account - + Connection failed Conexión fallida - + <b>Note:</b> Basic authentication is not supported if you have two-factor authentication enabled. Use a <a href='https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/'>personal access token</a> in the password field instead. <b>Nota:</b> La Autenticación Básica no es soportada si tienes autenticación de dos factores habilitada. Usa un <a href='https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/'>token de acceso personal</a> en el campo de contraseña. - + <b>Note:</b> Only Basic authentication is currently supported - + <b>Note:</b> Basic authentication is not supported. Use a <a href='https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html'>personal access token</a> in the password field instead. <b>Nota:</b> La Autenticación Básica no es soportada. Use a <a href='https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html'>token de acceso personal</a> en el campo de contraseña. - + Authentication failed Autenticación fallida @@ -158,162 +150,162 @@ AdvancedSearchWidget - + Author: Autor: - + Author name Nombre del Autor - + Email: Correo electrónico: - + Author email Correo electrónico del autor - + Message: Mensaje: - + Commit message Mensaje de confirmación - + Date: Fecha: - + Specific commit date Fecha específica de confirmación - + After: Después de: - + Commits after date Confirmaciones después de la fecha - + Before: Antes de: - + Commits before date Confirmaciones antes de la fecha - + File: Archivo: - + File name Nombre de archivo - + Path: Ruta: - + File path Ruta del archivo - + Scope: Ámbito: - + Hunk header text Parte del encabezado de texto - + Context: Contexto: - + Diff context (white) Diferencia de contexto (blanco) - + Addition: Adición: - + Diff addition (green) Diferencia de adición (verde) - + Deletion: Borrado: - + Diff deletion (red) Diferencia de borrado (rojo) - + Comment: Comentario: - + Source code comment Comentario de código fuente - + String: Cadena de texto: - + Source code string literal Cadena de texto de código fuente - + Identifier: Identificador: - + Source code identifier Identificador de código fuente - + Search Buscar - + Return Retornar @@ -349,12 +341,12 @@ Application - + SSL Errors Errores SSL - + Failed to set up SSL session. Do you want to ignore these errors? Falló al establecer la sesión SSL. ¿Quieres ignorar estos errores? @@ -362,59 +354,45 @@ AuthorCommitterDate - + Author/Committer: - + Author: - + Committer: - - Beanstalk - - Connection failed - Conexión fallida - - - - Bitbucket - - Connection failed - Conexión fallida - - BlameEditor - + Untitled Sin título - + Not Tracked Sin seguimiento - + HEAD - + Working Copy Copia de trabajo - + Save File Guardar archivo @@ -422,12 +400,12 @@ BlameMargin - + Not Committed No confirmado - + Invalid Signature Firma inválida @@ -546,27 +524,27 @@ CommitDetail - + Copy Copiar - + Range: Rango: - + Id: - + initial commit Confirmación inicial - + Parents: Padres: @@ -627,181 +605,165 @@ CommitEditor - + T - + <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 - Update %1 - Actualizar %1 - - - Update %1 and %2 - Actualizar %1 y %2 - - - Update %1, %2, and %3 - Actualizar %1, %2 y %3 - - - Update %1, %2, and %3 more files... - 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,131 +771,123 @@ 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... - Delete Tag %1 - Borrar Etiqueta %1 - - - Delete Branch %1 - 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 +895,12 @@ CommitModel - + Uncommitted changes Cambios sin confirmar - + Checking for uncommitted changes Revisando por cambios sin confirmar @@ -954,7 +908,7 @@ CommitToolBar - + Show All Branches Mostrar todas las ramas @@ -964,42 +918,47 @@ Mostrar rama seleccionada - + + Show Selected Branch, First Parent Only + + + + Sort by Date Ordenar por fecha - + Sort Topologically Ordenar topológicamente - + Show Graph Mostrar Diagrama - + Show Clean Status Mostrar Estado Limpio - + Compact Mode Modo Compacto - + Show Author - + Show Date - + Show Id @@ -1007,56 +966,89 @@ ConfigDialog - + Esc - + General - + Diff Diferencia - + Remotes Remotos - + Branches Ramas - + Submodules Submódulos - + Search Búsqueda - + Plugins - + LFS - + Edit Config File... Editar archivo de configuración... + + CredentialHelper + + + Caching the credentials in the RAM. Required to enter credentials on every startup + + + + + Storing the credentials unencrypted on disk, protected only by filesystem permissions <a href="https://git-scm.com/docs/git-credential-store">git-credential-store</a> + + + + + MacOS credential manager + + + + + Windows credential manager + + + + + Secret Service D-Bus client library + + + + + Prefer <a href="https://wiki.gnome.org/Projects/Libsecret">libsecret</a> over gnome-keyring if available + + + DateSelectionGroupWidget @@ -1107,10 +1099,6 @@ Add %1 account Añadir cuenta de %1 - - View getting started videos - Ver videos para empezar - Contact us for support @@ -1150,17 +1138,17 @@ Enviar - + Push canceled. Envío cancelado. - + Unable to push to %1 - %2 No es posible enviar a %1 - %2 - + The branch is not fully merged. Deleting it may cause some commits to be lost. La rama no está totalmente fusionada. Borrarla puede causar que algunas confirmaciones se pierdan. @@ -1198,22 +1186,22 @@ Enviar - + Push canceled. Envío cancelado. - + Unable to push to %1 - %2 No es posible enviar a %1 - %2 - + Delete Tag Borrar Etiqueta - + delete tag borrar etiqueta @@ -1221,24 +1209,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: @@ -1246,57 +1234,57 @@ These settings will not be saved permanently DiffPanel - + lines líneas - + System Locale Local del sistema - + 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: @@ -1304,10 +1292,15 @@ These settings will not be saved permanently DiffTool - + External Diff Diff externo + + + External Diff to Working Copy + + DiffTreeModel @@ -1320,12 +1313,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 @@ -1405,57 +1398,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: @@ -1527,409 +1520,345 @@ These settings will not be saved permanently El archivo seleccionado no tiene una revisión %1. - + + Bash Not Found Bash No Encontrado - + + Bash was not found on your PATH. Bash no fue encontrado en su PATH. - + + Bash is required to execute external tools. Bash es requerido para ejecutar herramientas externas. - + Stage Preparar - + Unstage No preparar - + Discard Changes Descartar Cambios - + Discard Changes? ¿Descartar Cambios? - + Are you sure you want to discard changes in the selected files? ¿Estás seguro que quieres descartar los cambios en los archivos seleccionados? - + This action cannot be undone. Esta acción no puede ser deshecha. - + (Submodule) - + %1 files %1 archivos - + Discard Descartar - + discard descartar - + Remove Untracked Files Remover archivos sin seguimiento - + Ignore Ignorar - + Checkout Revisar - + Unlock Desbloquear - + Lock Bloquear - + Copy File Name Copiar Nombre de Archivo - + Filter History Filtrar Historia - + Navigate to Navegar a - + Next Revision Siguiente revisión - + next siguiente - + Previous Revision Revisión Anterior - + previous anterior - + Unset Executable Desestablecer Ejecutable - + Set Executable Establecer Ejecutable - + Save Selected Version as ... - + Select new file directory - + Saving files - + Saving files of selected version to disk - + Save file - + Invalid Blob - + Open this version - + Opening file - + Open - + open file - + Blob is invalid. - - + + Unable to checkout bare repositories - + Unable to open files from bare repository - + The file is already in the current working directory - + edit Editar - + diff diferencia - + merge fusionar - + External Tool Not Found Herramienta Externa No Encontrada - + Failed to execute external %1 tool. Falló al ejecutar la herramienta %1 externa. - - FileList - - Sort By - Ordenar Por - - - Select - Seleccionar - - - Name - Nombre - - - Status - Estado - - - Ignore Whitespace (-w) - Ignorar Espacio en Blanco (-w) - - - Added - Añadido - - - Deleted - Borrado - - - Modified - Modificado - - - Renamed - Renombrado - - - Copied - Copiado - - - Ignored - Ignorado - - - Untracked - Sin seguimiento - - - Unreadable - Ilegible - - - Conflicted - Con Conflicto - - - Unmodified - Sin modificar - - - Type Change - Tipo de Cambio - - FileWidget - + LFS - - + + Unlock Desbloquear - - + + Lock Bloquear - - + + Show Object Mostrar Objeto - + Edit File Editar Archivo - + Discard File Descartar Archivo - + Directory Directorio - + File Archivo - + Remove %1? ¿Remover %1? - + Discard Changes? ¿Descartar Cambios? - + Are you sure you want to remove '%1'? ¿Estás seguro que deseas remover %1? - + Are you sure you want to discard all changes in '%1'? ¿Estás seguro que quieres descartar todos los cambios en %1? - + This action cannot be undone. Esta acción no puede ser deshecha. - + Remove %1 Remover %1 - + Discard Changes Descartar Cambios - + Discard Descartar - + discard descartar - - + + Collapse File Ocultar Archivo - - + + Expand File Expandir Archivo - + Show Pointer Mostrar Puntero @@ -1970,128 +1899,122 @@ These settings will not be saved permanently GeneralPanel - - + + Fetch every Traer cada - - + + minutes minutos - - + + Push after each commit Enviar después de cada confirmación - Update submodules after pull - Actualizar submódulos después de combinar - - - - + + Update submodules after pull and clone - - + + Prune when fetching Podar cuando se traiga - + No translation No traducir - - + + User name: Nombre de usuario: - - + + User email: Correo electrónico del usuario: - - + + Automatic actions: Acciones automáticas: - + Credential store type: - - Only allow a single running instance + + Available Credential stores: - - Single instance: + + Only allow a single running instance - - Store credentials in secure storage - Almacenar credenciales en almacenamiento seguro + + Single instance: + - Allow collection of usage data - Permitir la recolección de datos de uso + + No credential store set + - - <a href='view'>View privacy policy</a> - <a href='view'>Ver políticas de privacidad</a> + + No credential store is set. Go to the application settings to set the desired credential store + - - - Language: - Idioma: + + + - - Credentials: - Credenciales: + + Available Credential stores + - Usage reporting: - Reporte de uso: + + Store credentials in secure storage + Almacenar credenciales en almacenamiento seguro - - - GitHub - Connection failed - Conexión fallida + + <a href='view'>View privacy policy</a> + <a href='view'>Ver políticas de privacidad</a> - Failed to authenticate with GitHub! - ¡Falló al autenticar con GitHub! + + + Language: + Idioma: - Successfully authenticated with GitHub! - ¡Autenticado exitósamente con GitHub! + + Credentials: + Credenciales: GitLab - - Connection failed - Conexión fallida - Authentication failed @@ -2101,7 +2024,7 @@ These settings will not be saved permanently Header - + Filter %1 Filtrar %1 @@ -2130,26 +2053,26 @@ These settings will not be saved permanently HunkWidget + - Save Guardar + - Undo Deshacer + - Use Ours Usar nuestro + - Use Theirs Usar el de ellos @@ -2178,19 +2101,11 @@ These settings will not be saved permanently Discard selected lines - - Discard Hunk? - ¿Descartar parte? - Are you sure you want to remove '%1'? ¿Estás seguro que deseas remover %1? - - Are you sure you want to discard the hunk starting at line %1 in '%2'? - ¿Estás seguro que quieres descartar la parte que comienza en la línea %1 en %2? - This action cannot be undone. @@ -2280,12 +2195,12 @@ These settings will not be saved permanently LfsPanel - + Initialize LFS Inicializar LFS - + Specify a glob pattern for tracking large files. Generally, large files are greater than 500kB, change frequently, @@ -2311,92 +2226,92 @@ Ejemplos - + Pattern: Patrón: - + Track Seguir - + days días - + Fetch LFS objects from all references for the past Traer objetos LFS desde todas las referencias del pasado - + reference days or días de referencia o - + commit days días de confirmación - + View Environment Ver Entorno - + git-lfs env (read only) git-lfs env (solo lectura) - + Deinitialize LFS Desinicializar LFS - + Deinitialize LFS? ¿Desinicializar LFS? - + Are you sure you want uninstall LFS from this repository? ¿Estás seguro que quieres desinstalar LFS de este repositorio? - + Deinitialize Desinicializar - + Server URL: URL del Servidor: - + Prune Offset: Offset para podar: - + Fetch Recent: Traer Reciente: - + Advanced: Avanzado: - + Included patterns: - + Excluded patterns: @@ -2480,7 +2395,7 @@ Ejemplos LogView - + Copy Copiar @@ -2488,59 +2403,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 @@ -2562,28 +2477,16 @@ Ejemplos New Window Nueva Ventana - - Ctrl+Meta+N - Ctrl+Meta+N - Clone Repository... Clonar Repositorio... - - Ctrl+Shift+N - Ctrl+Shift+N - Initialize New Repository... Inicializar Nuevo Repositorio... - - Ctrl+Alt+N - Ctrl+Alt+N - Open Repository... @@ -2674,10 +2577,6 @@ Ejemplos Show Double Tree View - - Ctrl+E - Ctrl+E - View @@ -2730,37 +2629,21 @@ Ejemplos Stage All Preparar Todo - - Ctrl++ - Ctrl++ - Unstage All No Preparar Nada - - Ctrl+- - Ctrl+- - Commit Confirmar - - Ctrl+Shift+C - Ctrl+Shift+C - Amend Commit Enmendar Confirmación - - Ctrl+Shift+A - Ctrl+Shift+A - Git LFS @@ -2791,64 +2674,36 @@ Ejemplos Fetch Traer - - Ctrl+Shift+Alt+F - Ctrl+Shift+Alt+F - Fetch All Traer Todo - - Ctrl+Shift+Alt+A - Ctrl+Shift+Alt+A - Fetch From... Traer Desde... - - Ctrl+Shift+F - Ctrl+Shift+F - Pull Combinar - - Ctrl+Shift+Alt+L - Ctrl+Shift+Alt+L - Pull From... Combinar Desde... - - Ctrl+Shift+L - Ctrl+Shift+L - Push Enviar - - Ctrl+Shift+Alt+P - Ctrl+Shift+Alt+P - Push To... Enviar a... - - Ctrl+Shift+P - Ctrl+Shift+P - Branch @@ -2874,46 +2729,26 @@ Ejemplos Checkout Current Revisar Actual - - Ctrl+Shift+Alt+H - Ctrl+Shift+Alt+H - Checkout... Revisar... - - Ctrl+Shift+H - Ctrl+Shift+H - Merge... Fusionar... - - Ctrl+Shift+M - Ctrl+Shift+M - Rebase... Reorganizar... - - Ctrl+Shift+R - Ctrl+Shift+R - Squash... Aplastar - - Ctrl+Shift+Q - Ctrl+Shift+Q - Abort Merge @@ -2934,19 +2769,11 @@ Ejemplos Update All Actualizar Todo - - Ctrl+Shift+Alt+U - Ctrl+Shift+Alt+U - Update... Actualizar... - - Ctrl+Shift+U - Ctrl+Shift+U - Open @@ -2967,19 +2794,11 @@ Ejemplos Stash... Guardado Rápido... - - Ctrl+Shift+T - Ctrl+Shift+T - Pop Stash Sacar Guardado Rápido - - Ctrl+Shift+Alt+T - Ctrl+Shift+Alt+T - History @@ -3015,10 +2834,6 @@ Ejemplos Show Repository Chooser... Mostrar Selector de Repositorio... - - Ctrl+Shift+O - Ctrl+Shift+O - Tools @@ -3099,10 +2914,6 @@ Ejemplos Hide Log Ocultar Histórico - - Show Diff View - Mostrar Vista de Diferencias - Merge @@ -3189,14 +3000,6 @@ Ejemplos Choose a reference to squash into '%1'. Escoje una referencia para aplastas en '%1'. - - Choose a reference to merge into <b>%1</b>. - Escoge una referencia para fusionar en <b>%1</b>. - - - Choose a reference to rebase <b>%1</b> on. - Escoge una referencia para reorganizar en <b>%1</b>. - MergeTool @@ -3209,12 +3012,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: @@ -3327,7 +3130,7 @@ Ejemplos PullRequestButton - + Create Pull Request Crear Solicitud de Integración @@ -3413,7 +3216,7 @@ Ejemplos - + Your global GIT configuration is invalid, Gittyup won't run properly until this is fixed @@ -3476,17 +3279,17 @@ Would you like to fix the merge conflict and continue? ReferenceModel - + Branches Ramas - + Remotes Remotos - + Tags Etiquetas @@ -3494,57 +3297,57 @@ Would you like to fix the merge conflict and continue? ReferenceView - + Branch Rama - + Remote Remoto - + Tag Etiqueta - + Checkout Revisar - + Rename Renombrar - + Delete Borrar - + Push Tag to %1 Enviar etiqueta a %1 - + New Local Branch Nueva Rama Local - + Merge... Fusionar... - + Rebase... Reorganizar... - + Squash... Aplastar... @@ -3552,7 +3355,7 @@ Would you like to fix the merge conflict and continue? RefreshButton - + Refresh Refrescar @@ -3560,7 +3363,7 @@ Would you like to fix the merge conflict and continue? RemoteButton - + 999+ 999+ @@ -3568,59 +3371,59 @@ Would you like to fix the merge conflict and continue? RemoteCallbacks - + remote: %1 remote: %1 - + failed to execute pre-push hook: bash not found Falló al ejecutar hook pre-envío: bash no encontrado - + failed to execute pre-push hook: %1 Falló al ejecutar hook pre-envío: %1 - + HTTPS Credentials Credenciales HTTPS - + SSH Passphrase Frase de contraseña SSH - + Username: Nombre de Usuario: - + Password: Contraseña: - + Passphrase: Frase de Contraseña: - - + + authentication canceled Autenticación cancelada - + From %1 De %1 - - + + To %1 Para %1 @@ -3725,10 +3528,6 @@ Would you like to fix the merge conflict and continue? Choose protocol to authenticate with the remote. Escoge el protocolo para autenticarse con el remoto. - - Enter the URL of the remote repository. - Ingrese la URL del repositorio remoto. - Enter the URL of the remote repository or browse for a local directory @@ -3776,17 +3575,17 @@ Would you like to fix the merge conflict and continue? RemotesPanel - + Delete Remote? ¿Borrar Remoto? - + Are you sure you want to delete '%1'? ¿Estás seguro que deseas borrar %1? - + Delete Borrar @@ -3860,10 +3659,6 @@ Would you like to fix the merge conflict and continue? Search Buscar - - The indexer worker process crashed. If this problem persists please contact us at support@gitahead.com. - El proceso de indexado estalló. Si este problema persiste por favor contáctanos en support@gitahead.com. - Indexer Crashed @@ -4096,8 +3891,8 @@ was added to %1 - - + + <i>no remote</i> <i>sin remoto</i> @@ -4108,7 +3903,7 @@ was added to %1 - + Fetch canceled. Traer cancelado. @@ -4124,212 +3919,213 @@ was added to %1 - - + + 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 - There was a merge conflict. The rebase has been aborted - 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. @@ -4338,412 +4134,388 @@ 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 - Force Push? - ¿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>. - You may want to integrate remote commits first by <a href='action:pull'>pulling</a>. Then <a href='action:push'>push</a> again. - Tu podrías querer <a href='action:pull'>integrar</a> primero las confirmaciones remotas. Después <a href='action:push'>envía</a> de nuevo. - - - If you really want the remote to lose commits, you may be able to <a href='action:push?force=true'>force push</a>. - 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 - Amend? - ¿Enmendar? - - - Reset? - ¿Reestablecer? - - - Are you sure you want to amend '%1'? - ¿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 @@ -4753,112 +4525,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. @@ -4866,12 +4638,12 @@ Esto revierte la confirmación %2. Repository - + Unknown error Error desconocido - + git-lfs not found git LFS no encontrado @@ -4887,32 +4659,32 @@ Esto revierte la confirmación %2. SearchPanel - + Enable indexing Habilitar indexado - + terms términos - + lines líneas - + Limit commits to: Limitar confirmaciones a: - + Diff context: Diferencia de contexto: - + Remove Index Remover índice @@ -4920,32 +4692,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 @@ -4953,67 +4725,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 @@ -5044,89 +4816,89 @@ Esto revierte la confirmación %2. SideBar - + Close Cerrar - - - + + + Remove Remover - + Authorize Autorizar - + Clone Repository Clonar Repositorio - + Open Existing Repository Abrir Repositorio Existente - + Open Repository Abrir Repositorio - + Initialize New Repository Inicializar Nuevo Repositorio - + Add %1 Account Añadir cuenta de %1 - + <p>Are you sure you want to remove the remote repository association for %1?</p><p>The local clone itself will not be affected.</p> <p>¿Estás seguro que deseas remover la asociación al repositorio remoto de %1?</p><p>El repositorio local no será afectado.</p> - + Remove Repository Association? ¿Remover Asociación de Repositorio? - + Clear All Recent Limpiar Todos los Recientes - + Show Full Path Mostrar Ruta Completa - + Filter Non-existent Paths Filtrar Rutas no Existentes - + Refresh Remote Accounts Refrescar Cuentas Remotas - + Show Full Name Mostrar Nombre Completo - + <p>Are you sure you want to remove the %1 account for '%2'?</p><p>Only the account association will be removed. Remote configurations and local clones will not be affected.</p> <p>¿Estás seguro que deseas remover la cuenta de %1 para '%2'?</p><p>Solo la asociación de la cuenta será removida. La configuraciones remotas y repositorios locales no serán afectados.</p> - + Remove Account? ¿Remover Cuenta? @@ -5273,12 +5045,12 @@ Esto revierte la confirmación %2. ¿Desinicializar Submódulo? - + The submodule working directory contains uncommitted changes that will be lost if you continue. El directorio de trabajo del submódulo contiene cambios sin confirmar que se perderán si continuas. - + Deinitialize Desinicializar @@ -5401,23 +5173,23 @@ x (number) determines the number of maximum files shown TerminalPanel - - + + Install Instalar - + Name: Nombre: - + Location: Ubicación: - + Uninstall Desinstalar @@ -5425,42 +5197,38 @@ x (number) determines the number of maximum files shown TextEdit - + Replace... Reemplazar... - + Replace All... Reemplazar Todo... - + Ignore Ignorar - + Ignore All Ignorar Todo - + Add to User Dictionary Añador al Diccionario de Usuario - + Do not Ignore No Ignorar ThemeDialog - - Native Theme - Tema Nativo - A flexible look matching system colors @@ -5500,112 +5268,108 @@ x (number) determines the number of maximum files shown ToolBar - + Show repository sidebar Mostrar barra lateral del repositorio - + Previous Anterior - + Next Siguiente - + Fetch Traer - + Pull Combinar - + Merge Fusionar - + Rebase Reorganizar - + Push Enviar - + Checkout Revisar - + Stash Guardado Rápido - + Pop Stash Sacar Guardado Rápido - + Open Terminal - + Open file manager - + Configure Settings Configuración - + Repository settings - + Application settings - - + + Show Log Mostrar Histórico - + Double Tree View - Diff View - Vista de Diferencias - - - + Tree View Vista de Árbol - + Show Starred Commits Mostrar confirmaciones favoritas - + Hide Log Ocultar Histórico @@ -5613,42 +5377,42 @@ x (number) determines the number of maximum files shown ToolsPanel - + Keep backup of merge files (.orig) Mantener respaldo de archivos de fusión (.orig) - + External editor: Editor externo: - + External diff: Diff externo: - + External merge: Fusión Externa: - + Backup files: Archivos de respaldo: - + Terminal emulator command: - + File manager command: - + Configure Configurar @@ -5788,22 +5552,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: @@ -5839,59 +5603,39 @@ x (number) determines the number of maximum files shown No es posible revisar por actualizaciones - + Unable to download update No es posible descargar actualizaciones - + Unable to open temporary file No es posible abrir archivo temporal - + Unable to install update No es posible instalar actualización - + Some windows failed to close. You can download the binary manually from %1 - Some windows failed to close - Algunas ventanas fallaron al cerrar - - - + Unknown install error Error de instalación desconocido - - + + Installer script failed: %1 Script de instalación falló: %1 - - The disk image failed to mount successfully - La imagen de disco no pudo montarse exitosamente - - - - The existing bundle could not be moved to the trash - El paquete existente no pudo ser movido a la papelera - - - - The new bundle could not be copied into place - El nuevo paquete no pudo ser copiado en el lugar - - - - - + + Helper application failed to start La aplicación de ayuda falló al iniciar @@ -5904,112 +5648,112 @@ x (number) determines the number of maximum files shown WindowPanel - + Add New Theme Añadir Nuevo Tema - + Edit Current Theme Editar el Tema Actual - + Create Theme Crear Tema - + Theme Name Nombre del Tema - + Restart? ¿Reiniciar? - + The application must be restarted for the theme change to take effect. La aplicación debe reiniciarse para que el cambio de tema tenga efecto. - + Do you want to restart now? ¿Quieres reiniciar ahora? - + Restart Reiniciar - + Later Después - + Show full repository path Mostrar ruta completa del repositorio - + Hide automatically Ocultar automáticamente - + Open submodules in tabs Abrir submódulos en pestañas - + Open all repositories in tabs Abrir todos los repositorios en pestañas - + Hide Menubar - + Show Avatars - + Show Window Maximized when opened - + Theme: Tema: - + Title: Título: - + Log: Histórico: - + Tabs: Pestañas: - + View: - + Prompt: Pregunta: @@ -6017,29 +5761,29 @@ x (number) determines the number of maximum files shown _FileWidget::Header - - + + Use Theirs: Delete - - + + Use Ours: Delete - + both: %1 - + ours: %1 - + theirs: %1 diff --git a/l10n/gittyup_ja.ts b/l10n/gittyup_ja.ts index b2ed9212e..334855476 100644 --- a/l10n/gittyup_ja.ts +++ b/l10n/gittyup_ja.ts @@ -28,39 +28,31 @@ Privacy プライバシー - - Usage reporting has been disabled. Restart the application for changes to take effect. - 使用状況の調査を無効にしました。アプリケーションを再起動してください。 - - - Usage Reporting Disabled - 使用状況の調査の無効化 - Account - + Connection failed 接続失敗 - + <b>Note:</b> Basic authentication is not supported if you have two-factor authentication enabled. Use a <a href='https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/'>personal access token</a> in the password field instead. <b>注:</b> 2 段階認証が有効な場合、Basic 認証は使用できません。パスワードのフィールドには代わりに<a href='https://help.github.com/ja/articles/creating-a-personal-access-token-for-the-command-line/'>個人アクセストークン</a>を指定してください。 - + <b>Note:</b> Only Basic authentication is currently supported - + <b>Note:</b> Basic authentication is not supported. Use a <a href='https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html'>personal access token</a> in the password field instead. <b>注:</b> Basic 認証は使用できません。パスワードのフィールドには代わりに<a href='https://gitlab-docs.creationline.com/ee/user/profile/personal_access_tokens.html'>個人アクセストークン</a>を指定してください。 - + Authentication failed 認証失敗 @@ -158,162 +150,162 @@ AdvancedSearchWidget - + Author: 作者: - + Author name 作者の名前 - + Email: E メール: - + Author email 作者の E メール - + Message: メッセージ: - + Commit message コミットに添えられた説明 - + Date: 日付: - + Specific commit date 特定のコミット日からのみ検索 - + After: 日付 - 開始: - + Commits after date 特定のコミット日以降からのみ検索 - + Before: 日付 - 終了: - + Commits before date 特定のコミット日以前からのみ検索 - + File: ファイル: - + File name ファイル名 - + Path: パス: - + File path ファイルの場所 - + Scope: 範囲: - + Hunk header text 差分場所を示すヘッダーのテキスト - + Context: 差分周辺: - + Diff context (white) 変更した箇所の周辺 (白) - + Addition: 追加部分: - + Diff addition (green) 追加した箇所の差分 (緑) - + Deletion: 削除部分: - + Diff deletion (red) 削除した箇所の差分 (赤) - + Comment: コメント: - + Source code comment ソースコードのコメント - + String: 文字列: - + Source code string literal ソースコードの文字列リテラル - + Identifier: 識別子: - + Source code identifier ソースコードの識別子 - + Search 検索 - + Return Return @@ -349,12 +341,12 @@ Application - + SSL Errors SSL エラー - + Failed to set up SSL session. Do you want to ignore these errors? SSL セッションのセットアップに失敗しました。これらのエラーを無視しますか？ @@ -362,59 +354,45 @@ AuthorCommitterDate - + Author/Committer: - + Author: - + Committer: - - Beanstalk - - Connection failed - 接続失敗 - - - - Bitbucket - - Connection failed - 接続失敗 - - BlameEditor - + Untitled 無題 - + Not Tracked 未追跡 - + HEAD リビジョン情報なし - + Working Copy 作業コピー - + Save File ファイルを保存 @@ -422,12 +400,12 @@ BlameMargin - + Not Committed 未コミット - + Invalid Signature 無効な署名 @@ -546,27 +524,27 @@ CommitDetail - + Copy コピー - + Range: 範囲: - + Id: ID: - + initial commit 初回コミット - + Parents: @@ -624,181 +602,165 @@ CommitEditor - + T - + <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 - Update %1 - %1 の更新 - - - Update %1 and %2 - %1 と %2 の更新 - - - Update %1, %2, and %3 - %1, %2, %3 の更新 - - - Update %1, %2, and %3 more files... - %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,131 +768,123 @@ CommitList - + Remove Untracked Files 未追跡のファイルを削除 - + Apply 適用 - + Pop 引き出す - + Drop 削除 - + Unstar スターを外す - + Star スターを付ける - + Add Tag... タグを追加... - + New Branch... 新しいブランチ... - Delete Tag %1 - タグ %1 を削除 - - - Delete Branch %1 - ブランチ %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 +892,12 @@ CommitModel - + Uncommitted changes コミットされていない変更 - + Checking for uncommitted changes コミットされていない変更を確認しています @@ -951,7 +905,7 @@ CommitToolBar - + Show All Branches 全てのブランチを表示 @@ -961,42 +915,47 @@ 選択したブランチのみを表示 - + + Show Selected Branch, First Parent Only + + + + Sort by Date 日時順に並べる - + Sort Topologically 関連順に並べる - + Show Graph グラフを表示 - + Show Clean Status 空の状態を表示 - + Compact Mode コンパクトモード - + Show Author - + Show Date - + Show Id @@ -1004,56 +963,89 @@ ConfigDialog - + Esc Esc - + General 一般 - + Diff 差分 - + Remotes リモート - + Branches ブランチ - + Submodules サブモジュール - + Search 検索 - + Plugins プラグイン - + LFS LFS - + Edit Config File... 設定ファイルを編集... + + CredentialHelper + + + Caching the credentials in the RAM. Required to enter credentials on every startup + + + + + Storing the credentials unencrypted on disk, protected only by filesystem permissions <a href="https://git-scm.com/docs/git-credential-store">git-credential-store</a> + + + + + MacOS credential manager + + + + + Windows credential manager + + + + + Secret Service D-Bus client library + + + + + Prefer <a href="https://wiki.gnome.org/Projects/Libsecret">libsecret</a> over gnome-keyring if available + + + DateSelectionGroupWidget @@ -1104,10 +1096,6 @@ Add %1 account %1 アカウントを追加 - - View getting started videos - 解説動画を観る - Contact us for support @@ -1147,17 +1135,17 @@ プッシュ - + Push canceled. プッシュをキャンセルしました。 - + Unable to push to %1 - %2 %1 にプッシュできませんでした - %2 - + The branch is not fully merged. Deleting it may cause some commits to be lost. ブランチが完全にマージされていません。このまま削除すると、一部のコミットが失われる可能性があります。 @@ -1195,22 +1183,22 @@ プッシュ - + Push canceled. プッシュをキャンセルしました。 - + Unable to push to %1 - %2 %1 にプッシュできませんでした - %2 - + Delete Tag タグを削除 - + delete tag タグを削除 @@ -1218,24 +1206,24 @@ DetailView - - + + Author: 作者: - + reset リセット - + Here you can set the author used for committing These settings will not be saved permanently - + Email: E メール: @@ -1243,57 +1231,57 @@ These settings will not be saved permanently DiffPanel - + lines 行 - + System Locale システム既定のロケールを使用 - + Wrap lines - + Context lines: 周辺の行数: - + Wrap lines: - + Character Encoding: 文字エンコード: - + Ignore Whitespace (-w) 空白を無視 (-w) - + Added files 追加されたファイル - + Deleted files 削除されたファイル - + Whitespace: 空白: - + Auto Collapse: 自動折り畳み: @@ -1301,10 +1289,15 @@ These settings will not be saved permanently DiffTool - + External Diff 外部差分ツール + + + External Diff to Working Copy + + DiffTreeModel @@ -1317,12 +1310,12 @@ These settings will not be saved permanently DiffView - + Add new file 新しいファイルを追加 - + Or drag files here to copy into the repository または、ここにファイルをドラッグして、リポジトリへコピーします @@ -1402,57 +1395,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: 執筆者の履歴: @@ -1524,409 +1517,345 @@ These settings will not be saved permanently 選択したファイルには%1のリビジョンがありません。 - + + Bash Not Found Bash が見つかりませんでした - + + Bash was not found on your PATH. Bash がどの PATH にも見つかりませんでした。 - + + Bash is required to execute external tools. 外部ツールを起動するには Bash が必要です。 - + Stage ステージに上げる - + Unstage ステージから降ろす - + Discard Changes 変更を破棄 - + Discard Changes? 変更を破棄しますか？ - + Are you sure you want to discard changes in the selected files? 選択したファイルへの変更を破棄しますか？ - + This action cannot be undone. この操作は元に戻せません。 - + (Submodule) - + %1 files %1 個のファイル - + Discard 破棄 - + discard 破棄 - + Remove Untracked Files 未追跡のファイルを削除 - + Ignore 無視 - + Checkout チェックアウト - + Unlock ロック解除 - + Lock ロック - + Copy File Name ファイル名をコピー - + Filter History 履歴を絞り込む - + Navigate to ジャンプ - + Next Revision 次のリビジョン - + next 次 - + Previous Revision 前のリビジョン - + previous 前 - + Unset Executable 実行可能を解除 - + Set Executable 実行可能に設定 - + Save Selected Version as ... - + Select new file directory - + Saving files - + Saving files of selected version to disk - + Save file - + Invalid Blob - + Open this version - + Opening file - + Open - + open file - + Blob is invalid. - - + + Unable to checkout bare repositories - + Unable to open files from bare repository - + The file is already in the current working directory - + edit 編集 - + diff 差分 - + merge マージ - + External Tool Not Found 外部ツールが見つかりませんでした - + Failed to execute external %1 tool. 外部%1ツールの起動に失敗しました。 - - FileList - - Sort By - 並べ替え順 - - - Select - 選択 - - - Name - 名前 - - - Status - 状態 - - - Ignore Whitespace (-w) - 空白を無視 (-w) - - - Added - 追加された部分 - - - Deleted - 削除された部分 - - - Modified - 変更された部分 - - - Renamed - リネームされた部分 - - - Copied - コピーされた部分 - - - Ignored - 無視された部分 - - - Untracked - 未追跡の部分 - - - Unreadable - 読み取りできない部分 - - - Conflicted - 衝突している部分 - - - Unmodified - 未変更の部分 - - - Type Change - 種類が変更された部分 - - FileWidget - + LFS LFS - - + + Unlock ロック解除 - - + + Lock ロック - - + + Show Object オブジェクトを表示 - + Edit File ファイルを編集 - + Discard File ファイルを破棄 - + Directory ディレクトリ - + File ファイル - + Remove %1? %1を削除しますか？ - + Discard Changes? 変更を破棄しますか？ - + Are you sure you want to remove '%1'? '%1' を削除しますか？ - + Are you sure you want to discard all changes in '%1'? '%1' への全ての変更を破棄しますか？ - + This action cannot be undone. この操作は元に戻せません。 - + Remove %1 %1を削除 - + Discard Changes 変更を破棄 - + Discard 破棄 - + discard 破棄 - - + + Collapse File ファイルを折り畳む - - + + Expand File ファイルを広げる - + Show Pointer ポインターを表示 @@ -1967,128 +1896,122 @@ These settings will not be saved permanently GeneralPanel - - + + Fetch every 毎回 - - + + minutes 分おきにフェッチ - - + + Push after each commit 各コミット直後にプッシュを実行 - Update submodules after pull - プル後にサブモジュールを更新 - - - - + + Prune when fetching フェッチ時、既に存在しないブランチへの参照を解除 - + No translation 翻訳を無効化 - + Store credentials in secure storage 資格情報を安全なストレージに保管 - Allow collection of usage data - 使用状況の収集を許可 - - - - + + Update submodules after pull and clone - + <a href='view'>View privacy policy</a> <a href='view'>プライバシーポリシーについて</a> - - + + User name: ユーザー名: - - + + User email: ユーザーの E メール: - - + + Automatic actions: 自動アクション: - - + + Language: 言語: - + Credentials: 資格情報: - + Credential store type: - + + Available Credential stores: + + + + Only allow a single running instance - + Single instance: - Usage reporting: - 使用状況の送信: + + No credential store set + - - - GitHub - Connection failed - 接続失敗 + + No credential store is set. Go to the application settings to set the desired credential store + - Failed to authenticate with GitHub! - GitHub への認証に失敗しました！ + + + - Successfully authenticated with GitHub! - GitHub への認証に成功しました！ + + Available Credential stores + GitLab - - Connection failed - 接続失敗 - Authentication failed @@ -2098,7 +2021,7 @@ These settings will not be saved permanently Header - + Filter %1 %1を絞り込む @@ -2127,26 +2050,26 @@ These settings will not be saved permanently HunkWidget + - Save 保存 + - Undo 元に戻す + - Use Ours 手元のものを使う + - Use Theirs 向こうのものを使う @@ -2175,19 +2098,11 @@ These settings will not be saved permanently Discard selected lines - - Discard Hunk? - 差分を破棄しますか？ - Are you sure you want to remove '%1'? '%1' を削除しますか？ - - Are you sure you want to discard the hunk starting at line %1 in '%2'? - '%2' の差分内容 (開始行 %1) を破棄しますか？ - This action cannot be undone. @@ -2277,12 +2192,12 @@ These settings will not be saved permanently LfsPanel - + Initialize LFS LFS を初期化 - + Specify a glob pattern for tracking large files. Generally, large files are greater than 500kB, change frequently, @@ -2308,92 +2223,92 @@ Examples - + Pattern: パターン: - + Track 追跡 - + days 日 - + Fetch LFS objects from all references for the past 特定の期間内に参照された LFS オブジェクトを全てフェッチ - + reference days or 日以内に参照されたブランチ、或いは - + commit days 日以内に行われたコミット全て - + View Environment 環境を表示 - + git-lfs env (read only) git-lfs env (読み取り専用) - + Deinitialize LFS LFS を解除 - + Deinitialize LFS? LFS を解除しますか？ - + Are you sure you want uninstall LFS from this repository? リポジトリから LFS を解除しますか？ - + Deinitialize 解除 - + Server URL: サーバーの URL: - + Prune Offset: 保管日数: - + Fetch Recent: フェッチの日数設定: - + Advanced: 詳細設定: - + Included patterns: - + Excluded patterns: @@ -2477,7 +2392,7 @@ Examples LogView - + Copy コピー @@ -2485,59 +2400,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 リベース作業中 @@ -2559,28 +2474,16 @@ Examples New Window 新しいウィンドウ - - Ctrl+Meta+N - Ctrl+Meta+N - Clone Repository... リポジトリをクローン... - - Ctrl+Shift+N - Ctrl+Shift+N - Initialize New Repository... 新しいリポジトリを作成... - - Ctrl+Alt+N - Ctrl+Alt+N - Open Repository... @@ -2671,10 +2574,6 @@ Examples Show Double Tree View - - Ctrl+E - Ctrl+E - View @@ -2727,37 +2626,21 @@ Examples Stage All 全てステージに上げる - - Ctrl++ - Ctrl++ - Unstage All 全てステージから降ろす - - Ctrl+- - Ctrl+- - Commit コミット - - Ctrl+Shift+C - Ctrl+Shift+C - Amend Commit 最後のコミットを修正 - - Ctrl+Shift+A - Ctrl+Shift+A - Git LFS @@ -2788,64 +2671,36 @@ Examples Fetch フェッチ - - Ctrl+Shift+Alt+F - Ctrl+Shift+Alt+F - Fetch All 全てフェッチ - - Ctrl+Shift+Alt+A - Ctrl+Shift+Alt+A - Fetch From... 指定先からフェッチ... - - Ctrl+Shift+F - Ctrl+Shift+F - Pull プル - - Ctrl+Shift+Alt+L - Ctrl+Shift+Alt+L - Pull From... 指定先からプル... - - Ctrl+Shift+L - Ctrl+Shift+L - Push プッシュ - - Ctrl+Shift+Alt+P - Ctrl+Shift+Alt+P - Push To... 指定先へプッシュ... - - Ctrl+Shift+P - Ctrl+Shift+P - Branch @@ -2871,46 +2726,26 @@ Examples Checkout Current 選択中のブランチをチェックアウト - - Ctrl+Shift+Alt+H - Ctrl+Shift+Alt+H - Checkout... チェックアウト... - - Ctrl+Shift+H - Ctrl+Shift+H - Merge... マージ... - - Ctrl+Shift+M - Ctrl+Shift+M - Rebase... リベース... - - Ctrl+Shift+R - Ctrl+Shift+R - Squash... スカッシュ... - - Ctrl+Shift+Q - Ctrl+Shift+Q - Abort Merge @@ -2931,19 +2766,11 @@ Examples Update All 全て更新 - - Ctrl+Shift+Alt+U - Ctrl+Shift+Alt+U - Update... 更新... - - Ctrl+Shift+U - Ctrl+Shift+U - Open @@ -2964,19 +2791,11 @@ Examples Stash... スタッシュへ預ける... - - Ctrl+Shift+T - Ctrl+Shift+T - Pop Stash スタッシュから引き出す - - Ctrl+Shift+Alt+T - Ctrl+Shift+Alt+T - History @@ -3012,10 +2831,6 @@ Examples Show Repository Chooser... リポジトリ選択画面を表示... - - Ctrl+Shift+O - Ctrl+Shift+O - Tools @@ -3096,10 +2911,6 @@ Examples Hide Log ログを隠す - - Show Diff View - 差分ビューを表示 - Merge @@ -3198,12 +3009,12 @@ Examples MiscPanel - + Path to SSH config file: SSH 構成ファイルへのパス: - + Path to default / fallback SSH key file: 既定 / フォールバックの SSH 鍵ファイルへのパス: @@ -3316,7 +3127,7 @@ Examples PullRequestButton - + Create Pull Request プルリクエストを作成 @@ -3402,7 +3213,7 @@ Examples - + Your global GIT configuration is invalid, Gittyup won't run properly until this is fixed @@ -3465,17 +3276,17 @@ Would you like to fix the merge conflict and continue? ReferenceModel - + Branches ブランチ - + Remotes リモート - + Tags タグ @@ -3483,57 +3294,57 @@ Would you like to fix the merge conflict and continue? ReferenceView - + Branch ブランチ - + Remote リモート - + Tag タグ - + Checkout チェックアウト - + Rename 名前を変更 - + Delete 削除 - + Push Tag to %1 タグを %1 へプッシュ - + New Local Branch 新しいローカルブランチ - + Merge... マージ... - + Rebase... リベース... - + Squash... スカッシュ... @@ -3541,7 +3352,7 @@ Would you like to fix the merge conflict and continue? RefreshButton - + Refresh 再読み込み @@ -3549,7 +3360,7 @@ Would you like to fix the merge conflict and continue? RemoteButton - + 999+ 999+ @@ -3557,59 +3368,59 @@ Would you like to fix the merge conflict and continue? RemoteCallbacks - + remote: %1 リモート: %1 - + failed to execute pre-push hook: bash not found プッシュ前フックの実行に失敗しました: Bash が見つかりません - + failed to execute pre-push hook: %1 プッシュ前フックの実行に失敗しました: %1 - + HTTPS Credentials HTTPS の資格情報 - + SSH Passphrase SSH のパスフレーズ - + Username: ユーザー名: - + Password: パスワード: - + Passphrase: パスフレーズ: - - + + authentication canceled 認証をキャンセルしました - + From %1 %1 から - - + + To %1 %1 へ @@ -3761,17 +3572,17 @@ Would you like to fix the merge conflict and continue? RemotesPanel - + Delete Remote? リモートを削除しますか？ - + Are you sure you want to delete '%1'? '%1' を削除しますか？ - + Delete 削除 @@ -3845,10 +3656,6 @@ Would you like to fix the merge conflict and continue? Search 検索 - - The indexer worker process crashed. If this problem persists please contact us at support@gitahead.com. - インデックスを構築する作業プロセスがクラッシュしました。問題が立て続けに起こる場合は、support@gitahead.com へ報告をお願いします。 - Indexer Crashed @@ -4081,8 +3888,8 @@ was added to %1 - - + + <i>no remote</i> <i>リモートなし</i> @@ -4093,7 +3900,7 @@ was added to %1 - + Fetch canceled. フェッチをキャンセルしました。 @@ -4109,212 +3916,213 @@ was added to %1 - - + + 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 適用 - There was a merge conflict. The rebase has been aborted - マージに衝突があります。リベースを中断しました - - - + %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. @@ -4323,412 +4131,388 @@ This reverts commit %2. コミット %2 を取り消しました。 - + <i>detached HEAD</i> <i>作業中のリビジョン</i> - + %1 on %2 %2 に %1 を - + Cherry-pick 取り込み - Force Push? - 強制プッシュしますか？ - - - + 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>できます。 - You may want to integrate remote commits first by <a href='action:pull'>pulling</a>. Then <a href='action:push'>push</a> again. - リモートのコミットをまず<a href='action:pull'>プル</a>で統合してから、再度<a href='action:push'>プッシュ</a>してください。 - - - If you really want the remote to lose commits, you may be able to <a href='action:push?force=true'>force push</a>. - リモート上のコミットが損失しても問題ないなら、<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 リセット - Amend? - 修正しますか？ - - - Reset? - リセットしますか？ - - - Are you sure you want to amend '%1'? - '%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 サブモジュールを更新 @@ -4738,112 +4522,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>して、リポジトリを元の状態に戻すこともできます。 @@ -4851,12 +4635,12 @@ This reverts commit %2. Repository - + Unknown error 不明なエラー - + git-lfs not found git-lfs が見つかりませんでした @@ -4872,32 +4656,32 @@ This reverts commit %2. SearchPanel - + Enable indexing インデックスを構築 - + terms 句 - + lines 行 - + Limit commits to: コミットの語句上限数: - + Diff context: 差分周辺の行数: - + Remove Index インデックスを削除 @@ -4905,32 +4689,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 大きなファイルをステージに上げる前に尋ねる @@ -4938,67 +4722,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 端末 @@ -5029,89 +4813,89 @@ This reverts commit %2. SideBar - + Close 閉じる - - - + + + Remove 削除 - + Authorize 認証 - + Clone Repository リポジトリをクローン - + Open Existing Repository 既存のリポジトリを開く - + Open Repository リポジトリを開く - + Initialize New Repository 新しいリポジトリを作成 - + Add %1 Account %1 アカウントを追加 - + <p>Are you sure you want to remove the remote repository association for %1?</p><p>The local clone itself will not be affected.</p> <p>リモートリポジトリ %1 への関連付けを解除しますか？</p><p>ローカルのクローンには影響しません。</p> - + Remove Repository Association? リポジトリへの関連付けを解除しますか？ - + Clear All Recent 最近使ったリポジトリを消去 - + Show Full Path 完全なパスを表示 - + Filter Non-existent Paths 存在しないパスを除去 - + Refresh Remote Accounts リモートアカウントを再読み込み - + Show Full Name 完全な名前を表示 - + <p>Are you sure you want to remove the %1 account for '%2'?</p><p>Only the account association will be removed. Remote configurations and local clones will not be affected.</p> <p>%1 アカウント '%2' を削除しますか？</p><p>アカウントへの関連付けのみが解除されます。リモートの設定と、ローカルのクローンには影響しません。</p> - + Remove Account? アカウントを削除しますか？ @@ -5258,12 +5042,12 @@ This reverts commit %2. サブモジュールを解除しますか？ - + The submodule working directory contains uncommitted changes that will be lost if you continue. サブモジュールの作業ディレクトリに、コミットされていない変更があります。このまま続行すると、変更が全て失われます。 - + Deinitialize 解除 @@ -5386,23 +5170,23 @@ x (number) determines the number of maximum files shown TerminalPanel - - + + Install インストール - + Name: 名前: - + Location: 場所: - + Uninstall アンインストール @@ -5410,42 +5194,38 @@ x (number) determines the number of maximum files shown TextEdit - + Replace... 置換... - + Replace All... 全て置換... - + Ignore 無視 - + Ignore All 全て無視 - + Add to User Dictionary ユーザー辞書に追加 - + Do not Ignore 無視しない ThemeDialog - - Native Theme - 通常のテーマ - A flexible look matching system colors @@ -5485,112 +5265,108 @@ x (number) determines the number of maximum files shown ToolBar - + Show repository sidebar リポジトリのサイドバーを表示 - + Previous 前 - + Next 次 - + Fetch フェッチ - + Pull プル - + Merge マージ - + Rebase リベース - + Push プッシュ - + Checkout チェックアウト - + Stash スタッシュへ預ける - + Pop Stash スタッシュから引き出す - + Open Terminal - + Open file manager - + Configure Settings 設定を変更 - + Repository settings - + Application settings - - + + Show Log ログを表示 - + Double Tree View - Diff View - 差分ビュー - - - + Tree View ツリービュー - + Show Starred Commits スターを付けたコミットを表示 - + Hide Log ログを隠す @@ -5598,42 +5374,42 @@ x (number) determines the number of maximum files shown ToolsPanel - + Keep backup of merge files (.orig) マージファイルのバックアップを取る (.orig) - + External editor: 外部エディター: - + External diff: 外部差分ツール: - + External merge: 外部マージツール: - + Backup files: ファイルのバックアップ: - + Terminal emulator command: - + File manager command: - + Configure 設定 @@ -5773,22 +5549,22 @@ x (number) determines the number of maximum files shown UpdatePanel - + Check for updates automatically 自動的に更新を確認 - + Automatically download and install updates 自動的に更新のダウンロードとインストールを行う - + Check Now 今すぐ確認 - + Software Update: ソフトウェアの更新: @@ -5819,24 +5595,8 @@ x (number) determines the number of maximum files shown インストーラーの開始に失敗しました - - The disk image failed to mount successfully - ディスクイメージを正しくマウントできませんでした - - - - The existing bundle could not be moved to the trash - 既存のバンドルをゴミ箱へ移動できませんでした - - - - The new bundle could not be copied into place - 新しいバンドルを、対象の場所へコピーできませんでした - - - - - + + Helper application failed to start 補助アプリケーションの開始に失敗しました @@ -5851,37 +5611,33 @@ x (number) determines the number of maximum files shown 更新を確認できませんでした - + Unable to download update 更新をダウンロードできませんでした - + Unable to open temporary file 一時ファイルを開けませんでした - + Unable to install update 更新をインストールできませんでした - + Some windows failed to close. You can download the binary manually from %1 - Some windows failed to close - 一部のウィンドウを閉じられませんでした - - - + Unknown install error 不明なインストールエラー - - + + Installer script failed: %1 インストーラーのスクリプトが失敗しました: %1 @@ -5889,112 +5645,112 @@ x (number) determines the number of maximum files shown WindowPanel - + Add New Theme 新しいテーマを追加 - + Edit Current Theme 現在のテーマを編集 - + Create Theme テーマを作成 - + Theme Name テーマ名 - + Restart? 再起動しますか？ - + The application must be restarted for the theme change to take effect. テーマの変更を適用するには、アプリケーションを再起動する必要があります。 - + Do you want to restart now? 今すぐ再起動しますか？ - + Restart 再起動 - + Later 後で - + Show full repository path リポジトリの完全なパスを表示 - + Hide automatically 自動的に隠す - + Open submodules in tabs サブモジュールをタブに開く - + Open all repositories in tabs 全てのリポジトリをタブに開く - + Hide Menubar - + Show Avatars - + Show Window Maximized when opened - + Theme: テーマ: - + Title: タイトル: - + Log: ログ: - + Tabs: タブ: - + View: - + Prompt: 質問: @@ -6002,29 +5758,29 @@ x (number) determines the number of maximum files shown _FileWidget::Header - - + + Use Theirs: Delete - - + + Use Ours: Delete - + both: %1 - + ours: %1 - + theirs: %1 diff --git a/l10n/gittyup_pt.ts b/l10n/gittyup_pt.ts index 9a8e86e6b..faa5faf4a 100644 --- a/l10n/gittyup_pt.ts +++ b/l10n/gittyup_pt.ts @@ -28,39 +28,31 @@ Privacy Privacidade - - Usage reporting has been disabled. Restart the application for changes to take effect. - Relatório de utilização desactivado. Reinicie a aplicação para aplicar as alterações. - - - Usage Reporting Disabled - Relatório de utilização desactivado - Account - + Connection failed - + <b>Note:</b> Basic authentication is not supported if you have two-factor authentication enabled. Use a <a href='https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/'>personal access token</a> in the password field instead. <b>Nota:</b> A autenticação básica não é suportada se tiver activada a autenticação em dois passos. Use antes um <a href='https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/'>símbolo de autenticaçao pessoal</a> no campo da senha. - + <b>Note:</b> Only Basic authentication is currently supported - + <b>Note:</b> Basic authentication is not supported. Use a <a href='https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html'>personal access token</a> in the password field instead. <b>Nota:</b> A autenticação básica não é suportada. Use antes um <a href='https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html'>símbolo de autenticaçao pessoal</a> no campo da senha. - + Authentication failed Falha ao autenticar @@ -158,162 +150,162 @@ AdvancedSearchWidget - + Author: Autor: - + Author name Nome do autor - + Email: Email: - + Author email Email do autor - + Message: Mensagem: - + Commit message Mensagem de submissão - + Date: Data: - + Specific commit date Data específica da submissão - + After: Após: - + Commits after date Submissão após a data - + Before: Antes: - + Commits before date Submissão antes da data - + File: Ficheiro: - + File name Nome do ficheiro - + Path: Caminho: - + File path Caminho do ficheiro - + Scope: Âmbito: - + Hunk header text Texto da parte do cabeçalho - + Context: Contexto: - + Diff context (white) Contexto comparado (branco) - + Addition: Adição: - + Diff addition (green) Adição comparada (verde) - + Deletion: Eliminação: - + Diff deletion (red) Eliminação comparada (vermelho) - + Comment: Comentário: - + Source code comment Comentário do código-fonte - + String: Cadeia: - + Source code string literal Cadeia literal do código-fonte - + Identifier: Identificador: - + Source code identifier Identificador do código-fonte - + Search Procurar - + Return Retornar @@ -349,12 +341,12 @@ Application - + SSL Errors Erros SSL - + Failed to set up SSL session. Do you want to ignore these errors? Falha ao configurar sessão SSL. Deseja ignorar estes erros? @@ -362,59 +354,45 @@ AuthorCommitterDate - + Author/Committer: - + Author: - + Committer: - - Beanstalk - - Connection failed - A ligação falhou - - - - Bitbucket - - Connection failed - A ligação falhou - - BlameEditor - + Untitled Sem título - + Not Tracked Não rastreado - + HEAD HEAD - + Working Copy Cópia de trabalho - + Save File Gravar ficheiro @@ -422,12 +400,12 @@ BlameMargin - + Not Committed Não submetido - + Invalid Signature Assinatura inválida @@ -546,27 +524,27 @@ CommitDetail - + Copy Copiar - + Range: Intervalo: - + Id: Id: - + initial commit submissão inicial - + Parents: @@ -624,181 +602,165 @@ CommitEditor - + T - + <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 - Update %1 - Actualizar %1 - - - Update %1 and %2 - Actualizar %1 e %2 - - - Update %1, %2, and %3 - Actualizar %1, %2 e %3 - - - Update %1, %2, and %3 more files... - 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,131 +768,123 @@ 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... - Delete Tag %1 - Eliminar etiqueta %1 - - - Delete Branch %1 - 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 +892,12 @@ CommitModel - + Uncommitted changes Alterações não submetidas - + Checking for uncommitted changes A procurar alterações não submetidas @@ -951,7 +905,7 @@ CommitToolBar - + Show All Branches Mostrar todos os ramos @@ -961,42 +915,47 @@ Mostrar o ramo seleccionado - + + Show Selected Branch, First Parent Only + + + + Sort by Date Ordenar por data - + Sort Topologically Ordenar topologicamente - + Show Graph Mostrar gráfico - + Show Clean Status Mostrar estado limpo - + Compact Mode Modo compacto - + Show Author - + Show Date - + Show Id @@ -1004,56 +963,89 @@ ConfigDialog - + Esc Esc - + General Geral - + Diff Comparação - + Remotes Remotos - + Branches Ramos - + Submodules Sub-módulos - + Search Procurar - + Plugins Extensões - + LFS LFS - + Edit Config File... Editar ficheiro de configuração... + + CredentialHelper + + + Caching the credentials in the RAM. Required to enter credentials on every startup + + + + + Storing the credentials unencrypted on disk, protected only by filesystem permissions <a href="https://git-scm.com/docs/git-credential-store">git-credential-store</a> + + + + + MacOS credential manager + + + + + Windows credential manager + + + + + Secret Service D-Bus client library + + + + + Prefer <a href="https://wiki.gnome.org/Projects/Libsecret">libsecret</a> over gnome-keyring if available + + + DateSelectionGroupWidget @@ -1104,10 +1096,6 @@ Add %1 account Adicionar conta %1 - - View getting started videos - Ver vídeos de aprendizagem - Contact us for support @@ -1147,17 +1135,17 @@ Enviar - + Push canceled. Envio cancelado. - + Unable to push to %1 - %2 Impossível enviar para %1 - %2 - + The branch is not fully merged. Deleting it may cause some commits to be lost. O ramo não está totalmente unido. Eliminá-lo pode causar a perda de algumas submissões. @@ -1195,22 +1183,22 @@ Enviar - + Push canceled. Envio cancelado. - + Unable to push to %1 - %2 Impossível enviar para %1 - %2 - + Delete Tag Eliminar etiqueta - + delete tag eliminar etiqueta @@ -1218,24 +1206,24 @@ DetailView - - + + Author: Autor: - + reset repor - + Here you can set the author used for committing These settings will not be saved permanently - + Email: Email: @@ -1243,57 +1231,57 @@ These settings will not be saved permanently DiffPanel - + lines linhas - + System Locale Idioma do sistema - + 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: @@ -1301,10 +1289,15 @@ These settings will not be saved permanently DiffTool - + External Diff Comparação externa + + + External Diff to Working Copy + + DiffTreeModel @@ -1317,12 +1310,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 @@ -1402,57 +1395,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: @@ -1524,409 +1517,345 @@ These settings will not be saved permanently O ficheiro seleccionado não tem uma revisão %1. - + + Bash Not Found Bash não encontrado - + + Bash was not found on your PATH. Bash não encontrado no PATH. - + + Bash is required to execute external tools. O Bash é necessário para executar ferramentas externas. - + Stage Adicionar - + Unstage Remover adição - + Discard Changes Descartar alterações - + Discard Changes? Descartar alterações? - + Are you sure you want to discard changes in the selected files? Tem a certeza de que deseja descartar as alterações nos ficheiros seleccionados? - + This action cannot be undone. Esta acção não pode ser desfeita. - + (Submodule) - + %1 files %1 ficheiros - + Discard Descartar - + discard descartar - + Remove Untracked Files Remover ficheiros não rastreados - + Ignore Ignorar - + Checkout Mudar - + Unlock Desbloquear - + Lock Bloquear - + Copy File Name Copiar nome do ficheiro - + Filter History Filtrar histórico - + Navigate to Navegar para - + Next Revision Revisão seguinte - + next seguinte - + Previous Revision Revisão anterior - + previous anterior - + Unset Executable Desactivar executável - + Set Executable Activar executável - + Save Selected Version as ... - + Select new file directory - + Saving files - + Saving files of selected version to disk - + Save file - + Invalid Blob - + Open this version - + Opening file - + Open - + open file - + Blob is invalid. - - + + Unable to checkout bare repositories - + Unable to open files from bare repository - + The file is already in the current working directory - + edit editar - + diff comparar - + merge unir - + External Tool Not Found Ferramenta externa não encontrada - + Failed to execute external %1 tool. Falha ao executar a ferramenta %1. - - FileList - - Sort By - Ordenar por - - - Select - Seleccionar - - - Name - Nome - - - Status - Estado - - - Ignore Whitespace (-w) - Ignorar espaços (-w) - - - Added - Adicionado - - - Deleted - Eliminado - - - Modified - Modificado - - - Renamed - Renomeado - - - Copied - Copiado - - - Ignored - Ignorado - - - Untracked - Não rastreado - - - Unreadable - Ilegível - - - Conflicted - Em conflito - - - Unmodified - Inalterado - - - Type Change - Alteração de tipo - - FileWidget - + LFS LFS - - + + Unlock Desbloquear - - + + Lock Bloquear - - + + Show Object Mostrar objecto - + Edit File Editar ficheiro - + Discard File Descartar ficheiro - + Directory Pasta - + File Ficheiro - + Remove %1? Remover %1? - + Discard Changes? Descartar alterações? - + Are you sure you want to remove '%1'? Tem a certeza de que deseja remover "%1"? - + Are you sure you want to discard all changes in '%1'? Tem a certeza de que deseja descartar as alterações em "%1"? - + This action cannot be undone. Esta acção não pode ser desfeita. - + Remove %1 Remover %1 - + Discard Changes Descartar alterações - + Discard Descartar - + discard descartar - - + + Collapse File Colapsar ficheiro - - + + Expand File Expandir ficheiro - + Show Pointer Mostrar ponteiro @@ -1967,129 +1896,122 @@ These settings will not be saved permanently GeneralPanel - - + + Fetch every Obter cada - - + + minutes minutos - - + + Push after each commit Enviar após cada commit - Update submodules after pull - Actualizar sub-módulos após puxar - - - - + + Prune when fetching Aparar ao obter - + No translation Sem tradução - + Store credentials in secure storage Armazenar credenciais com segurança - Allow collection of usage data - Permitir recolha de dados de utilização - - - - + + Update submodules after pull and clone - + <a href='view'>View privacy policy</a> <a href='view'>Ler política de privacidade</a> - - + + User name: Utilizador: - - + + User email: Email: - - + + Automatic actions: Acções automáticas: - - + + Language: Idioma: - + Credentials: Credenciais: - + Credential store type: - + + Available Credential stores: + + + + Only allow a single running instance - + Single instance: - Usage reporting: - Relatório de utilização: + + No credential store set + - - - GitHub - Connection failed - -A ligação falhou + + No credential store is set. Go to the application settings to set the desired credential store + - Failed to authenticate with GitHub! - Falha ao autenticar no GitHub! + + + - Successfully authenticated with GitHub! - Autenticado com sucesso no GitHub! + + Available Credential stores + GitLab - - Connection failed - A ligação falhou - Authentication failed @@ -2099,7 +2021,7 @@ A ligação falhou Header - + Filter %1 Pode ser "Filtro %1" Filtrar %1 @@ -2129,26 +2051,26 @@ A ligação falhou HunkWidget + - Save Gravar + - Undo Desfazer + - Use Ours Usar o nosso + - Use Theirs Usar o deles @@ -2177,19 +2099,11 @@ A ligação falhou Discard selected lines - - Discard Hunk? - Descartar pedaço? - Are you sure you want to remove '%1'? Tem a certeza de que deseja remover "%1"? - - Are you sure you want to discard the hunk starting at line %1 in '%2'? - Tem a certeza de que deseja descartar o pedaço que comaçe na linha %1 em "%2"? - This action cannot be undone. @@ -2279,12 +2193,12 @@ A ligação falhou LfsPanel - + Initialize LFS Inicializar LFS - + Specify a glob pattern for tracking large files. Generally, large files are greater than 500kB, change frequently, @@ -2309,92 +2223,92 @@ Exemplos - + Pattern: Padrão: - + Track Rastrear - + days dias - + Fetch LFS objects from all references for the past Obter objectos LFS de todas as referências passadas - + reference days or dias de referência ou - + commit days dias de submissão - + View Environment Ver ambiente - + git-lfs env (read only) git-lfs env (só de leitura) - + Deinitialize LFS Desinicializar LFS - + Deinitialize LFS? Desinicializar LFS? - + Are you sure you want uninstall LFS from this repository? Tem a certeza de que deseja desinstalar LFS deste repositório? - + Deinitialize Desinicializar - + Server URL: URL do servidor: - + Prune Offset: Desvio para aparar: - + Fetch Recent: Obter recentes: - + Advanced: Avançado: - + Included patterns: - + Excluded patterns: @@ -2478,7 +2392,7 @@ Exemplos LogView - + Copy Copiar @@ -2486,59 +2400,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 @@ -2560,28 +2474,16 @@ Exemplos New Window Nova janela - - Ctrl+Meta+N - Ctrl+Meta+N - Clone Repository... Clonar repositório... - - Ctrl+Shift+N - Ctrl+Shift+N - Initialize New Repository... Inicializar novo repositório... - - Ctrl+Alt+N - Ctrl+Alt+N - Open Repository... @@ -2672,10 +2574,6 @@ Exemplos Show Double Tree View - - Ctrl+E - Ctrl+E - View @@ -2728,37 +2626,21 @@ Exemplos Stage All Adicioanr tudo - - Ctrl++ - Ctrl++ - Unstage All Remover todas as adições - - Ctrl+- - Ctrl+- - Commit Submeter - - Ctrl+Shift+C - Ctrl+Shift+C - Amend Commit Emendar submissão - - Ctrl+Shift+A - Ctrl+Shift+A - Git LFS @@ -2789,64 +2671,36 @@ Exemplos Fetch Obter - - Ctrl+Shift+Alt+F - Ctrl+Shift+Alt+F - Fetch All Obter tudo - - Ctrl+Shift+Alt+A - Ctrl+Shift+Alt+A - Fetch From... Obter de... - - Ctrl+Shift+F - Ctrl+Shift+F - Pull Puxar - - Ctrl+Shift+Alt+L - Ctrl+Shift+Alt+L - Pull From... Puxar de... - - Ctrl+Shift+L - Ctrl+Shift+L - Push Enviar - - Ctrl+Shift+Alt+P - Ctrl+Shift+Alt+P - Push To... Enviar para... - - Ctrl+Shift+P - Ctrl+Shift+P - Branch @@ -2872,46 +2726,26 @@ Exemplos Checkout Current Mudar actual - - Ctrl+Shift+Alt+H - Ctrl+Shift+Alt+H - Checkout... Mudar... - - Ctrl+Shift+H - Ctrl+Shift+H - Merge... Unir... - - Ctrl+Shift+M - Ctrl+Shift+M - Rebase... Rebasear... - - Ctrl+Shift+R - Ctrl+Shift+R - Squash... Comprimir... - - Ctrl+Shift+Q - Ctrl+Shift+Q - Abort Merge @@ -2932,19 +2766,11 @@ Exemplos Update All Actualizar tudo - - Ctrl+Shift+Alt+U - Ctrl+Shift+Alt+U - Update... Actualizar... - - Ctrl+Shift+U - Ctrl+Shift+U - Open @@ -2965,19 +2791,11 @@ Exemplos Stash... Ocultar... - - Ctrl+Shift+T - Ctrl+Shift+T - Pop Stash Aplicar e limpar - - Ctrl+Shift+Alt+T - Ctrl+Shift+Alt+T - History @@ -3013,10 +2831,6 @@ Exemplos Show Repository Chooser... Mostrar selector de repositórios... - - Ctrl+Shift+O - Ctrl+Shift+O - Tools @@ -3097,10 +2911,6 @@ Exemplos Hide Log Ocultar diário - - Show Diff View - Mostrar vista de comparação - Merge @@ -3199,12 +3009,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: @@ -3317,7 +3127,7 @@ Exemplos PullRequestButton - + Create Pull Request Criar Pull Request @@ -3403,7 +3213,7 @@ Exemplos - + Your global GIT configuration is invalid, Gittyup won't run properly until this is fixed @@ -3466,17 +3276,17 @@ Would you like to fix the merge conflict and continue? ReferenceModel - + Branches Ramos - + Remotes Remotos - + Tags Etiquetas @@ -3484,57 +3294,57 @@ Would you like to fix the merge conflict and continue? ReferenceView - + Branch Ramo - + Remote Remoto - + Tag Etiqueta - + Checkout Mudar - + Rename Renomear - + Delete Eliminar - + Push Tag to %1 Enviar etiqueta para %1 - + New Local Branch Novo ramo local - + Merge... Unir... - + Rebase... Rebasear... - + Squash... Comprimir... @@ -3542,7 +3352,7 @@ Would you like to fix the merge conflict and continue? RefreshButton - + Refresh Actualizar @@ -3550,7 +3360,7 @@ Would you like to fix the merge conflict and continue? RemoteButton - + 999+ 999+ @@ -3558,59 +3368,59 @@ Would you like to fix the merge conflict and continue? RemoteCallbacks - + remote: %1 remoto: %1 - + failed to execute pre-push hook: bash not found falha ao executar gancho de pré-envio: bash não encontrado - + failed to execute pre-push hook: %1 falha ao executar gancho de pré-envio: %1 - + HTTPS Credentials Credenciais HTTPS - + SSH Passphrase Frase-passe SSH - + Username: Utilizador: - + Password: Senha: - + Passphrase: Frase-passe: - - + + authentication canceled autenticação cancelada - + From %1 De %1 - - + + To %1 Para %1 @@ -3762,17 +3572,17 @@ Would you like to fix the merge conflict and continue? RemotesPanel - + Delete Remote? Eliminar remoto? - + Are you sure you want to delete '%1'? Tem a certeza de que deseja eliminar "%1"? - + Delete Eliminar @@ -3846,10 +3656,6 @@ Would you like to fix the merge conflict and continue? Search Procurar - - The indexer worker process crashed. If this problem persists please contact us at support@gitahead.com. - O processo do indexador rebentou. Se este problema persistir, por favor contacte-nos em support@gitahead.com. - Indexer Crashed @@ -4082,8 +3888,8 @@ was added to %1 - - + + <i>no remote</i> <i>sem remoto</i> @@ -4094,7 +3900,7 @@ was added to %1 - + Fetch canceled. Obter cancelado. @@ -4110,212 +3916,213 @@ was added to %1 - - + + 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 - There was a merge conflict. The rebase has been aborted - 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. @@ -4324,412 +4131,388 @@ 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 - Force Push? - 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>. - You may want to integrate remote commits first by <a href='action:pull'>pulling</a>. Then <a href='action:push'>push</a> again. - Poderá querer integrar as submissões remotas primeiro <a href='action:pull'>puxando</a>. Em seguida, <a href='action:push'>envie</a> novamente. - - - If you really want the remote to lose commits, you may be able to <a href='action:push?force=true'>force push</a>. - 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 - Amend? - Emendar? - - - Reset? - Repor? - - - Are you sure you want to amend '%1'? - 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 @@ -4739,112 +4522,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. @@ -4852,12 +4635,12 @@ Isto reverte a submissão %2. Repository - + Unknown error Erro desconhecido - + git-lfs not found git lfs não encontrado @@ -4873,32 +4656,32 @@ Isto reverte a submissão %2. SearchPanel - + Enable indexing Activar indexação - + terms termos - + lines linhas - + Limit commits to: Limitar submissões a: - + Diff context: Contexto de comparação: - + Remove Index Remover índice @@ -4906,32 +4689,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 @@ -4939,67 +4722,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 @@ -5030,89 +4813,89 @@ Isto reverte a submissão %2. SideBar - + Close Fechar - - - + + + Remove Remover - + Authorize Autorizar - + Clone Repository Clonar repositório - + Open Existing Repository Abrir repositório existente - + Open Repository Abrir repositório - + Initialize New Repository Inicializar novo repositório - + Add %1 Account Adicionar conta %1 - + <p>Are you sure you want to remove the remote repository association for %1?</p><p>The local clone itself will not be affected.</p> <p>Tem a certeza de que deseja remover a associação ao repositório remoto para %1?</p><p>O clone local clone não será afectado.</p> - + Remove Repository Association? Remover associação ao repositório? - + Clear All Recent Limpar todos os recentes - + Show Full Path Mostrar caminho completo - + Filter Non-existent Paths Filtrar caminhos não existentes - + Refresh Remote Accounts Actualizar contas remotas - + Show Full Name Mostrar nome completo - + <p>Are you sure you want to remove the %1 account for '%2'?</p><p>Only the account association will be removed. Remote configurations and local clones will not be affected.</p> <p>Tem a certeza de que deseja remover a conta %1 para "%2"?</p><p>Só a associação da conta será removida. Configurações remotas e clones locais não serão afectados.</p> - + Remove Account? Remover conta? @@ -5259,12 +5042,12 @@ Isto reverte a submissão %2. Desinicializar sub-módulo? - + The submodule working directory contains uncommitted changes that will be lost if you continue. A pasta de trabalho do sub-módulo contém alterações não submetidas que serão perdidas se continuar. - + Deinitialize Desinicializar @@ -5387,23 +5170,23 @@ x (number) determines the number of maximum files shown TerminalPanel - - + + Install Instalar - + Name: Nome: - + Location: Localização: - + Uninstall Desinstalar @@ -5411,42 +5194,38 @@ x (number) determines the number of maximum files shown TextEdit - + Replace... - + Replace All... - + Ignore Ignorar - + Ignore All - + Add to User Dictionary - + Do not Ignore ThemeDialog - - Native Theme - Tema nativo - A flexible look matching system colors @@ -5486,112 +5265,108 @@ x (number) determines the number of maximum files shown ToolBar - + Show repository sidebar Mostrar barra lateral do repositório - + Previous Anterior - + Next Seguinte - + Fetch Obter - + Pull Puxar - + Merge Unir - + Rebase Rebasear - + Push Enviar - + Checkout Mudar - + Stash Ocultar - + Pop Stash Aplicar e limpar - + Open Terminal - + Open file manager - + Configure Settings Configurar definições - + Repository settings - + Application settings - - + + Show Log Mostrar diário - + Double Tree View - Diff View - Vista de comparação - - - + Tree View Vista em árvore - + Show Starred Commits Mostrar submissões com estrela - + Hide Log Ocultar diário @@ -5599,42 +5374,42 @@ x (number) determines the number of maximum files shown ToolsPanel - + Keep backup of merge files (.orig) Manter salvaguarda dos ficheiro de união (.orig) - + External editor: Editor externo: - + External diff: Comparação externa: - + External merge: União externa: - + Backup files: Ficheiros de salvaguarda: - + Terminal emulator command: - + File manager command: - + Configure Configurar @@ -5774,22 +5549,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: @@ -5820,24 +5595,8 @@ x (number) determines the number of maximum files shown Falha ao iniciar o instalador - - The disk image failed to mount successfully - Falha ao montar a imagem do disco - - - - The existing bundle could not be moved to the trash - Impossível mover o pacoteexistente para o lixo - - - - The new bundle could not be copied into place - Impossível copiar o novo pacote para o sítio - - - - - + + Helper application failed to start Falha ao iniciar a aplicação de ajuda @@ -5852,37 +5611,33 @@ x (number) determines the number of maximum files shown Impossível procurar actualizações - + Unable to download update Impossível transferir a actualização - + Unable to open temporary file Impossível abrir o ficheiro temporário - + Unable to install update Impossível instalar a actualização - + Some windows failed to close. You can download the binary manually from %1 - Some windows failed to close - Algumas janelas falharam ao fechar - - - + Unknown install error Erro de instalação desconhecido - - + + Installer script failed: %1 Falha no script de instalação: %1 @@ -5890,112 +5645,112 @@ x (number) determines the number of maximum files shown WindowPanel - + Add New Theme Adicionar novo tema - + Edit Current Theme Editar o tema actual - + Create Theme Criar tema - + Theme Name Nome do tema - + Restart? Reiniciar? - + The application must be restarted for the theme change to take effect. A aplicação tem de reiniciar para aplicar as alterações ao tema. - + Do you want to restart now? Deseja reiniciar agora? - + Restart Reiniciar - + Later Mais tarde - + Show full repository path Mostrar caminho completo do repositório - + Hide automatically Ocultar automaticamente - + Open submodules in tabs Abrir sub-módulos em separadores - + Open all repositories in tabs Abrir todos os repositórios em separadores - + Hide Menubar - + Show Avatars - + Show Window Maximized when opened - + Theme: Tema: - + Title: Título: - + Log: Diário: - + Tabs: Separadores: - + View: - + Prompt: Pedir: @@ -6003,29 +5758,29 @@ x (number) determines the number of maximum files shown _FileWidget::Header - - + + Use Theirs: Delete - - + + Use Ours: Delete - + both: %1 - + ours: %1 - + theirs: %1 diff --git a/l10n/gittyup_pt_BR.ts b/l10n/gittyup_pt_BR.ts index 7414996c0..02db63ec2 100644 --- a/l10n/gittyup_pt_BR.ts +++ b/l10n/gittyup_pt_BR.ts @@ -33,43 +33,33 @@ Informações referente a privacidade. Privacidade - - Usage reporting has been disabled. Restart the application for changes to take effect. - Relatório de uso foi desativado. - Os relatórios de uso foram desativados. Reinicie o aplicativo para que as alterações entrem em vigor. - - - Usage Reporting Disabled - Relatório de uso desativado. - Relatório de uso desativado - Account - + Connection failed Falha na conexão - + <b>Note:</b> Basic authentication is not supported if you have two-factor authentication enabled. Use a <a href='https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/'>personal access token</a> in the password field instead. Informações sobre autenticação não suportada e solução para o problema. <b>Nota:</b> A autenticação básica não é suportada se você tiver a autenticação de dois fatores ativada. Use um <a href='https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/'>token de acesso pessoal</a> no campo de senha. - + <b>Note:</b> Only Basic authentication is currently supported - + <b>Note:</b> Basic authentication is not supported. Use a <a href='https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html'>personal access token</a> in the password field instead. Informações sobre autenticação não suportada e solução para o problema. <b>Nota:</b> A autenticação básica não é suportada. Use um <a href='https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html'>token de acesso pessoal</a> no campo de senha. - + Authentication failed Houve falha na autenticação. Falha na autenticação @@ -184,193 +174,193 @@ AdvancedSearchWidget - + Author: Autor Autor: - + Author name Nome do autor. Nome do autor - + Email: E-mail E-mail: - + Author email E-mail do autor E-mail do autor - + Message: Mensagem Mensagem: - + Commit message Mensagem do commit. Mensagem do commit - + Date: Data... Data: - + Specific commit date Data exata do commit. Data específica do commit - + After: Commit após determinada data. Após: - + Commits after date Commit após determinada data. Commits após a data - + Before: Commit antes da data. Antes: - + Commits before date Commits antes da data Commits antes da data - + File: Arquivo... Arquivo: - + File name Nome do arquivo Nome do arquivo - + Path: Caminho... Caminho: - + File path Caminho do arquivo. Caminho do arquivo - + Scope: Escopo... Escopo: - + Hunk header text Pedaço de testo do cabeçalho. Pedaço de testo do cabeçalho - + Context: Contexto... Contexto: - + Diff context (white) Comparação, contexto (branco). Diff contexto (branco) - + Addition: Acrescentado... Acrescentado: - + Diff addition (green) Comparação, acrescentado (verde). Diff acrescentado (verde) - + Deletion: Removido... Removido: - + Diff deletion (red) Comparação, removido (Vermelho)... Diff removido (vermelho) - + Comment: Comentário... Comentário: - + Source code comment Comentário do código fonte... Comentário do código fonte - + String: String... String: - + Source code string literal Código fonte string literal. Código fonte string literal - + Identifier: Identificador... Identificador: - + Source code identifier ID do código fonte... Identificador do código fonte - + Search Buscar... Buscar - + Return Retorno... Retorno @@ -407,13 +397,13 @@ Application - + SSL Errors Erros SSL... Erros SSL - + Failed to set up SSL session. Do you want to ignore these errors? Confirme para ignorar os erros. Falha ao configurar a sessão SSL. Deseja ignorar esses erros? @@ -422,65 +412,49 @@ AuthorCommitterDate - + Author/Committer: - + Author: - + Committer: - - Beanstalk - - Connection failed - Houve falha na conexão. - Falha na conexão - - - - Bitbucket - - Connection failed - Houve falha na conexão. - Falha na conexão - - BlameEditor - + Untitled Não há título... Sem título - + Not Tracked Não rastreado... Não rastreado - + HEAD Cabeçalho... HEAD - + Working Copy Cópia de trabalho... Cópia de trabalho - + Save File Salva o arquivo... Salvar arquivo @@ -489,13 +463,13 @@ BlameMargin - + Not Committed Não comitado... Não comitado - + Invalid Signature Assinatura inválida... Assinatura inválida @@ -634,31 +608,31 @@ CommitDetail - + Copy Efetua uma cópia... Copiar - + Range: Ordem... Ordem: - + Id: Id de indentificação. Id: - + initial commit Commit inicial... Commit inicial - + Parents: Pais... Pais: @@ -726,203 +700,183 @@ CommitEditor - + T - + <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 - Update %1 - Comentário padrão para o commit... - Modificações efetuadas em: %1 - - - Update %1 and %2 - Modificações efetuadas em %1 e %2 - Modificações efetuadas em %1 e %2 - - - Update %1, %2, and %3 - Modificações efetuadas em %1, %2 e %3 - Modificações efetuadas em %1, %2 e %3 - - - Update %1, %2, and %3 more files... - Modificações efetuadas em %1, %2 e %3 outros arquivos... - 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,152 +885,142 @@ 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... - Delete Tag %1 - Deleta a Tag específicada. - Deletar Tag %1 - - - Delete Branch %1 - Remove o Branch especificado. - 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 +1029,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 @@ -1100,7 +1044,7 @@ CommitToolBar - + Show All Branches Mostra todas as ramificações. Mostrar todas as ramificações @@ -1112,47 +1056,52 @@ Mostrar ramificação selecionada - + + Show Selected Branch, First Parent Only + + + + Sort by Date Classificar por data Classificar por data - + Sort Topologically Ordenar topologicamente Ordenar topologicamente - + Show Graph Mostrar gráfico Mostrar gráfico - + Show Clean Status Mostrar status da limpeza Mostrar status da limpeza - + Compact Mode Modo compacto Modo compacto - + Show Author - + Show Date - + Show Id @@ -1160,66 +1109,99 @@ ConfigDialog - + Esc Esc Esc - + General Geral Geral - + Diff Realiza uma função de comparação nas fontes de dados Git. Diff - + Remotes Remotos Remotos - + Branches Ramificações Ramificações - + Submodules Submódulos Submódulos - + Search Procurar... Procurar - + Plugins Plugins Plugins - + LFS Armazenamento de arquivos grandes... LFS - + Edit Config File... Editar arquivo de configuração ... Editar arquivo de configuração... + + CredentialHelper + + + Caching the credentials in the RAM. Required to enter credentials on every startup + + + + + Storing the credentials unencrypted on disk, protected only by filesystem permissions <a href="https://git-scm.com/docs/git-credential-store">git-credential-store</a> + + + + + MacOS credential manager + + + + + Windows credential manager + + + + + Secret Service D-Bus client library + + + + + Prefer <a href="https://wiki.gnome.org/Projects/Libsecret">libsecret</a> over gnome-keyring if available + + + DateSelectionGroupWidget @@ -1275,11 +1257,6 @@ Adicionar %1 conta Add %1 conta - - View getting started videos - Vê vídeos de introdução - Vê vídeos de introdução - Contact us for support @@ -1326,19 +1303,19 @@ Push - + Push canceled. O Push foi cancelado. Push cancelado. - + Unable to push to %1 - %2 Não foi possível enviar para %1 - %2 Não foi possível enviar para %1 - %2 - + The branch is not fully merged. Deleting it may cause some commits to be lost. O Branch não está totalmente mesclado. A exclusão pode causar a perda de alguns commits. O Branch não está totalmente mesclado. A exclusão pode causar a perda de alguns commits. @@ -1383,24 +1360,24 @@ Push - + Push canceled. o Push foi cancelado. Push cancelado. - + Unable to push to %1 - %2 Não foi possível enviar para %1 - %2 - + Delete Tag Deleta a Tag Deletar Tag - + delete tag Deleta a Tag. deletar tag @@ -1409,24 +1386,24 @@ DetailView - - + + Author: Autor: - + reset - + Here you can set the author used for committing These settings will not be saved permanently - + Email: E-mail: @@ -1434,65 +1411,65 @@ These settings will not be saved permanently DiffPanel - + lines linhas linhas - + System Locale Localidade do sistema. Localidade do sistema - + 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: @@ -1501,11 +1478,16 @@ These settings will not be saved permanently DiffTool - + External Diff Efetua uma comparação externa. Diff externa + + + External Diff to Working Copy + + DiffTreeModel @@ -1518,13 +1500,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 @@ -1613,65 +1595,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: @@ -1755,475 +1737,395 @@ These settings will not be saved permanently O arquivo selecionado %1 não possui uma revisão. - + + Bash Not Found O Bash não foi encontrado. Bash não encontrado - + + Bash was not found on your PATH. O Bash não foi encontrado no seu PATH. O Bash não foi encontrado no seu PATH. - + + Bash is required to execute external tools. O Bash é necessário para executar ferramentas externas. O Bash é necessário para executar ferramentas externas. - + Stage Stage área. Stage - + Unstage Unstage. Unstage - + Discard Changes Descartar mudanças. Descartar mudanças - + Discard Changes? Descarta mudanças. Descartar mudanças? - + Are you sure you want to discard changes in the selected files? Confirmação de descarte de alterações. Tem certeza de que deseja descartar as alterações nos arquivos selecionados? - + This action cannot be undone. Essa ação não pode ser desfeita. Essa ação não pode ser desfeita. - + (Submodule) - + %1 files %1 arquivos %1 arquivos - + Discard Descarta as alterações. Descartar - + discard Descarta as alterações... descartar - + Remove Untracked Files Remove arquivos não rastreados. Remover arquivos não rastreados - + Ignore Ignora. Ignorar - + Checkout Checkout Checkout - + Unlock Desbloqueia. Desbloquear - + Lock Bloqueia. Bloquear - + Copy File Name Copia nome do arquivo. Copiar nome do arquivo - + Filter History Filtra o histórico. Filtrar histórico - + Navigate to Navega entre revisões. Navegar para - + Next Revision Vai para a próxima revisão. Próxima revisão - + next Próxima revisão. próxima - + Previous Revision Vai para a revisão anterior. Revisão anterior - + previous Revisão anterior. anterior - + Unset Executable Desativa executável. Desativar executável - + Set Executable Define executável Definir executável - + Save Selected Version as ... - + Select new file directory - + Saving files - + Saving files of selected version to disk - + Save file - + Invalid Blob - + Open this version - + Opening file - + Open - + open file - + Blob is invalid. - - + + Unable to checkout bare repositories - + Unable to open files from bare repository - + The file is already in the current working directory - + edit Edita. editar - + diff Compara fontes de dados. diff - + merge Mescla ramificações. merge - + External Tool Not Found Não foi encontrada a ferramenta externa. Ferramenta externa não encontrada - + Failed to execute external %1 tool. Houve falha na execução da ferramenta externa. Falha ao executar a ferramenta %1 externa. - - FileList - - Sort By - Ordernar por... - Ordenar por - - - Select - Selecionar... - Selecionar - - - Name - Nome... - Nome - - - Status - Status... - Status - - - Ignore Whitespace (-w) - Ignorar espaço em branco (-w) - Ignorar espaço em branco (-w) - - - Added - Adicionado... - Adicionado - - - Deleted - Deletado... - Deletado - - - Modified - Modificado... - Modificado - - - Renamed - Renomeado... - Renomeado - - - Copied - Copiado... - Copiado - - - Ignored - Ignorado... - Ignorado - - - Untracked - Não rastreado... - Não rastreado - - - Unreadable - Ilegível... - Ilegível - - - Conflicted - Conflitado... - Conflitado - - - Unmodified - Não modificado... - Não modificado - - - Type Change - Alteração de tipo... - Alteração de tipo - - FileWidget - + LFS Large Storage File... LFS - - + + Unlock Desbloquear... Desbloquear - - + + Lock Bloquear... Bloquear - - + + Show Object Mostrar Objeto... Mostrar Objeto - + Edit File Editar arquivo... Editar arquivo - + Discard File Descartar arquivo Descartar arquivo - + Directory Diretório... Diretório - + File Arquivo... Arquivo - + Remove %1? Remoção... Remover %1? - + Discard Changes? Descarta mudanças... Descartar mudanças? - + Are you sure you want to remove '%1'? Confirmação de remoção... Tem certeza de que deseja remover '%1'? - + Are you sure you want to discard all changes in '%1'? Confirmação de descarte de alteração... Tem certeza de que deseja descartar todas as alterações em '%1'? - + This action cannot be undone. Informe de que ação não pode ser desfeita. Essa ação não pode ser desfeita. - + Remove %1 Remoção... Remover %1 - + Discard Changes Descarta mudanças... Descartar mudanças - + Discard Descarta... Descartar - + discard Descarta... descartar - - + + Collapse File Recolher arquivo... Recolher arquivo - - + + Expand File Expande arquivo... Expandir arquivo - + Show Pointer Mostrar ponteiro... Mostrar ponteiro @@ -2271,147 +2173,134 @@ These settings will not be saved permanently GeneralPanel - - + + Fetch every Buscar todos... Buscar todos - - + + minutes minutos... minutos - - + + Push after each commit Enviar após cada confirmação Enviar após cada confirmação - Update submodules after pull - Atualizar submódulos após pull - Atualizar submódulos após pull - - - - + + Prune when fetching Encurtar ao buscar... Encurtar ao buscar - + No translation Sem tradução... Sem tradução - + Store credentials in secure storage Armazena credenciais em armazenamento seguro... Armazenar credenciais em armazenamento seguro - Allow collection of usage data - Permiti coleta de dados de uso... - Permitir coleta de dados de uso - - - - + + Update submodules after pull and clone - + <a href='view'>View privacy policy</a> Visualizar política de privacidade... <a href='view'>Ver política de privacidade</a> - - + + User name: Nome do usuário... Nome do usuário: - - + + User email: E-mail do usuário... E-mail do usuário: - - + + Automatic actions: Ações automáticas... Ações automáticas: - - + + Language: Idioma... Idioma: - + Credentials: Credenciais... Credenciais: - + Credential store type: - + + Available Credential stores: + + + + Only allow a single running instance - + Single instance: - Usage reporting: - Relatório de uso... - Relatório de uso: + + No credential store set + - - - GitHub - Connection failed - Houve falha na conexão... - Falha na conexão + + No credential store is set. Go to the application settings to set the desired credential store + - Failed to authenticate with GitHub! - Falha na tentativa de autenticação com o GitHub! - Falha na tentativa de autenticação com o GitHub! + + + - Successfully authenticated with GitHub! - Autenticação realizada com sucesso no GitHub! - Autenticação realizada com sucesso no GitHub! + + Available Credential stores + GitLab - - Connection failed - Falha na conexão - Falha na conexão - Authentication failed @@ -2422,7 +2311,7 @@ These settings will not be saved permanently Header - + Filter %1 Filtro... Filtra %1 @@ -2453,29 +2342,29 @@ 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 @@ -2507,22 +2396,12 @@ These settings will not be saved permanently Discard selected lines - - Discard Hunk? - Confirmação para descarte das alterações. - Descartar alteração(ões)? - Are you sure you want to remove '%1'? Confirmação de remoção... Tem certeza de que deseja remover '%1'? - - Are you sure you want to discard the hunk starting at line %1 in '%2'? - Confirmação de descarte... - Tem certeza de que deseja descartar as alterações inicianda na linha %1 em '%2'? - This action cannot be undone. @@ -2620,13 +2499,13 @@ These settings will not be saved permanently LfsPanel - + Initialize LFS Inicializa LFS... Inicializar LFS - + Specify a glob pattern for tracking large files. Generally, large files are greater than 500kB, change frequently, @@ -2652,108 +2531,108 @@ Exemplos - + Pattern: Padrão... Padrão: - + Track Localizar... Localizar - + days dias... dias - + Fetch LFS objects from all references for the past Busca objetos LFS de todas as referências do passado... Buscar objetos LFS de todas as referências do passado - + reference days or dias de referência ou... dias de referência ou - + commit days commit dias... commit dias - + View Environment Exibir ambiente... Exibir ambiente - + git-lfs env (read only) git-lfs env (somente leitura) git-lfs env (somente leitura) - + Deinitialize LFS Desinicializar LFS... Desinicializar LFS - + Deinitialize LFS? Desinicializar LFS? Desinicializar LFS? - + Are you sure you want uninstall LFS from this repository? Tem certeza de que deseja desinstalar o LFS deste repositório? Tem certeza de que deseja desinstalar o LFS deste repositório? - + Deinitialize Desinicializar... Desinicializar - + Server URL: URL do servidor... URL do servidor: - + Prune Offset: Encurta deslocamento... Encurtar deslocamento: - + Fetch Recent: Busca recente... Buscar recente: - + Advanced: Avançado... Avançado: - + Included patterns: - + Excluded patterns: @@ -2851,7 +2730,7 @@ Exemplos LogView - + Copy Copia... Cópia @@ -2860,69 +2739,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 @@ -2948,33 +2827,18 @@ Exemplos Nova janela... Nova janela - - Ctrl+Meta+N - Ctrl+Meta+N - Ctrl+Meta+N - Clone Repository... Clonar repositório... Clonar repositório... - - Ctrl+Shift+N - Ctrl+Shift+N - Ctrl+Shift+N - Initialize New Repository... Cria novo repositório... Novo repositório... - - Ctrl+Alt+N - Ctrl+Alt+N - Ctrl+Alt+N - Open Repository... @@ -3082,11 +2946,6 @@ Exemplos Show Double Tree View - - Ctrl+E - Ctrl+E - Ctrl+E - View @@ -3146,44 +3005,24 @@ Exemplos Coloca tudo na Stage Área... Add Tudo a Stage Área - - Ctrl++ - Ctrl++ - Ctrl++ - Unstage All Remove todas as alterações da Stage Área... Remover Tudo da Stage Área - - Ctrl+- - Ctrl+- - Ctrl+- - Commit Commita... Commitar - - Ctrl+Shift+C - Ctrl+Shift+C - Ctrl+Shift+C - Amend Commit Emenda commit... Emendar commit - - Ctrl+Shift+A - Combinação de tecla atalho... - Ctrl+Shift+A - Git LFS @@ -3220,77 +3059,42 @@ Exemplos Buscar... Fetch - - Ctrl+Shift+Alt+F - Combinação de teclas atalhos... - Ctrl+Shift+Alt+F - Fetch All Buscar tudo... Fetch tudo - - Ctrl+Shift+Alt+A - Combinação de teclas atalho... - Ctrl+Shift+Alt+A - Fetch From... Buscar de... Fetch de... - - Ctrl+Shift+F - Combinação de teclas atalhos... - Ctrl+Shift+F - Pull Puxar... Pull - - Ctrl+Shift+Alt+L - Combinação de teclas atalhos... - Ctrl+Shift+Alt+L - Pull From... Puxar de... Pull de... - - Ctrl+Shift+L - Combinação de teclas atalhos... - Ctrl+Shift+L - Push Puxar... Push - - Ctrl+Shift+Alt+P - Combinação de teclas atalhos... - Ctrl+Shift+Alt+P - Push To... Enviar para... Push para... - - Ctrl+Shift+P - COmbinação de teclas atalhos... - Ctrl+Shift+P - Branch @@ -3320,55 +3124,30 @@ Exemplos Checkout, muda para o destino especificado... Checkout atual - - Ctrl+Shift+Alt+H - Combinação de teclas atalhos... - Ctrl+Shift+Alt+H - Checkout... Muda para um destino especificado... Checkout... - - Ctrl+Shift+H - Combinação de teclas atalhos... - Ctrl+Shift+H - Merge... Mescla ramificações... Mesclar... - - Ctrl+Shift+M - Combinação de teclas atalhos... - Ctrl+Shift+M - Rebase... Mescla alocando os commits do branch pai antes das alterações do branch filho. Rebase... - - Ctrl+Shift+R - Combinação de teclas atalhos... - Ctrl+Shift+R - Squash... Mescla alocando as alterações do branch especificado no topo, mesclando como um novo commit. Mesclar --Squash... - - Ctrl+Shift+Q - Combinação de teclas atalhos... - Ctrl+Shift+Q - Abort Merge @@ -3393,22 +3172,12 @@ Exemplos Atualiza todos os módulos... Atualizar tudo - - Ctrl+Shift+Alt+U - Combinação de teclas atalhos... - Ctrl+Shift+Alt+U - Update... Atualiza os módulos... Atualizar... - - Ctrl+Shift+U - Combinação de teclas atalhos... - Ctrl+Shift+U - Open @@ -3433,22 +3202,12 @@ Exemplos Stash, salva as alterações não commitadas tanto as preparadas quanto as não preparadas para uso posterior. Stash... - - Ctrl+Shift+T - Combinação de teclas atalhos... - Ctrl+Shift+T - Pop Stash Joga fora o stash (mais alto, por padrão) depois de aplicá-lo. Descartar Stash - - Ctrl+Shift+Alt+T - Combinação de teclas atalhos... - Ctrl+Shift+Alt+T - History @@ -3491,11 +3250,6 @@ Exemplos Mostra seletor de repositório... Mostrar seletor de repositório... - - Ctrl+Shift+O - Combinação de teclas atalhos... - Ctrl+Shift+O - Tools @@ -3590,11 +3344,6 @@ Exemplos Ocultar Log... Ocultar Log - - Show Diff View - Visualiar comparação... - Mostrar comparação - Merge @@ -3710,13 +3459,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: @@ -3848,7 +3597,7 @@ Exemplos PullRequestButton - + Create Pull Request Cria solicitação pull... Criar solicitação pull @@ -3944,7 +3693,7 @@ Exemplos - + Your global GIT configuration is invalid, Gittyup won't run properly until this is fixed @@ -4009,19 +3758,19 @@ Would you like to fix the merge conflict and continue? ReferenceModel - + Branches Todas as ramificações do projeto. Branches - + Remotes Todas as ramificações remotas. Remotos - + Tags Todas as etiquetas do projeto. Tags @@ -4030,66 +3779,66 @@ Would you like to fix the merge conflict and continue? ReferenceView - + Branch Ramificações... Ramificação - + Remote Ramificações remotas... Remoto - + Tag Etiquetas... Etiquetas - + Checkout Checkout... Checkout - + Rename Renomea... Renomear - + Delete Deletar - + Push Tag to %1 Empurre a Tag para %1 Empurre a Tag para %1 - + New Local Branch Novo Branch Local... Novo Branch Local - + Merge... Merge... Merge... - + Rebase... Pega os commits do branch pai, sincroniza com os commits anterior desse, e joga os commits do branch atual no final da pilha. Rebase... - + Squash... Mescla alocando as alterações do Branch especificado no topo, mesclando como um novo commit. Merge --Squash... @@ -4098,7 +3847,7 @@ Would you like to fix the merge conflict and continue? RefreshButton - + Refresh Atualizar... Atualizar @@ -4107,7 +3856,7 @@ Would you like to fix the merge conflict and continue? RemoteButton - + 999+ 999+ 999+ @@ -4116,59 +3865,59 @@ Would you like to fix the merge conflict and continue? RemoteCallbacks - + remote: %1 - + failed to execute pre-push hook: bash not found - + failed to execute pre-push hook: %1 - + HTTPS Credentials - + SSH Passphrase - + Username: Nome do usuário: - + Password: Senha: - + Passphrase: - - + + authentication canceled - + From %1 - - + + To %1 @@ -4320,17 +4069,17 @@ Would you like to fix the merge conflict and continue? RemotesPanel - + Delete Remote? - + Are you sure you want to delete '%1'? - + Delete Deletar @@ -4639,8 +4388,8 @@ was added to %1 - - + + <i>no remote</i> @@ -4651,7 +4400,7 @@ was added to %1 - + Fetch canceled. @@ -4667,598 +4416,603 @@ was added to %1 - - + + 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 @@ -5268,112 +5022,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. @@ -5381,12 +5135,12 @@ This reverts commit %2. Repository - + Unknown error - + git-lfs not found @@ -5402,32 +5156,32 @@ This reverts commit %2. SearchPanel - + Enable indexing - + terms - + lines linhas - + Limit commits to: - + Diff context: - + Remove Index @@ -5435,32 +5189,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 @@ -5468,67 +5222,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 @@ -5559,89 +5313,89 @@ This reverts commit %2. SideBar - + Close Fechar - - - + + + Remove - + Authorize - + Clone Repository Clonar repositório - + Open Existing Repository - + Open Repository - + Initialize New Repository - + Add %1 Account - + <p>Are you sure you want to remove the remote repository association for %1?</p><p>The local clone itself will not be affected.</p> - + Remove Repository Association? - + Clear All Recent - + Show Full Path - + Filter Non-existent Paths - + Refresh Remote Accounts - + Show Full Name - + <p>Are you sure you want to remove the %1 account for '%2'?</p><p>Only the account association will be removed. Remote configurations and local clones will not be affected.</p> - + Remove Account? @@ -5794,13 +5548,13 @@ This reverts commit %2. Desinicializar o submódulo? - + The submodule working directory contains uncommitted changes that will be lost if you continue. Feedback de confirmação de remoção do submódulo... O diretório de trabalho do submódulo contém alterações não confirmadas que serão perdidas se você continuar. - + Deinitialize Desinicializa... Desinicializar @@ -5924,23 +5678,23 @@ x (number) determines the number of maximum files shown TerminalPanel - - + + Install - + Name: Nome: - + Location: - + Uninstall @@ -5948,32 +5702,32 @@ x (number) determines the number of maximum files shown TextEdit - + Replace... - + Replace All... - + Ignore Ignorar - + Ignore All - + Add to User Dictionary - + Do not Ignore @@ -6019,108 +5773,108 @@ x (number) determines the number of maximum files shown ToolBar - + Show repository sidebar - + Previous - + Next - + Fetch Fetch - + Pull Pull - + Merge - + Rebase Rebase - + Push Push - + Checkout Checkout - + Stash - + Pop Stash Descartar Stash - + Open Terminal - + Open file manager - + Configure Settings - + Repository settings - + Application settings - - + + Show Log Mostrar log - + Double Tree View - + Tree View - + Show Starred Commits - + Hide Log Ocultar Log @@ -6128,42 +5882,42 @@ x (number) determines the number of maximum files shown ToolsPanel - + Keep backup of merge files (.orig) - + External editor: - + External diff: - + External merge: - + Backup files: - + Terminal emulator command: - + File manager command: - + Configure @@ -6303,22 +6057,22 @@ x (number) determines the number of maximum files shown UpdatePanel - + Check for updates automatically - + Automatically download and install updates - + Check Now - + Software Update: @@ -6349,24 +6103,8 @@ x (number) determines the number of maximum files shown - - The disk image failed to mount successfully - - - - - The existing bundle could not be moved to the trash - - - - - The new bundle could not be copied into place - - - - - - + + Helper application failed to start @@ -6381,33 +6119,33 @@ x (number) determines the number of maximum files shown - + Unable to download update - + Unable to open temporary file - + Unable to install update - + Some windows failed to close. You can download the binary manually from %1 - + Unknown install error - - + + Installer script failed: %1 @@ -6415,112 +6153,112 @@ x (number) determines the number of maximum files shown WindowPanel - + Add New Theme - + Edit Current Theme - + Create Theme - + Theme Name - + Restart? - + The application must be restarted for the theme change to take effect. - + Do you want to restart now? - + Restart - + Later - + Show full repository path - + Hide automatically - + Open submodules in tabs - + Open all repositories in tabs - + Hide Menubar - + Show Avatars - + Show Window Maximized when opened - + Theme: - + Title: - + Log: - + Tabs: - + View: - + Prompt: @@ -6528,29 +6266,29 @@ x (number) determines the number of maximum files shown _FileWidget::Header - - + + Use Theirs: Delete - - + + Use Ours: Delete - + both: %1 - + ours: %1 - + theirs: %1 diff --git a/l10n/gittyup_ru.ts b/l10n/gittyup_ru.ts index 4046c40c1..567c71d8f 100644 --- a/l10n/gittyup_ru.ts +++ b/l10n/gittyup_ru.ts @@ -28,39 +28,31 @@ Privacy Приватность - - Usage reporting has been disabled. Restart the application for changes to take effect. - Доносительство об использовании было отключено. Перезапустите приложение для вступления изменений в силу. - - - Usage Reporting Disabled - Доносительство об использовании отключено - Account - + Connection failed Соединение не удалось - + <b>Note:</b> Basic authentication is not supported if you have two-factor authentication enabled. Use a <a href='https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/'>personal access token</a> in the password field instead. <b>Заметь:</b> Базовая аутентификация не поддерживается, если у вас включена двухфакторная. Используйте <a href='https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/'>персональный токен доступа</a> вместо пароля. - + <b>Note:</b> Only Basic authentication is currently supported - + <b>Note:</b> Basic authentication is not supported. Use a <a href='https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html'>personal access token</a> in the password field instead. <b>Note:</b> Базовая аутентификация не поддерживается. Используйте <a href='https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html'>personal токен доступа</a> вместо пароля. - + Authentication failed Аутентификация провалена @@ -158,162 +150,162 @@ AdvancedSearchWidget - + Author: Автор: - + Author name Имя автора - + Email: Почта: - + Author email Почта автора - + Message: Сообщение: - + Commit message Сообщение коммита - + Date: Дата: - + Specific commit date Конкретная дата коммита - + After: После: - + Commits after date Коммиты после даты - + Before: - + Commits before date Коммиты до даты - + File: Файл: - + File name Имя файла - + Path: Путь: - + File path Путь файла - + Scope: Область видимости: - + Hunk header text Текст заголовка hunkа - + Context: Контекст: - + Diff context (white) Diff контекст (белый) - + Addition: Добавка: - + Diff addition (green) Diff добавлено (зелёный) - + Deletion: Удалено: - + Diff deletion (red) Diff удалено (красный) - + Comment: Комментарий: - + Source code comment Комментарий исходника - + String: Строка: - + Source code string literal Литеральная строка исходника - + Identifier: Идентификатор: - + Source code identifier Идентификатор исходника - + Search Поиск - + Return Вернуться @@ -349,12 +341,12 @@ Application - + SSL Errors Ошибки SSL - + Failed to set up SSL session. Do you want to ignore these errors? Не смог установить сеанс SSL. Хотите игнорировать ошибки? @@ -362,59 +354,45 @@ AuthorCommitterDate - + Author/Committer: - + Author: - + Committer: - - Beanstalk - - Connection failed - Соединение не удалось - - - - Bitbucket - - Connection failed - Соединение не удалось - - BlameEditor - + Untitled Без_Имени - + Not Tracked Не отслеживаемо - + HEAD - + Working Copy Рабочая копия - + Save File Сохранить файл @@ -422,12 +400,12 @@ BlameMargin - + Not Committed Не закоммичено - + Invalid Signature Неверная подпись @@ -546,27 +524,27 @@ CommitDetail - + Copy Копировать - + Range: Диапазон: - + Id: - + initial commit - + Parents: @@ -624,181 +602,165 @@ CommitEditor - + T - + <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 - Update %1 - Update %1 - - - Update %1 and %2 - Обновить %1 и %2 - - - Update %1, %2, and %3 - Обновить %1 и %2 и %3 - - - Update %1, %2, and %3 more files... - Обновить %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,131 +768,123 @@ CommitList - + Remove Untracked Files Удалить неотслеживаемые файлы - + Apply Применить - + Pop Вытолкнуть - + Drop Выбросить - + Unstar Снять отметку - + Star Отметить - + Add Tag... Добавить метку... - + New Branch... Новая ветка... - Delete Tag %1 - Удалить метку %1 - - - Delete Branch %1 - Удалить ветку %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 +892,12 @@ CommitModel - + Uncommitted changes Незакоммиченные изменения - + Checking for uncommitted changes Проверяем на незакоммиченные изменения @@ -951,7 +905,7 @@ CommitToolBar - + Show All Branches Показать все ветки @@ -961,42 +915,47 @@ Показать выбранную ветку - + + Show Selected Branch, First Parent Only + + + + Sort by Date Сортировать по дате - + Sort Topologically Сортировать топологически - + Show Graph Показать граф - + Show Clean Status Показать чистоту - + Compact Mode Компатный режим - + Show Author - + Show Date - + Show Id @@ -1004,56 +963,89 @@ ConfigDialog - + Esc - + General J,obt - + Diff - + Remotes - + Branches Ветки - + Submodules Подмодули - + Search Поиск - + Plugins Плагины - + LFS - + Edit Config File... Редактировать конфиг... + + CredentialHelper + + + Caching the credentials in the RAM. Required to enter credentials on every startup + + + + + Storing the credentials unencrypted on disk, protected only by filesystem permissions <a href="https://git-scm.com/docs/git-credential-store">git-credential-store</a> + + + + + MacOS credential manager + + + + + Windows credential manager + + + + + Secret Service D-Bus client library + + + + + Prefer <a href="https://wiki.gnome.org/Projects/Libsecret">libsecret</a> over gnome-keyring if available + + + DateSelectionGroupWidget @@ -1104,10 +1096,6 @@ Add %1 account Добавить аккаунт %1 - - View getting started videos - Показать вводные видеоролики - Contact us for support @@ -1147,17 +1135,17 @@ Запушить - + Push canceled. Push отменён. - + Unable to push to %1 - %2 Не смог запушить в %1 - %2 - + The branch is not fully merged. Deleting it may cause some commits to be lost. Ветка не полностью слита. Удаление её может привести к потере некоторых коммитов. @@ -1195,22 +1183,22 @@ Запушить - + Push canceled. Push отменён. - + Unable to push to %1 - %2 Не смог запушить в %1 - %2 - + Delete Tag Удалить метку - + delete tag удалить метку @@ -1218,24 +1206,24 @@ DetailView - - + + Author: Автор: - + reset сбросить - + Here you can set the author used for committing These settings will not be saved permanently - + Email: Почта: @@ -1243,57 +1231,57 @@ These settings will not be saved permanently DiffPanel - + lines строк - + System Locale Системная локаль - + Wrap lines - + Context lines: Строки контекста: - + Wrap lines: - + Character Encoding: Кодировка символов: - + Ignore Whitespace (-w) Игнорировать непечатаемые (-w) - + Added files Добавленные файлы - + Deleted files Удалить файлы - + Whitespace: Непечатаемые: - + Auto Collapse: Авто-сворачивание: @@ -1301,10 +1289,15 @@ These settings will not be saved permanently DiffTool - + External Diff Внешний Diff + + + External Diff to Working Copy + + DiffTreeModel @@ -1317,12 +1310,12 @@ These settings will not be saved permanently DiffView - + Add new file Добавить новый файл - + Or drag files here to copy into the repository Или перетащите файлы сюда, чтобы скопировать их в репозиторий @@ -1402,57 +1395,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: @@ -1524,409 +1517,345 @@ These settings will not be saved permanently Выбранный файл не имеет ревизии %1. - + + Bash Not Found Bash не найден - + + Bash was not found on your PATH. Bash не найден в вашем PATH. - + + Bash is required to execute external tools. Требуется Bash для запуска внешних инструментов. - + Stage Добавить - + Unstage Отменить добавление - + Discard Changes Отменить изменения - + Discard Changes? Отменить изменения? - + Are you sure you want to discard changes in the selected files? Вы уверены, что хотите отклонить изменения в выбранных файлах? - + This action cannot be undone. Это дествие не может быть отменено. - + (Submodule) - + %1 files %1 файлов - + Discard Отменить - + discard отменить - + Remove Untracked Files Удалить неотслеживаемые файлы - + Ignore Игнорировать - + Checkout Перейти - + Unlock Разблокировать - + Lock Заблокировать - + Copy File Name Копировать имя файла - + Filter History Фильтровать историю - + Navigate to Перейти к - + Next Revision следующая ревизия - + next следующая - + Previous Revision Предыдущая ревизия - + previous предыдущая - + Unset Executable Сделать неисполняемым - + Set Executable Сделать исполняемым - + Save Selected Version as ... - + Select new file directory - + Saving files - + Saving files of selected version to disk - + Save file - + Invalid Blob - + Open this version - + Opening file - + Open - + open file - + Blob is invalid. - - + + Unable to checkout bare repositories - + Unable to open files from bare repository - + The file is already in the current working directory - + edit редактировать - + diff - + merge слить - + External Tool Not Found Внешний инстрмент не найден - + Failed to execute external %1 tool. Не могу выполнить внешний инструмент %1. - - FileList - - Sort By - Сортировать по - - - Select - Выбрать - - - Name - Имя - - - Status - Состояние - - - Ignore Whitespace (-w) - Игнорировать непечатаемые симовлы - - - Added - Добавлено - - - Deleted - Удалено - - - Modified - Изменено - - - Renamed - Переименовано - - - Copied - Копировано - - - Ignored - игнорировано - - - Untracked - Не отслеживается - - - Unreadable - Нечитаемо - - - Conflicted - Конфликтует - - - Unmodified - Не изменено - - - Type Change - Изменён тип - - FileWidget - + LFS - - + + Unlock Разблокировать - - + + Lock Заблокировать - - + + Show Object Показать объект - + Edit File Редактировать файл - + Discard File Удалить файл - + Directory Директория - + File Файл - + Remove %1? Удалить %1? - + Discard Changes? Отменить изменения? - + Are you sure you want to remove '%1'? Вы уверены, что хотите удалить '%1'? - + Are you sure you want to discard all changes in '%1'? Вы уверены, что хотите отменить все изменения в '%1'? - + This action cannot be undone. Это дествие не может быть отменено. - + Remove %1 Удалить %1 - + Discard Changes Отменить изменения - + Discard Удалить - + discard убрать - - + + Collapse File Свернуть файл - - + + Expand File Развернуть файл - + Show Pointer Показаить указатель @@ -1967,128 +1896,122 @@ These settings will not be saved permanently GeneralPanel - - + + Fetch every Забирать каждые - - + + minutes минут - - + + Push after each commit Пушить после каждого коммита - Update submodules after pull - Обновлять подмодули после каждого утягивания - - - - + + Prune when fetching Чистить ссылки, когда забираю - + No translation Без перевода - + Store credentials in secure storage Хранить учётные данные в безопасном хранилище - Allow collection of usage data - Разрешить доносительство данных об использовании - - - - + + Update submodules after pull and clone - + <a href='view'>View privacy policy</a> <a href='view'>Смотреть политику приватности</a> - - + + User name: Имя пользователя: - - + + User email: Почта пользователя: - - + + Automatic actions: Автоматические действия: - - + + Language: Язык: - + Credentials: Учётные данные: - + Credential store type: - + + Available Credential stores: + + + + Only allow a single running instance - + Single instance: - Usage reporting: - Доносительство об использовании: + + No credential store set + - - - GitHub - Connection failed - Соединение не удалось + + No credential store is set. Go to the application settings to set the desired credential store + - Failed to authenticate with GitHub! - Не смог аутентифицироваться на GitHubе! + + + - Successfully authenticated with GitHub! - Успешно аутентифицирован на GitHubе! + + Available Credential stores + GitLab - - Connection failed - Соединение не удалось - Authentication failed @@ -2098,7 +2021,7 @@ These settings will not be saved permanently Header - + Filter %1 Фильтр %1 @@ -2127,26 +2050,26 @@ These settings will not be saved permanently HunkWidget + - Save Сохранить + - Undo Отменить + - Use Ours Использовать "Нашу" + - Use Theirs Использовать "Их" @@ -2175,19 +2098,11 @@ These settings will not be saved permanently Discard selected lines - - Discard Hunk? - Отклонить hunk? - Are you sure you want to remove '%1'? Вы уверены, что хотите удалить '%1'? - - Are you sure you want to discard the hunk starting at line %1 in '%2'? - Вы уверены, что хотите отклонить hunk в строке %1 в '%2'? - This action cannot be undone. @@ -2277,12 +2192,12 @@ These settings will not be saved permanently LfsPanel - + Initialize LFS Инициализировать LFS - + Specify a glob pattern for tracking large files. Generally, large files are greater than 500kB, change frequently, @@ -2307,92 +2222,92 @@ Examples - + Pattern: Шаблон: - + Track Отслеживать - + days дней - + Fetch LFS objects from all references for the past Забрать объекты LFS из всех прошлых ссылок - + reference days or - + commit days - + View Environment Смотреть окружение - + git-lfs env (read only) git-lfs env (только чтение) - + Deinitialize LFS Деинициализировать LFS - + Deinitialize LFS? Деинициализировать LFS? - + Are you sure you want uninstall LFS from this repository? Вы уверены, что хотите отменить установку LFS в этот репозиторий? - + Deinitialize Деинициализировать - + Server URL: URL сервера: - + Prune Offset: - + Fetch Recent: Забирать недавние: - + Advanced: Дополнительно: - + Included patterns: - + Excluded patterns: @@ -2476,7 +2391,7 @@ Examples LogView - + Copy Копировать @@ -2484,59 +2399,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 ПЕРЕБАЗИРУЕМ @@ -2995,10 +2910,6 @@ Examples Hide Log Скрыть журнал - - Show Diff View - Показать просмотрщик диффов - Merge @@ -3097,12 +3008,12 @@ Examples MiscPanel - + Path to SSH config file: Путь к конфигу SSH: - + Path to default / fallback SSH key file: Путь к запасному / по-умолчанию файлу ключа SSH: @@ -3215,7 +3126,7 @@ Examples PullRequestButton - + Create Pull Request Создать Pull Request @@ -3301,7 +3212,7 @@ Examples - + Your global GIT configuration is invalid, Gittyup won't run properly until this is fixed @@ -3364,17 +3275,17 @@ Would you like to fix the merge conflict and continue? ReferenceModel - + Branches Ветки - + Remotes - + Tags Метки @@ -3382,57 +3293,57 @@ Would you like to fix the merge conflict and continue? ReferenceView - + Branch Ветка - + Remote - + Tag Метка - + Checkout Перейти - + Rename Переименовать - + Delete Удалить - + Push Tag to %1 Запушить метку в %1 - + New Local Branch Новая локальная ветка - + Merge... Слить... - + Rebase... Перебазировать... - + Squash... Объединить... @@ -3440,7 +3351,7 @@ Would you like to fix the merge conflict and continue? RefreshButton - + Refresh Обновить @@ -3448,7 +3359,7 @@ Would you like to fix the merge conflict and continue? RemoteButton - + 999+ @@ -3456,59 +3367,59 @@ Would you like to fix the merge conflict and continue? RemoteCallbacks - + remote: %1 - + failed to execute pre-push hook: bash not found не могу выполнить pre-push hook: bash не найден - + failed to execute pre-push hook: %1 не могу выполнить pre-push hook: %1 - + HTTPS Credentials учётные данные HTTPS - + SSH Passphrase Парольная фраза SSH - + Username: Имя пользователя: - + Password: Пароль: - + Passphrase: Парольная фраза: - - + + authentication canceled аутентификация отменена - + From %1 Из %1 - - + + To %1 На %1 @@ -3660,17 +3571,17 @@ Would you like to fix the merge conflict and continue? RemotesPanel - + Delete Remote? Удалить Remote? - + Are you sure you want to delete '%1'? Вы уверены, что вы хотите удалить '%1'? - + Delete Удалить @@ -3744,10 +3655,6 @@ Would you like to fix the merge conflict and continue? Search Поиск - - The indexer worker process crashed. If this problem persists please contact us at support@gitahead.com. - Процесс-работник индексатора упал. Если проблема постоянна, пожалуйста, свяжитесь с нами на через support@gitahead.com. - Indexer Crashed @@ -3980,8 +3887,8 @@ was added to %1 - - + + <i>no remote</i> <i>нет remote</i> @@ -3992,7 +3899,7 @@ was added to %1 - + Fetch canceled. Забор отменён. @@ -4008,624 +3915,601 @@ was added to %1 - - + + 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 Применить - There was a merge conflict. The rebase has been aborted - Конфликт слияния. Перебазирование прервано - - - + %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 - Force Push? - Принудительно запушить? - - - + 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>. - You may want to integrate remote commits first by <a href='action:pull'>pulling</a>. Then <a href='action:push'>push</a> again. - Вы могли бы хотеть сначала интегрировать коммиты remote путём <a href='action:pull'>утягивания</a>. Затем <a href='action:push'>запушьте</a> снова. - - - If you really want the remote to lose commits, you may be able to <a href='action:push?force=true'>force push</a>. - Если вы действительно хотите, чтобы 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 Сбросить - Amend? - Дополнить? - - - Reset? - Сбросить? - - - Are you sure you want to amend '%1'? - Вы уверены, что хотите дополнить '%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 обновить подмодуль @@ -4635,112 +4519,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 , чтобы вернуть репозиторий в предыдущее состояние. @@ -4748,12 +4632,12 @@ This reverts commit %2. Repository - + Unknown error Неизвестная ошибка - + git-lfs not found git-lfs не найдена @@ -4769,32 +4653,32 @@ This reverts commit %2. SearchPanel - + Enable indexing Включить индексацию - + terms критерии - + lines строк - + Limit commits to: Ограничиться коммитами: - + Diff context: Контекст diffа: - + Remove Index Удалить индекс @@ -4802,32 +4686,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 Подтверждать добавление больших файлов @@ -4835,67 +4719,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 Терминал @@ -4926,89 +4810,89 @@ This reverts commit %2. SideBar - + Close Закрыть - - - + + + Remove Удалить - + Authorize Авторизоваться - + Clone Repository Клонировать репозиторий - + Open Existing Repository Открыть существующий репозиторий - + Open Repository Открыть репозиторий - + Initialize New Repository Инициилизировать новый репозиторий - + Add %1 Account Добавить аккаунт %1 - + <p>Are you sure you want to remove the remote repository association for %1?</p><p>The local clone itself will not be affected.</p> <p>Вы уверенны, что хотите удалить ассоциацию с удаленным репозиторием для %1?</p><p>Локальный клон сам затронут не будет.</p> - + Remove Repository Association? Удалить ассоциацию с репозиторием? - + Clear All Recent Очистить все недавние - + Show Full Path Показать полный путь - + Filter Non-existent Paths Фильтровать несуществующие пути - + Refresh Remote Accounts Обновить удаленные аккаунты - + Show Full Name Показать полное имя - + <p>Are you sure you want to remove the %1 account for '%2'?</p><p>Only the account association will be removed. Remote configurations and local clones will not be affected.</p> <p>Вы уверены, что хотите удалить аккаунт %1 для '%2'?</p><p>Только ассоциация с аккаунтом будет удалена. Настройки remotes и локальные клоны не будут затронуты.</p> - + Remove Account? Удалить аккаунт? @@ -5155,12 +5039,12 @@ This reverts commit %2. Деинициализировать подмодуль? - + The submodule working directory contains uncommitted changes that will be lost if you continue. Рабочая директория подмодуля содержит незакоммиченные изменения, которые будут потеряны, если вы продолжите. - + Deinitialize Деинициализировать @@ -5283,23 +5167,23 @@ x (number) determines the number of maximum files shown TerminalPanel - - + + Install Установить - + Name: Имя: - + Location: Место: - + Uninstall Отменить установку @@ -5307,42 +5191,38 @@ x (number) determines the number of maximum files shown TextEdit - + Replace... - + Replace All... - + Ignore Игнорировать - + Ignore All - + Add to User Dictionary - + Do not Ignore ThemeDialog - - Native Theme - Родная тема - A flexible look matching system colors @@ -5382,112 +5262,108 @@ x (number) determines the number of maximum files shown ToolBar - + Show repository sidebar Показать боковую панель репозитория - + Previous Предыдущий - + Next Следующий - + Fetch Забрать - + Pull Утянуть - + Merge Слить - + Rebase Перебазировать - + Push Запушить - + Checkout Перейти - + Stash Схрон - + Pop Stash Вынуть из схрона - + Open Terminal - + Open file manager - + Configure Settings Настроить - + Repository settings - + Application settings - - + + Show Log Показать журнал - + Double Tree View - Diff View - Смотреть diff - - - + Tree View Смотреть дерево - + Show Starred Commits Показать отзвёзденные коммиты - + Hide Log Скрыть журнал @@ -5495,42 +5371,42 @@ x (number) determines the number of maximum files shown ToolsPanel - + Keep backup of merge files (.orig) Не удалять резервную копию файлов слияний (.orig) - + External editor: Внешний редактор: - + External diff: Внешний diff: - + External merge: Внешнее слияние: - + Backup files: Файлы резервных копий: - + Terminal emulator command: - + File manager command: - + Configure Конфигурировать @@ -5670,22 +5546,22 @@ x (number) determines the number of maximum files shown UpdatePanel - + Check for updates automatically Проверять обновления автоматически - + Automatically download and install updates Автоматически загружать и ставить обновления - + Check Now Проверить сейчас - + Software Update: Обновление ПО: @@ -5716,24 +5592,8 @@ x (number) determines the number of maximum files shown Установщик не смог запуститься - - The disk image failed to mount successfully - Образ диска откне смог примонтироваться успешно - - - - The existing bundle could not be moved to the trash - Существующий бандл не может быть перемещён в Корзину - - - - The new bundle could not be copied into place - Нвый бандл не может быть скопирован на [его] место - - - - - + + Helper application failed to start Помощник установщика не смог запуститься @@ -5748,37 +5608,33 @@ x (number) determines the number of maximum files shown Не могу проверить наличие обновлений - + Unable to download update Не могу скачать обновление - + Unable to open temporary file Не могу открыть временный файл - + Unable to install update Не могу установить обновление - + Some windows failed to close. You can download the binary manually from %1 - Some windows failed to close - Некоторые окна не смогли закрыться - - - + Unknown install error Неизвестная ошибка установки - - + + Installer script failed: %1 Скрипт установщика не выполнил свою задачу: %1 @@ -5786,112 +5642,112 @@ x (number) determines the number of maximum files shown WindowPanel - + Add New Theme Добавить новую тему - + Edit Current Theme Редактировать текущую тему - + Create Theme Создать тему - + Theme Name Имя темы - + Restart? Перезапустить? - + The application must be restarted for the theme change to take effect. Приложение должно быть перезапущено для того чтобы тема заработала. - + Do you want to restart now? Хотите перезапустить сейчас? - + Restart Перезапуск - + Later Позже - + Show full repository path Показывать полный путь к репозиторию - + Hide automatically Скрывать автоматически - + Open submodules in tabs Открыть подмодули во вкладках - + Open all repositories in tabs Открыть все репозитории во вкладках - + Hide Menubar - + Show Avatars - + Show Window Maximized when opened - + Theme: Тема: - + Title: Название: - + Log: Журнал: - + Tabs: Вкладки: - + View: - + Prompt: @@ -5899,29 +5755,29 @@ x (number) determines the number of maximum files shown _FileWidget::Header - - + + Use Theirs: Delete - - + + Use Ours: Delete - + both: %1 - + ours: %1 - + theirs: %1 diff --git a/l10n/gittyup_ta.ts b/l10n/gittyup_ta.ts index f9927dbe4..dff0c5223 100644 --- a/l10n/gittyup_ta.ts +++ b/l10n/gittyup_ta.ts @@ -4,22 +4,27 @@ AboutDialog + About %1 %1 பற்றி + Understand your history! உங்கள் வரலாற்றைப் புரிந்து கொள்ளுங்கள்! + Changelog மாற்றபதிவு + Acknowledgments அங்கீகாரங்கள் + Privacy தனியுரிமை @@ -27,22 +32,27 @@ Account + Connection failed இணைப்பு தோல்வியடைந்தது + <b>Note:</b> Basic authentication is not supported if you have two-factor authentication enabled. Use a <a href='https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/'>personal access token</a> in the password field instead. <b>குறிப்பு:</b> இரண்டு காரணி ஏற்பு இயக்கப்பட்டிருந்தால், அடிப்படை ஏற்பு ஆதரிக்கப்படாது. கடவுச்சொல் புலத்தில் <a href='https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/'>தனிப்பட்ட அணுகல் டோக்கனை</a> பயன்படுத்தவும். + <b>Note:</b> Only Basic authentication is currently supported <b>குறிப்பு:</b> தற்போது அடிப்படை ஏற்பு மட்டுமே ஆதரிக்கப்படுகிறது + <b>Note:</b> Basic authentication is not supported. Use a <a href='https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html'>personal access token</a> in the password field instead. <b>குறிப்பு:</b> அடிப்படை ஏற்பு ஆதரிக்கப்படவில்லை. கடவுச்சொல் புலத்தில் <a href='https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html'>தனிப்பட்ட அணுகல் டோக்கனை</a> பயன்படுத்தவும். + Authentication failed ஏற்பு தோல்வியடைந்தது @@ -50,50 +60,62 @@ AccountDialog + Add Remote Account தொலைநிலைக் கணக்கைச் சேர்க்கவும் + Host: புரவலன்: + Username: பயனர்பெயர்: + Password: கடவுச்சொல்: + Advanced: மேம்பட்ட: + URL: URL: + Replace? மாற்றவா? + An account of this type already exists. இந்த வகை கணக்கு ஏற்கனவே உள்ளது. + Would you like to replace the previous account? முந்தைய கணக்கை மாற்ற விரும்புகிறீர்களா? + Replace மாற்றவும் + Cancel ரத்துசெய் + Connection Failed இணைப்பு தோல்வியடைந்தது @@ -101,14 +123,18 @@ AddRemoteDialog + + Add Remote ரிமோட்டைச் சேர்க்கவும் + Name: பெயர்: + URL: URL: @@ -116,6 +142,7 @@ AdvancedButton + Advanced Search மேம்பட்ட தேடல் @@ -123,130 +150,162 @@ AdvancedSearchWidget + Author: ஆசிரியர்: + Author name ஆசிரியர் பெயர் + Email: மின்னஞ்சல்: + Author email ஆசிரியர் மின்னஞ்சல் + Message: செய்தி: + Commit message உறுதி செய்தி + Date: தேதி: + Specific commit date குறிப்பிட்ட உறுதி தேதி + After: பின்: + Commits after date தேதிக்குப் பிறகு உறுதியளிக்கிறது + Before: முன்: + Commits before date தேதிக்கு முன் உறுதியளிக்கிறது + File: கோப்பு: + File name கோப்பு பெயர் + Path: பாதை: + File path கோப்பு பாதை + Scope: நோக்கம்: + Hunk header text அங்க் தலைப்பு உரை + Context: சூழல்: + Diff context (white) மாறுபட்ட சூழல் (வெள்ளை) + Addition: கூடுதலாக: + Diff addition (green) வேறுபாடு சேர்த்தல் (பச்சை) + Deletion: நீக்குதல்: + Diff deletion (red) வேறுபாடு நீக்கம் (சிவப்பு) + Comment: கருத்து: + Source code comment மூல குறியீடு கருத்து + String: சரம்: + Source code string literal மூல குறியீடு சரம் எழுத்து + Identifier: அடையாளங்காட்டி: + Source code identifier மூல குறியீடு அடையாளங்காட்டி + Search தேடல் + Return திரும்பு @@ -254,22 +313,27 @@ AmendDialog + Author நூலாசிரியர் + Committer ஆணையாளர் + Commit Message: உறுதி செய்தி: + Amend திருத்தவும் + Cancel ரத்துசெய் @@ -277,10 +341,12 @@ Application + SSL Errors SSL பிழைகள் + Failed to set up SSL session. Do you want to ignore these errors? SSL அமர்வை அமைப்பதில் தோல்வி. இந்தப் பிழைகளைப் புறக்கணிக்க விரும்புகிறீர்களா? @@ -288,14 +354,17 @@ AuthorCommitterDate + Author/Committer: ஆசிரியர்/கமிட்டி: + Author: ஆசிரியர்: + Committer: ஆணையர்: @@ -303,22 +372,27 @@ BlameEditor + Untitled தலைப்பிடப்படாத + Not Tracked கண்காணிக்கப்படவில்லை + HEAD தலை + Working Copy வேலை செய்யும் நகல் + Save File கோப்பை சேமி @@ -326,10 +400,12 @@ BlameMargin + Not Committed உறுதி இல்லை + Invalid Signature தவறான கையொப்பம் @@ -337,14 +413,17 @@ BranchTableModel + Name பெயர் + Upstream மேலோடை + Rebase ஒரு நரி @@ -352,14 +431,17 @@ CheckoutDialog + Detach HEAD தலையை பிரிக்கவும் + References: குறிப்புகள்: + Checkout வெளியேறு @@ -367,6 +449,7 @@ ClearButton + Clear தெளிவு @@ -374,26 +457,32 @@ CloneDialog + Initialize Repository களஞ்சியத்தை துவக்கவும் + Clone Repository நகலி களஞ்சியம் + Initialized empty repository into '%1' '% 1' இல் வெற்று களஞ்சியத்தை துவக்கியது + Cloned repository from '%1' into '%2' '% 1' இலிருந்து '% 2' ஆக நகலி செய்யப்பட்ட களஞ்சியம் + Initialize துவக்கவும் + Clone நகலி @@ -401,26 +490,33 @@ ClonePage + Clone Progress நகலி முன்னேற்றம் + The new repository will open after the clone finishes. நகலி முடிந்ததும் புதிய களஞ்சியம் திறக்கப்படும். + Clone நகலி + + clone நகலி + Clone canceled. நகலி ரத்து செய்யப்பட்டது. + Failed to %1 into '%2' - %3 '% 2' -% 3 இல் % 1 இல் தோல்வியடைந்தது @@ -428,22 +524,27 @@ CommitDetail + Copy நகலெடு + Range: எல்லை: + Id: ஐடி: + initial commit ஆரம்ப அர்ப்பணிப்பு + Parents: பெற்றோர்: @@ -451,38 +552,49 @@ CommitDialog + Merge commit message உறுதி செய்தியை இணைக்கவும் + Stash commit message ச்டாச் உறுதி செய்தி + Revert commit message உறுதி செய்தியை மாற்றவும் + Cherry-pick commit message செர்ரி-பிக் கமிட் செய்தி + Merge ஒன்றிணைக்கவும் + + + Abort கைவிடு + Stash ச்டாச் + Revert திரும்பவும் + Cherry-pick செர்ரி-எடு @@ -490,130 +602,165 @@ CommitEditor + T டி + <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' சரியான அன்ச்பெல் அகராதி அல்ல. + + 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 + %1, %2, and %3 % 1,% 2 மற்றும்% 3 + Merge ஒன்றிணைக்கவும் + Revert திரும்பவும் + Cherry-pick செர்ரி-எடு + Rebase ஒரு நரி + Abort %1 கைவிடு% 1 + Commit Rebase கமிட் ரீபேச் + 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 ஒன்றிணைக்க உறுதி @@ -621,98 +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 வெளியேறு % 1 + Checkout வெளியேறு + Local branch is already checked out உள்ளக கிளை ஏற்கனவே சரிபார்க்கப்பட்டது + This is a bare repository இது ஒரு வெற்றுக் களஞ்சியம் + Reset மீட்டமை + Soft மென்மையானது + Mixed கலப்பு + Hard கடினமான @@ -720,10 +892,12 @@ CommitModel + Uncommitted changes உறுதியற்ற மாற்றங்கள் + Checking for uncommitted changes உறுதியற்ற மாற்றங்களைச் சரிபார்க்கிறது @@ -731,42 +905,57 @@ CommitToolBar + Show All Branches அனைத்து கிளைகளையும் காட்டு + Show Selected Branch தேர்ந்தெடுக்கப்பட்ட கிளையைக் காட்டு + + Show Selected Branch, First Parent Only + + + + Sort by Date தேதி வாரியாக வரிசைப்படுத்தவும் + Sort Topologically இடவியல் ரீதியாக வரிசைப்படுத்தவும் + Show Graph வரைபடத்தைக் காட்டு + Show Clean Status தூய்மையான நிலையைக் காட்டு + Compact Mode சிறிய பயன்முறை + Show Author ஆசிரியரைக் காட்டு + Show Date தேதியைக் காட்டு + Show Id ஐடியைக் காட்டு @@ -774,61 +963,108 @@ ConfigDialog + Esc தப்பி + General பொது + Diff வேறுபாடு + Remotes ரிமோட்டுகள் + Branches கிளைகள் + Submodules துணை தொகுதிகள் + Search தேடல் + Plugins செருகுநிரல்கள் + LFS LFS + Edit Config File... கட்டமைப்பு கோப்பைத் திருத்து... + + CredentialHelper + + + Caching the credentials in the RAM. Required to enter credentials on every startup + + + + + Storing the credentials unencrypted on disk, protected only by filesystem permissions <a href="https://git-scm.com/docs/git-credential-store">git-credential-store</a> + + + + + MacOS credential manager + + + + + Windows credential manager + + + + + Secret Service D-Bus client library + + + + + Prefer <a href="https://wiki.gnome.org/Projects/Libsecret">libsecret</a> over gnome-keyring if available + + + DateSelectionGroupWidget + Datetime source தேதி நேர சான்று + Current மின்னோட்ட்ம், ஓட்டம் + Manual கையேடு + Original அசல் @@ -836,26 +1072,32 @@ DefaultWidget + Clone repository நகலி களஞ்சியம் + Open existing repository ஏற்கனவே உள்ள களஞ்சியத்தைத் திறக்கவும் + Open Repository களஞ்சியத்தைத் திற + Initialize new repository புதிய களஞ்சியத்தை துவக்கவும் + Add %1 account % 1 கணக்கைச் சேர்க்கவும் + Contact us for support ஆதரவிற்கு எங்களைத் தொடர்பு கொள்ளவும் @@ -863,38 +1105,47 @@ DeleteBranchDialog + Are you sure you want to delete local branch '%1'? '% 1' உள்ளக கிளையை நிச்சயமாக நீக்க விரும்புகிறீர்களா? + Delete Branch? கிளையை நீக்கவா? + Also delete the upstream branch from its remote அதன் ரிமோட்டில் இருந்து மேலோடை கிளையையும் நீக்கவும் + Delete நீக்கு + delete '%1' from '%2' '%2' இலிருந்து '% 1' ஐ நீக்கு + Push தள்ளு + Push canceled. புச் ரத்து செய்யப்பட்டது. + Unable to push to %1 - %2 % 1 - %2 க்கு தள்ள முடியவில்லை + The branch is not fully merged. Deleting it may cause some commits to be lost. கிளை முழுமையாக இணைக்கப்படவில்லை. அதை நீக்குவது சில உறுதிகளை இழக்க நேரிடலாம். @@ -902,42 +1153,52 @@ DeleteTagDialog + Are you sure you want to delete tag '%1'? '%1' குறிச்சொல்லை நிச்சயமாக நீக்க விரும்புகிறீர்களா? + Delete Tag? குறியை நீக்கவா? + Also delete the upstream tag from %1 % 1 இலிருந்து மேலோடை குறிச்சொல்லையும் நீக்கவும் + Delete நீக்கு + delete '%1' from '%2' '%2' இலிருந்து '% 1' ஐ நீக்கு + Push தள்ளு + Push canceled. புச் ரத்து செய்யப்பட்டது. + Unable to push to %1 - %2 % 1 - %2 க்கு தள்ள முடியவில்லை + Delete Tag குறிச்சொல்லை நீக்கு + delete tag குறியை நீக்கு @@ -945,20 +1206,25 @@ DetailView + + Author: ஆசிரியர்: + reset மீட்டமை + Here you can set the author used for committing These settings will not be saved permanently இங்கே நீங்கள் செய்ய பயன்படுத்தப்படும் ஆசிரியர் அமைக்க முடியும் இந்த அமைப்புகள் நிரந்தரமாகச் சேமிக்கப்படாது + Email: மின்னஞ்சல்: @@ -966,46 +1232,57 @@ These settings will not be saved permanently DiffPanel + lines வரிகள் + System Locale சிச்டம் லோகேல் + Wrap lines மடக்கு கோடுகள் + Context lines: சூழல் வரிகள்: + Wrap lines: மடக்கு வரிகள்: + Character Encoding: எழுத்து குறியாக்கம்: + Ignore Whitespace (-w) வைட்ச்பேசைப் புறக்கணிக்கவும் (-w) + Added files சேர்க்கப்பட்ட கோப்புகள் + Deleted files நீக்கப்பட்ட கோப்புகள் + Whitespace: வெண்வெளி: + Auto Collapse: தானாகச் சரிவு: @@ -1013,13 +1290,20 @@ These settings will not be saved permanently DiffTool + External Diff வெளிப்புற வேறுபாடு + + + External Diff to Working Copy + + DiffTreeModel + Submodule துணைத் தொகுதி @@ -1027,10 +1311,12 @@ These settings will not be saved permanently DiffView + Add new file புதிய கோப்பைச் சேர்க்கவும் + Or drag files here to copy into the repository அல்லது களஞ்சியத்தில் நகலெடுக்க கோப்புகளை இங்கே இழுக்கவும் @@ -1038,18 +1324,22 @@ These settings will not be saved permanently DoubleTreeWidget + Blame பழி + Show Blame Editor பழி எடிட்டரைக் காட்டு + Diff வேறுபாடு + Show Diff View வித்தியாசமான காட்சியைக் காட்டு @@ -1057,18 +1347,22 @@ These settings will not be saved permanently DownloadDialog + Update %1 % 1ஐப் புதுப்பிக்கவும் + Downloading %1... % 1ஐ பதிவிறக்குகிறது... + Download Complete! பதிவிறக்கம் முடிந்தது! + Install and Restart நிறுவி மறுதொடக்கம் செய்யுங்கள் @@ -1076,14 +1370,17 @@ These settings will not be saved permanently EditButton + Edit Working Copy வேலை நகலை திருத்தவும் + Edit New Revision புதிய திருத்தத்தைத் திருத்தவும் + Edit Old Revision பழைய திருத்தம் @@ -1091,6 +1388,7 @@ These settings will not be saved permanently EditTool + Edit in External Editor வெளிப்புற எடிட்டரில் திருத்தவும் @@ -1098,46 +1396,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: பழி விளிம்பு: @@ -1145,10 +1454,12 @@ These settings will not be saved permanently EditorWindow + '%1' has been modified. Do you want to save your changes? '% 1' மாற்றப்பட்டது. உங்கள் மாற்றங்களைச் சேமிக்க விரும்புகிறீர்களா? + Save Changes? மாற்றங்களைச் சேமிக்கவா? @@ -1156,18 +1467,22 @@ These settings will not be saved permanently ExternalToolsDialog + Configure External Tools வெளிப்புற கருவிகளை உள்ளமைக்கவும் + Detected Tools கண்டறியப்பட்ட கருவிகள் + User Defined Tools பயனர் வரையறுக்கப்பட்ட கருவிகள் + Select Executable இயங்கக்கூடியதைத் தேர்ந்தெடுக்கவும் @@ -1175,14 +1490,17 @@ These settings will not be saved permanently ExternalToolsModel + Name பெயர் + Command கட்டளை + Arguments வாதங்கள் @@ -1190,194 +1508,247 @@ These settings will not be saved permanently FileContextMenu + Revision Not Found திருத்தம் காணப்படவில்லை + The selected file doesn't have a %1 revision. தேர்ந்தெடுக்கப்பட்ட கோப்பில் %1 திருத்தம் இல்லை. + + Bash Not Found பேச் கிடைக்கவில்லை + + Bash was not found on your PATH. உங்கள் பாதை இல் பாச் கிடைக்கவில்லை. + + Bash is required to execute external tools. வெளிப்புற கருவிகளை இயக்க பாச் தேவை. + Stage மேடை + Unstage மேடையற்றது + + Discard Changes மாற்றங்களை நிராகரிக்கவும் + Discard Changes? மாற்றங்களை நிராகரிக்கவா? + Are you sure you want to discard changes in the selected files? தேர்ந்தெடுக்கப்பட்ட கோப்புகளில் மாற்றங்களை நிராகரிக்க விரும்புகிறீர்களா? + This action cannot be undone. இந்தச் செயலைச் செயல்தவிர்க்க முடியாது. + (Submodule) (துணைத் தொகுதி) + %1 files % 1 கோப்புகள் + Discard நிராகரி + discard நிராகரிக்கவும் + Remove Untracked Files கண்காணிக்கப்படாத கோப்புகளை அகற்று + Ignore புறக்கணிக்கவும் + Checkout வெளியேறு + Unlock திறக்கவும் + Lock பூட்டு + Copy File Name கோப்பு பெயரை நகலெடுக்கவும் + Filter History வடிகட்டி வரலாறு + Navigate to செல்லவும் + Next Revision அடுத்த திருத்தம் + next அடுத்தது + Previous Revision முந்தைய திருத்தம் + previous முந்தைய + Unset Executable இயங்கக்கூடியது அமைக்கப்படாதது + Set Executable இயங்கக்கூடியதாக அமை + Save Selected Version as ... தேர்ந்தெடுக்கப்பட்ட பதிப்பை இவ்வாறு சேமி... + Select new file directory புதிய கோப்பு கோப்பகத்தைத் தேர்ந்தெடுக்கவும் + Saving files கோப்புகளைச் சேமிக்கிறது + Saving files of selected version to disk தேர்ந்தெடுக்கப்பட்ட பதிப்பின் கோப்புகளை வட்டில் சேமிக்கிறது + Save file கோப்பை சேமிக்கவும் + Invalid Blob தவறான ப்ளாப் + Open this version இந்த பதிப்பைத் திறக்கவும் + Opening file கோப்பை திறக்கிறது + Open திற + open file கோப்பை திற + Blob is invalid. ப்ளாப் செல்லாதது. + + Unable to checkout bare repositories வெற்று களஞ்சியங்களை செக் அவுட் செய்ய முடியவில்லை + Unable to open files from bare repository வெற்று களஞ்சியத்திலிருந்து கோப்புகளைத் திறக்க முடியவில்லை + The file is already in the current working directory கோப்பு ஏற்கனவே செயல்படும் கோப்பகத்தில் உள்ளது + edit தொகு + diff வேறுபாடு + merge ஒன்றிணைக்க + External Tool Not Found வெளிப்புறக் கருவி கிடைக்கவில்லை + Failed to execute external %1 tool. வெளிப்புற% 1 கருவியை இயக்குவதில் தோல்வி. @@ -1385,82 +1756,107 @@ These settings will not be saved permanently FileWidget + LFS LFS + + Unlock திறக்கவும் + + Lock பூட்டு + + Show Object பொருளைக் காட்டு + Edit File கோப்பைத் திருத்தவும் + Discard File கோப்பை நிராகரி + Directory அடைவு + File கோப்பு + Remove %1? % 1ஐ அகற்றவா? + Discard Changes? மாற்றங்களை நிராகரிக்கவா? + Are you sure you want to remove '%1'? '% 1' ஐ நிச்சயமாக நீக்க விரும்புகிறீர்களா? + Are you sure you want to discard all changes in '%1'? '% 1' இல் உள்ள அனைத்து மாற்றங்களையும் நிராகரிக்க விரும்புகிறீர்களா? + This action cannot be undone. இந்தச் செயலைச் செயல்தவிர்க்க முடியாது. + Remove %1 % 1ஐ அகற்று + Discard Changes மாற்றங்களை நிராகரிக்கவும் + Discard நிராகரி + discard நிராகரிக்கவும் + + Collapse File கோப்பைச் சுருக்கு + + Expand File கோப்பை விரிவாக்கு + Show Pointer சுட்டியைக் காட்டு @@ -1468,26 +1864,32 @@ These settings will not be saved permanently FindWidget + Search தேடல் + Done முடிந்தது + Esc தப்பி + Not found காணப்படவில்லை + %1 match % 1 பொருத்தம் + %1 matches % 1 பொருத்தங்கள் @@ -1495,73 +1897,124 @@ These settings will not be saved permanently GeneralPanel + + Fetch every ஒவ்வொன்றையும் பெறவும் + + minutes நிமிடங்கள் + + Push after each commit ஒவ்வொரு உறுதிப்பாட்டிற்கும் பிறகு தள்ளுங்கள் + + Prune when fetching எடுக்கும்போது கத்தரிக்கவும் + No translation மொழிபெயர்ப்பு இல்லை + Store credentials in secure storage நற்சான்றிதழ்களை பாதுகாப்பான சேமிப்பகத்தில் சேமிக்கவும் + + Update submodules after pull and clone இழுத்து நகலி செய்த பிறகு துணைமாட்யூல்களைப் புதுப்பிக்கவும் + <a href='view'>View privacy policy</a> <a href='view'>தனியுரிமைக் கொள்கையைப் பார்க்கவும்</a> + + User name: பயனர் பெயர்: + + User email: பயனர் மின்னஞ்சல்: + + Automatic actions: தானியங்கி செயல்கள்: + + Language: மொழி: + Credentials: சான்றுகள்: + Credential store type: நற்சான்றிதழ் கடை வகை: + + Available Credential stores: + + + + Only allow a single running instance ஒரு இயங்கும் நிகழ்வை மட்டும் அனுமதிக்கவும் + Single instance: ஒற்றை உதாரணம்: + + + No credential store set + + + + + No credential store is set. Go to the application settings to set the desired credential store + + + + + + + + + + Available Credential stores + + GitLab + Authentication failed ஏற்பு தோல்வியடைந்தது @@ -1569,6 +2022,7 @@ These settings will not be saved permanently Header + Filter %1 வடிகட்டி% 1 @@ -1576,6 +2030,7 @@ These settings will not be saved permanently HostModel + Connecting இணைக்கிறது @@ -1583,10 +2038,12 @@ These settings will not be saved permanently HotkeyModel + Action செயல் + Keys விசைகள் @@ -1594,70 +2051,93 @@ These settings will not be saved permanently HunkWidget + + Save சேமி + + Undo செயல்தவிர் + + Use Ours எங்களுடையதைப் பயன்படுத்தவும் + + Use Theirs அவற்றைப் பயன்படுத்தவும் + Edit Hunk Hunk ஐ திருத்து + Discard Hunk அங்க் நிராகரி + Discard selected lines? தேர்ந்தெடுத்த வரிகளை நிராகரிக்கவா? + Are you sure you want to discard the changes in hunk from line %1 to %2 in '%3'? '%3' இல் உள்ள வரி %1 இலிருந்து %2 வரையிலான hunkல் மாற்றங்களை நிச்சயமாக நிராகரிக்க விரும்புகிறீர்களா? + Discard selected lines தேர்ந்தெடுக்கப்பட்ட வரிகளை நிராகரிக்கவும் + Are you sure you want to remove '%1'? '% 1' ஐ நிச்சயமாக நீக்க விரும்புகிறீர்களா? + This action cannot be undone. இந்தச் செயலைச் செயல்தவிர்க்க முடியாது. + + Collapse Hunk சுருக்கு அங்க் + + Expand Hunk அங்கை விரிவாக்கு + Esc தப்பி + Fix சரி + Edit தொகு + No newline at end of file கோப்பின் முடிவில் புதிய வரி இல்லை @@ -1665,6 +2145,7 @@ These settings will not be saved permanently IgnoreDialog + Ignore Pattern பேட்டர்னைப் புறக்கணிக்கவும் @@ -1672,6 +2153,7 @@ These settings will not be saved permanently Images + <b>Size:</b> %1 <b>அளவு:</b> %1 @@ -1679,14 +2161,17 @@ These settings will not be saved permanently InfoBox + Name: பெயர்: + Email: மின்னஞ்சல்: + Commit date: ஒப்பந்த தேதி: @@ -1694,12 +2179,14 @@ These settings will not be saved permanently KeybindDialog + The selected key is the same for the following actions: %1 தேர்ந்தெடுக்கப்பட்ட விசை பின்வரும் செயல்களுக்கு ஒரே மாதிரியாக இருக்கும்: % 1 + Please press the desired hotkey விரும்பிய ஆட்ச்கியை அழுத்தவும் @@ -1707,10 +2194,12 @@ These settings will not be saved permanently LfsPanel + Initialize LFS LFS ஐ துவக்கவும் + Specify a glob pattern for tracking large files. Generally, large files are greater than 500kB, change frequently, @@ -1735,74 +2224,92 @@ Examples + Pattern: முறை: + Track மின்தடம் + days நாட்கள் + Fetch LFS objects from all references for the past கடந்த காலத்திற்கான அனைத்து குறிப்புகளிலிருந்தும் LFS பொருட்களைப் பெறவும் + reference days or குறிப்பு நாட்கள் அல்லது + commit days நாட்கள் உறுதி + View Environment சூழலைப் பார்க்கவும் + git-lfs env (read only) git-lfs env (படிக்க மட்டும்) + Deinitialize LFS LFS ஐ டீனிசியலைச் செய்யவும் + Deinitialize LFS? LFS ஐ நீக்கவா? + Are you sure you want uninstall LFS from this repository? இந்த களஞ்சியத்தில் இருந்து LFS ஐ நிச்சயமாக நீக்க வேண்டுமா? + Deinitialize டீனிசியலைச் + Server URL: சேவையக URL: + Prune Offset: ப்ரூன் ஆஃப்செட்: + Fetch Recent: அண்மைக் கால பெற: + Advanced: மேம்பட்ட: + Included patterns: உள்ளடக்கிய வடிவங்கள்: + Excluded patterns: விலக்கப்பட்ட வடிவங்கள்: @@ -1810,14 +2317,17 @@ Examples Location + %1 | %2 % 1 | % 2 + NC NC + Not Committed உறுதி இல்லை @@ -1825,46 +2335,57 @@ Examples LocationPage + Repository Location களஞ்சிய இடம் + Choose the name and location of the new repository. A new directory will be created if it doesn't already exist. புதிய களஞ்சியத்தின் பெயரையும் இடத்தையும் தேர்வு செய்யவும். அது ஏற்கனவே இல்லை என்றால் புதிய அடைவு உருவாக்கப்படும். + Initialize துவக்கவும் + Clone நகலி + ... ... + Choose Directory கோப்பகத்தைத் தேர்ந்தெடுக்கவும் + Name: பெயர்: + Directory: அடைவு: + Advanced: மேம்பட்ட: + Create a bare repository ஒரு வெற்று களஞ்சியத்தை உருவாக்கவும் + The new repository will be created at:<p style='text-indent: 12px'><b>%1</b></p> புதிய களஞ்சியம் இங்கு உருவாக்கப்படும்:<p style='text-indent: 12px'><b>%1</b></p> @@ -1872,6 +2393,7 @@ Examples LogView + Copy நகலெடு @@ -1879,46 +2401,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 மறுசீரமைப்பு @@ -1926,382 +2461,479 @@ Examples MenuBar + File கோப்பு + New File புதிய கோப்பு + New Window புதிய சாளரம் + Clone Repository... நகலி களஞ்சியம்... + Initialize New Repository... புதிய களஞ்சியத்தை துவக்கவும்... + Open Repository... களஞ்சியத்தைத் திற... + Open Repository களஞ்சியத்தைத் திற + Open Recent அண்மைக் கால திற + Close மூடு + Save சேமி + Exit வெளியேறு + Edit தொகு + Undo செயல்தவிர் + Redo மீண்டும்செய் + Cut வெட்டு + Copy நகலெடு + Paste ஒட்டு + Select All அனைத்தையும் தெரிவுசெய் + Find... கண்டுபிடி... + Find Next அடுத்ததை தேடு + Find Previous முந்தையதைக் கண்டறியவும் + Use Selection for Find தேடலைப் பயன்படுத்தவும் + Show Double Tree View இரட்டை மரக் காட்சியைக் காட்டு + View பார்வை + Refresh புதுப்பிப்பு + + Show Log பதிவைக் காட்டு + Normal இயல்பானது + Maximize அதிகப்படுத்து + + Show Tree View மரக் காட்சியைக் காட்டு + Hide Menu Bar பட்டியல் பட்டியை மறை + Repository களஞ்சியம் + Configure Repository... களஞ்சியத்தை உள்ளமைக்கவும்... + Stage All அனைத்து நிலை + Unstage All அன்ச்டேச் ஆல் + Commit உறுதி + Amend Commit கமிட்டினை திருத்தவும் + Git LFS Git LFS + Remove all locks அனைத்து பூட்டுகளையும் அகற்று + Initialize துவக்கவும் + Remote ரிமோட் + Configure Remotes... ரிமோட்களை உள்ளமைக்கவும்... + Fetch எடுக்கவும் + Fetch All அனைத்தையும் பெறவும் + Fetch From... இதிலிருந்து பெறவும்... + Pull இழு + Pull From... இருந்து இழு... + Push தள்ளு + Push To... தள்ளு... + Branch கிளை + Configure Branches... கிளைகளை உள்ளமைக்கவும்... + New Branch... புதிய கிளை... + Rename Branch கிளையின் பெயரை மாற்றவும் + Checkout Current செக்அவுட் கரண்ட் + Checkout... வெளியேறு... + Merge... ஒன்றிணை... + Rebase... நரி... + Squash... ச்குவாச்... + Abort Merge ஒன்றிணைப்பதை நிறுத்து + Submodule துணைத் தொகுதி + Configure Submodules... துணை தொகுதிகளை உள்ளமைக்கவும்... + Update All அனைத்தையும் புதுப்பிக்கவும் + Update... புதுப்பி... + Open திற + Stash ச்டாச் + Show Stashes ச்டாச்களைக் காட்டு + Stash... ச்டாச்... + Pop Stash பாப் ச்டாச் + History வரலாறு + Back பின் + Forward முன்னோக்கி + Window சாளரம் + Show Previous Tab முந்தைய தாவலைக் காட்டு + Show Next Tab அடுத்த தாவலைக் காட்டு + Show Repository Chooser... களஞ்சியத் தேர்வியைக் காட்டு... + Tools கருவிகள் + Options... விருப்பங்கள்... + Help உதவி + About %1 சுமார் % 1 + Check For Updates... புதுப்பிப்புகளைச் சரிபார்க்கவும்... + Plugin Documentation... செருகுநிரல் ஆவணம்... + Support us via Liberapay Liberapay மூலம் எங்களுக்கு ஆதரவளிக்கவும் + Debug பிழைத்திருத்தம் + Abort கைவிடு + Log Indexer Progress பதிவு அட்டவணை முன்னேற்றம் + Log Credential Helper பதிவு நற்சான்றிதழ் உதவியாளர் + Log Remote Connection ரிமோட் இணைப்பை பதிவு செய்யவும் + Log Debug Messages பிழைத்திருத்த செய்திகளை பதிவு செய்யவும் + Load All Diffs அனைத்து வேறுபாடுகளையும் ஏற்றவும் + Walk Commits வாக் கமிட்கள் + Hide Log பதிவை மறை + Merge ஒன்றிணைக்கவும் + Revert திரும்பவும் + Cherry-pick செர்ரி-எடு + Rebase ஒரு நரி + Abort %1 கைவிடு% 1 @@ -2309,46 +2941,60 @@ Examples MergeDialog + + Merge ஒன்றிணைக்கவும் + + Rebase ஒரு நரி + + Squash ச்குவாச் + Merge (No Fast-forward) மெர்ச் (ஃபாச்ட்-ஃபார்வர்டு இல்லை) + Merge (Fast-forward Only) ஒன்றிணைக்கவும் (வேகமாக முன்னோக்கி மட்டும்) + No commit உறுதி இல்லை + Reference: குறிப்பு: + Action: செயல்: + Choose a reference to merge into '%1'. '% 1' இல் ஒன்றிணைக்க ஒரு குறிப்பைத் தேர்ந்தெடுக்கவும். + Choose a reference to rebase '%1' on. '% 1' ஐ மறுதளம் செய்ய ஒரு குறிப்பைத் தேர்ந்தெடுக்கவும். + Choose a reference to squash into '%1'. '% 1' இல் ச்குவாச் செய்ய ஒரு குறிப்பைத் தேர்ந்தெடுக்கவும். @@ -2356,6 +3002,7 @@ Examples MergeTool + External Merge வெளிப்புற இணைப்பு @@ -2363,10 +3010,12 @@ Examples MiscPanel + Path to SSH config file: பாஓடு கட்டமைப்பு கோப்பிற்கான பாதை: + Path to default / fallback SSH key file: இயல்புநிலை / பின்னடைவு பாஓடு விசை கோப்பிற்கான பாதை: @@ -2374,26 +3023,32 @@ Examples NewBranchDialog + Checkout branch செக்அவுட் கிளை + Name: பெயர்: + Start Point: தொடக்க புள்ளி: + Advanced: மேம்பட்ட: + Upstream: அப்ச்ட்ரீம்: + Create Branch கிளையை உருவாக்கவும் @@ -2401,6 +3056,7 @@ Examples PathspecWidget + Filter by Path பாதையின்படி வடிகட்டவும் @@ -2408,34 +3064,42 @@ Examples PluginsPanel + Name பெயர் + Kind வகையான + Description விவரம் + Options விருப்பங்கள் + %1 Options % 1 விருப்பங்கள் + Note குறிப்பு + Warning எச்சரிக்கை + Error பிழை @@ -2443,6 +3107,7 @@ Examples Popup + Show Advanced Search மேம்பட்ட தேடலைக் காட்டு @@ -2450,10 +3115,12 @@ Examples PreviewWidget + Added சேர்க்கப்பட்டது + Modified மாற்றியமைக்கப்பட்ட @@ -2461,6 +3128,7 @@ Examples PullRequestButton + Create Pull Request இழுக்கும் கோரிக்கையை உருவாக்கவும் @@ -2468,38 +3136,47 @@ Examples PullRequestDialog + Create Pull Request இழுக்கும் கோரிக்கையை உருவாக்கவும் + Title தலைப்பு + Body உடல் + Maintainer can modify பராமரிப்பாளர் மாற்றலாம் + From: இருந்து: + owner/repository உரிமையாளர் / களஞ்சியம் + branch கிளை + To: இதற்கு: + Create உருவாக்கு @@ -2507,42 +3184,52 @@ Examples QObject + Expand all அனைத்தையும் விரிவாக்கு + Collapse all அனைத்தையும் சுருக்கவும் + Staged Files படிநிலை கோப்புகள் + Unstaged Files நிலைப்படுத்தப்படாத கோப்புகள் + Committed Files உறுதியளிக்கப்பட்ட கோப்புகள் + Workdir Files பணிபுரியும் கோப்புகள் + Your global GIT configuration is invalid, Gittyup won't run properly until this is fixed உங்கள் உலகளாவிய GIT உள்ளமைவு தவறானது, இது சரிசெய்யப்படும் வரை Gittyup சரியாக இயங்காது + File Name கோப்பு பெயர் + Relative Path உறவினர் பாதை + State மாநிலம் @@ -2550,18 +3237,22 @@ Examples RebaseConflictDialog + Rebase conflict மறுபரிசீலனை மோதல் + Abort rebase மறுதளத்தை நிறுத்து + Continue தொடரவும் + The rebase caused a merge conflict. Would you like to fix the merge conflict and continue? மறுசீரமைப்பு ஒரு இணைப்பு மோதலை ஏற்படுத்தியது. @@ -2571,6 +3262,7 @@ Would you like to fix the merge conflict and continue? Reference + HEAD detached at %1 HEAD % 1 இல் பிரிக்கப்பட்டது @@ -2578,6 +3270,7 @@ Would you like to fix the merge conflict and continue? ReferenceList + Commit உறுதி @@ -2585,14 +3278,17 @@ Would you like to fix the merge conflict and continue? ReferenceModel + Branches கிளைகள் + Remotes ரிமோட்டுகள் + Tags குறிச்சொற்கள் @@ -2600,46 +3296,57 @@ Would you like to fix the merge conflict and continue? ReferenceView + Branch கிளை + Remote ரிமோட் + Tag குறியிடவும் + Checkout வெளியேறு + Rename மறுபெயரிடவும் + Delete நீக்கு + Push Tag to %1 குறிச்சொல் % 1க்கு தள்ளவும் + New Local Branch புதிய உள்ளக கிளை + Merge... ஒன்றிணை... + Rebase... நரி... + Squash... ச்குவாச்... @@ -2647,6 +3354,7 @@ Would you like to fix the merge conflict and continue? RefreshButton + Refresh புதுப்பிப்பு @@ -2654,6 +3362,7 @@ Would you like to fix the merge conflict and continue? RemoteButton + 999+ 999+ @@ -2661,46 +3370,59 @@ Would you like to fix the merge conflict and continue? RemoteCallbacks + remote: %1 ரிமோட்:% 1 + failed to execute pre-push hook: bash not found ப்ரீ-புச் ஊக்கை இயக்க முடியவில்லை: பாச் கிடைக்கவில்லை + failed to execute pre-push hook: %1 ப்ரீ-புச் ஊக்கை இயக்க முடியவில்லை:% 1 + HTTPS Credentials HTTPS நற்சான்றிதழ்கள் + SSH Passphrase பாஓடு கடவுச்சொற்றொடர் + Username: பயனர்பெயர்: + Password: கடவுச்சொல்: + Passphrase: கடவுச்சொற்றொடர்: + + authentication canceled ஏற்பு ரத்து செய்யப்பட்டது + From %1 % 1 இலிருந்து + + To %1 % 1க்கு @@ -2708,70 +3430,87 @@ Would you like to fix the merge conflict and continue? RemoteDialog + Push all tags அனைத்து குறிச்சொற்களையும் அழுத்தவும் + Update existing tags ஏற்கனவே உள்ள குறிச்சொற்களைப் புதுப்பிக்கவும் + Merge ஒன்றிணைக்கவும் + Rebase ஒரு நரி + Merge (No Fast-forward) மெர்ச் (ஃபாச்ட்-ஃபார்வர்டு இல்லை) + Merge (Fast-forward Only) ஒன்றிணைக்கவும் (வேகமாக முன்னோக்கி மட்டும்) + Set upstream மேலோடை அமைக்கவும் + Force படை + Remote Reference: தொலை குறிப்பு: + Prune references ப்ரூன் குறிப்புகள் + Fetch எடுக்கவும் + Pull இழு + Push தள்ளு + Remote: ரிமோட்: + Reference: குறிப்பு: + Action: செயல்: + Advanced: மேம்பட்ட: @@ -2779,34 +3518,42 @@ Would you like to fix the merge conflict and continue? RemotePage + Remote Repository URL தொலை களஞ்சிய முகவரி + Choose protocol to authenticate with the remote. ரிமோட் மூலம் அங்கீகரிக்க நெறிமுறையைத் தேர்ந்தெடுக்கவும். + Enter the URL of the remote repository or browse for a local directory தொலை களஞ்சியத்தின் முகவரி ஐ உள்ளிடவும் அல்லது உள்ளக கோப்பகத்திற்காக உலாவவும் + ... ... + Choose Directory கோப்பகத்தைத் தேர்ந்தெடுக்கவும் + Examples of valid URLs include:<table cellspacing='8'><tr><td align='right'><b>HTTPS</b></td><td>https://hostname/path/to/repo.git</td></tr><tr><td align='right'><b>SSH</b></td><td>git@hostname:path/to/repo.git</td></tr><tr><td align='right'><b>Git</b></td><td>git://hostname/path/to/repo.git</td></tr><tr><td align='right'><b>Local</b></td><td>/path/to/repo, C:\path\to\repo</td></tr></table> சரியான முகவரி களின் எடுத்துக்காட்டுகள்:<table cellpacing='8'><tr><td align='right'><b>HTTPS</b></td><td>https://hostname/path/to/repo.git</td></tr><tr><td align='right'><b>SSH</b></td><td>git@hostname:path/to/repo.git</td></tr><tr><td align='right'><b>Git</b></td><td>git://hostname/path/to/repo.git</tr></td> align='right'><b>உள்ளூர்</b></td><td>/path/to/repo, C:\path\to\repo</td></tr></table> + Protocol: நெறிமுறை: + URL: URL: @@ -2814,10 +3561,12 @@ Would you like to fix the merge conflict and continue? RemoteTableModel + Name பெயர் + URL முகவரி @@ -2825,14 +3574,17 @@ Would you like to fix the merge conflict and continue? RemotesPanel + Delete Remote? ரிமோட்டை நீக்கவா? + Are you sure you want to delete '%1'? '% 1' ஐ நிச்சயமாக நீக்க வேண்டுமா? + Delete நீக்கு @@ -2840,10 +3592,12 @@ Would you like to fix the merge conflict and continue? RenameBranchDialog + Name: பெயர்: + Rename Branch கிளையின் பெயரை மாற்றவும் @@ -2851,34 +3605,43 @@ Would you like to fix the merge conflict and continue? RepoModel + Connecting இணைக்கிறது + open திற + recent அண்மைக் கால + remote தொலைவில் + + none எதுவுமில்லை + Clone Repository நகலி களஞ்சியம் + Open Existing Repository ஏற்கனவே உள்ள களஞ்சியத்தைத் திறக்கவும் + Initialize New Repository புதிய களஞ்சியத்தை துவக்கவும் @@ -2886,110 +3649,138 @@ Would you like to fix the merge conflict and continue? RepoView + Indexing... அட்டவணைப்படுத்துதல்... + Search தேடல் + Indexer Crashed குறியீட்டு செயலிழந்தது + Stage Directory? மேடை அடைவு? + Are you sure you want to stage '%1'? நீங்கள் நிச்சயமாக '% 1' அரங்கேற்ற விரும்புகிறீர்களா? + This will result in the addition of %1 files. இது % 1 கோப்புகளை சேர்க்கும். + more than 100 100க்கு மேல் + Stage Directory மேடை அடைவு + Stop prompting to stage directories மேடை கோப்பகங்களுக்குத் தூண்டுவதை நிறுத்து + Stage Large File? ச்டேச் பெரிய கோப்பாகவா? + Are you sure you want to stage '%1' with a size of %2? %2 அளவுடன் '%1' ஐ நிலைநிறுத்த விரும்புகிறீர்களா? + Stage மேடை + Track with LFS LFS உடன் கண்காணிக்கவும் + This repository has LFS enabled. Do you want to track the file with LFS instead? இந்த களஞ்சியத்தில் LFS இயக்கப்பட்டுள்ளது. அதற்குப் பதிலாக LFS மூலம் கோப்பைக் கண்காணிக்க விரும்புகிறீர்களா? + Stop prompting to stage large files பெரிய கோப்புகளை ச்டேச் செய்ய தூண்டுவதை நிறுத்துங்கள் + Esc தப்பி + stage மேடை + Git LFS was not found on the PATH. <a href='https://git-lfs.github.com'>Install Git LFS</a> to use LFS integration. பாதை இல் Git LFS காணப்படவில்லை. LFS ஒருங்கிணைப்பைப் பயன்படுத்த <a href='https://git-lfs.github.com'>Git LFS ஐ நிறுவவும்</a>. + untracked file கண்காணிக்கப்படாத கோப்பு + untracked files கண்காணிக்கப்படாத கோப்புகள் + Remove Untracked Files கண்காணிக்கப்படாத கோப்புகளை அகற்று + Remove %1 %2? % 1% 2ஐ அகற்றவா? + This action cannot be undone. இந்தச் செயலைச் செயல்தவிர்க்க முடியாது. + Remove அகற்று + + Certificate Error சான்றிதழ் பிழை + SSL verification disabled for this repository இந்த களஞ்சியத்திற்கான SSL சரிபார்ப்பு முடக்கப்பட்டுள்ளது + [http] sslVerify = false @@ -3000,10 +3791,12 @@ sslVerify = பொய் % 1/config இல் சேர்க்கப்பட்டது + SSL verification disabled for all git repositories அனைத்து git களஞ்சியங்களுக்கும் SSL சரிபார்ப்பு முடக்கப்பட்டுள்ளது + [http] sslVerify = false @@ -3014,238 +3807,330 @@ sslVerify = பொய் % 1 இல் சேர்க்கப்பட்டது + Pull Request இழு கோரிக்கை + Create உருவாக்கு + create pull request இழுக்கும் கோரிக்கையை உருவாக்கவும் + + + Git LFS Git LFS + Initialize துவக்கவும் + initialize துவக்க + Git LFS initialized. Git LFS துவக்கப்பட்டது. + Deinitialize டீனிசியலைச் + deinitialize deinitialize + Git LFS Deinitialized. Git LFS நீக்கப்பட்டது. + Lock பூட்டு + Unlock திறக்கவும் + + 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'. எடுக்க முடியவில்லை. தற்போதைய கிளைக்கு மேலோடை எதுவும் உள்ளமைக்கப்படவில்லை, மேலும் 'ஆரிசின்' எனப்படும் ரிமோட் இல்லை. + + 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>. நீங்கள் ssl சரிபார்ப்பை <a href='action:sslverifyrepo'>இந்த களஞ்சியத்திற்கு</a> முடக்கலாம் அல்லது ஒட்டுமொத்தமாக ssl சரிபார்ப்பை <a href='action:sslverifygit'>அனைத்து களஞ்சியங்களுக்கும்</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'>stashing</a> மூலம் முரண்பட்ட கோப்புகளுடன் உங்கள் மாற்றங்களைச் சரிசெய்யலாம். உங்கள் மாற்றங்களை மீட்டெடுக்க <a href='action:unstash'>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'>stashing</a> மூலம் நீங்கள் மறுதளம் செய்யலாம். உங்கள் மாற்றங்களை மீட்டெடுக்க <a href='action:unstash'>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'>rebase'>rebase</a> முயற்சிக்கும் முன், <a href='action:stash'>stashing</a> மூலம் நீங்கள் மறுதளம் செய்யலாம். உங்கள் மாற்றங்களை மீட்டெடுக்க <a href='action:unstash'>unstash</a>. + + %1/%2 % 1/%2 + %1 - %2 % 1 - % 2 + Apply இடு + %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. @@ -3254,390 +4139,503 @@ This reverts commit %2. இது கமிட்% 2ஐ மாற்றுகிறது. + <i>detached HEAD</i> <i>பிரிக்கப்பட்ட தலை</i> + %1 on %2 % 2 இல் % 1 + 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> <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>. பின்னர், 'origin/%1' எனப்படும் தொலைநிலைக் கிளையைக் கண்காணிப்பதைத் தொடங்க, <a href='action:push?set-upstream=true'>புச் மற்றும் தற்போதைய கிளையின் அப்ச்ட்ரீமை அமைக்கவும்</a>. + 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'>வெளிப்படையான முகவரி க்கு தள்ளலாம்</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'>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> <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? செக் அவுட் டிட்டாச்ட் எட்? + Checkout Detached HEAD 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' ஐப் பார்ப்பது ஒரு பிரிக்கப்பட்ட 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'>stashing</a> மூலம் முரண்பட்ட கோப்புகளுடன் உங்கள் மாற்றங்களைச் சரிசெய்யலாம். உங்கள் மாற்றங்களை மீட்டெடுக்க <a href='action:unstash'>unstash</a>. + New Branch புதிய கிளை + create new branch புதிய கிளையை உருவாக்குங்கள் + (no branch) (கிளை இல்லை) + WIP on %1: %2 %3 % 1 இல் WIP:% 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 % 2 ஆக % 1 + Tag குறிச்சொல் + tag குறிச்சொல் + + Amend திருத்தவும் + Amending commit %1 % 1ஐ திருத்துதல் + %1 to %2 - % 1 முதல்% 2 வரை + update ref + % 1 முதல்% 2 வரை + + + + + + Reset மீட்டமை + 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 % 2 துணை தொகுதிகளில் % 1 + + Update புதுப்பிப்பு + + update submodule துணைத் தொகுதியைப் புதுப்பிக்கவும் + The indexer worker process crashed. If this problem persists please contact us at <TODO: replace.support@gitahead.com>. குறியீட்டு பணியாளர் செயல்முறை செயலிழந்தது. இந்தப் சிக்கல் தொடர்ந்தால், <TODO: replace.support@gitahead.com> இல் எங்களைத் தொடர்பு கொள்ளவும். + Please resolve conflicts before continue தொடர்வதற்கு முன் முரண்பாடுகளைத் தீர்க்கவும் + Conflict மோதல் + Rebase finished மறுசீரமைப்பு முடிந்தது + Force Push to %1? % 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. <a href='action:pull'>இழுத்தல்</a> மூலம் முதலில் ரிமோட் கமிட்களை ஒருங்கிணைக்க விரும்பலாம். பிறகு மீண்டும் <a href='action:push?to=%1'>தள்ளு</a>. + 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>. ரிமோட் கமிட்களை இழக்க வேண்டும் என நீங்கள் விரும்பினால், நீங்கள் <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'>abort'>தடுக்கலாம்</a>. @@ -3645,10 +4643,12 @@ This reverts commit %2. Repository + Unknown error அறியப்படாத பிழை + git-lfs not found git-lfs கிடைக்கவில்லை @@ -3656,6 +4656,7 @@ This reverts commit %2. SearchField + Search தேடல் @@ -3663,26 +4664,32 @@ This reverts commit %2. SearchPanel + Enable indexing அட்டவணைப்படுத்தலை இயக்கு + terms விதிமுறைகள் + lines வரிகள் + Limit commits to: வரம்பு இதற்கு உறுதியளிக்கிறது: + Diff context: மாறுபட்ட சூழல்: + Remove Index குறியீட்டை அகற்று @@ -3690,26 +4697,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 பெரிய கோப்புகளை ச்டேச் செய்யும்படி கேட்கவும் @@ -3717,54 +4730,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 முனையத்தில் @@ -3772,18 +4798,22 @@ This reverts commit %2. ShowTool + Finder கண்டுபிடிப்பான் + Explorer எக்ச்ப்ளோரர் + Default File Browser இயல்புநிலை கோப்பு உலாவி + Show in %1 % 1 இல் காட்டு @@ -3791,70 +4821,89 @@ This reverts commit %2. SideBar + Close மூடு + + + Remove அகற்று + Authorize அங்கீகரிக்கவும் + Clone Repository நகலி களஞ்சியம் + Open Existing Repository ஏற்கனவே உள்ள களஞ்சியத்தைத் திறக்கவும் + Open Repository களஞ்சியத்தைத் திற + Initialize New Repository புதிய களஞ்சியத்தை துவக்கவும் + Add %1 Account % 1 கணக்கைச் சேர்க்கவும் + <p>Are you sure you want to remove the remote repository association for %1?</p><p>The local clone itself will not be affected.</p> <p>%1க்கான ரிமோட் ரெபோசிட்டரி சங்கத்தை நிச்சயமாக அகற்ற விரும்புகிறீர்களா?</p><p>உள்ளூர் நகலி பாதிக்கப்படாது.</p> + Remove Repository Association? களஞ்சிய சங்கத்தை அகற்றவா? + Clear All Recent அண்மைக் கால அனைத்தையும் அழி + Show Full Path முழு பாதையைக் காட்டு + Filter Non-existent Paths இல்லாத பாதைகளை வடிகட்டவும் + Refresh Remote Accounts தொலைநிலைக் கணக்குகளைப் புதுப்பிக்கவும் + Show Full Name முழுப் பெயரைக் காட்டு + <p>Are you sure you want to remove the %1 account for '%2'?</p><p>Only the account association will be removed. Remote configurations and local clones will not be affected.</p> <p>'%2'க்கான %1 கணக்கை நிச்சயமாக அகற்ற விரும்புகிறீர்களா?</p><p>கணக்கு இணைப்பு மட்டும் அகற்றப்படும். தொலைநிலை உள்ளமைவுகள் மற்றும் உள்ளக குளோன்கள் பாதிக்கப்படாது.</p> + Remove Account? கணக்கை அகற்றவா? @@ -3862,86 +4911,108 @@ This reverts commit %2. StartDialog + Choose Repository களஞ்சியத்தைத் தேர்ந்தெடுக்கவும் + Understand your history! உங்கள் வரலாற்றைப் புரிந்து கொள்ளுங்கள்! + Clone Repository நகலி களஞ்சியம் + Open Existing Repository ஏற்கனவே உள்ள களஞ்சியத்தைத் திறக்கவும் + Open Repository களஞ்சியத்தைத் திற + Initialize New Repository புதிய களஞ்சியத்தை துவக்கவும் + Clear All அனைத்தையும் அழி + Show Full Path முழு பாதையைக் காட்டு + Filter Non-existent Paths இல்லாத பாதைகளை வடிகட்டவும் + Repositories: களஞ்சியங்கள்: + Refresh புதுப்பிப்பு + Show Full Name முழுப் பெயரைக் காட்டு + Remote: ரிமோட்: + View Getting Started Video தொடங்குதல் வீடியோவைப் பார்க்கவும் + Clone நகலி + Open திற + <p>Are you sure you want to remove the %1 account for '%2'?</p><p>Only the account association will be removed. Remote configurations and local clones will not be affected.</p> <p>'%2'க்கான %1 கணக்கை நிச்சயமாக அகற்ற விரும்புகிறீர்களா?</p><p>கணக்கு இணைப்பு மட்டும் அகற்றப்படும். தொலைநிலை உள்ளமைவுகள் மற்றும் உள்ளக குளோன்கள் பாதிக்கப்படாது.</p> + Remove Account? கணக்கை அகற்றவா? + + Remove அகற்று + <p>Are you sure you want to remove the remote repository association for %1?</p><p>The local clone itself will not be affected.</p> <p>%1க்கான ரிமோட் ரெபோசிட்டரி சங்கத்தை நிச்சயமாக அகற்ற விரும்புகிறீர்களா?</p><p>உள்ளூர் நகலி பாதிக்கப்படாது.</p> + Remove Repository Association? களஞ்சிய சங்கத்தை அகற்றவா? @@ -3949,34 +5020,42 @@ This reverts commit %2. SubmoduleTableModel + Name பெயர் + URL முகவரி + Branch கிளை + Initialized துவக்கப்பட்டது + Deinitializing '%1' will remove its working directory. Are you sure you want to deinitialize? '% 1' ஐ டீனிசியல் செய்வது அதன் வேலை கோப்பகத்தை அகற்றும். நீங்கள் நிச்சயமாக deinitialize செய்ய விரும்புகிறீர்களா? + Deinitialize Submodule? துணைத் தொகுதியை நீக்கவா? + The submodule working directory contains uncommitted changes that will be lost if you continue. துணைத் தொகுதி செயல்படும் கோப்பகத்தில் உறுதியற்ற மாற்றங்கள் உள்ளன, நீங்கள் தொடர்ந்தால் அவை இழக்கப்படும். + Deinitialize டீனிசியலைச் @@ -3984,26 +5063,33 @@ This reverts commit %2. TagDialog + + Create Tag குறிச்சொல்லை உருவாக்கவும் + Add a new tag at %1 % 1 இல் புதிய குறிச்சொல்லைச் சேர்க்கவும் + Force (replace existing tag) கட்டாயப்படுத்து (ஏற்கனவே உள்ள குறிச்சொல்லை மாற்றவும்) + Push to %1 % 1 க்கு தள்ளவும் + Annotated சிறுகுறிப்பு + Name பெயர் @@ -4011,64 +5097,81 @@ This reverts commit %2. TemplateDialog + Name பெயர் + Content உள்ளடக்கம் + + Add கூட்டு + use %1 to declare the position of the cursor. கர்சரின் நிலையை அறிவிக்க % 1 ஐப் பயன்படுத்தவும். + use ${files:x} to add all updated file names, x (number) determines the number of maximum files shown புதுப்பிக்கப்பட்ட அனைத்து கோப்பு பெயர்களையும் சேர்க்க ${files:x} ஐப் பயன்படுத்தவும், x (எண்) காட்டப்படும் அதிகபட்ச கோப்புகளின் எண்ணிக்கையை தீர்மானிக்கிறது + Remove அகற்று + First template will be applied automatically முதல் டெம்ப்ளேட் தானாகவே பயன்படுத்தப்படும் + Up மேலே + Down கீழே + Import இறக்குமதி + Export ஏற்றுமதி + Open File கோப்பை திற + + Gittyup Templates (*%1) Gittyup வார்ப்புருக்கள் (*% 1) + Save Templates டெம்ப்ளேட்களைச் சேமிக்கவும் + Replace மாற்றவும் @@ -4076,18 +5179,23 @@ x (எண்) காட்டப்படும் அதிகபட்ச க TerminalPanel + + Install நிறுவவும் + Name: பெயர்: + Location: இடம்: + Uninstall நிறுவல் நீக்கவும் @@ -4095,26 +5203,32 @@ x (எண்) காட்டப்படும் அதிகபட்ச க TextEdit + Replace... மாற்று... + Replace All... அனைத்தையும் மாற்றவும்... + Ignore புறக்கணிக்கவும் + Ignore All அனைத்தையும் புறக்கணிக்கவும் + Add to User Dictionary பயனர் அகராதியில் சேர்க்கவும் + Do not Ignore புறக்கணிக்க வேண்டாம் @@ -4122,30 +5236,37 @@ x (எண்) காட்டப்படும் அதிகபட்ச க ThemeDialog + A flexible look matching system colors ஒரு நெகிழ்வான தோற்றம் பொருந்தக்கூடிய அமைப்பு நிறங்கள் + Dark Theme இருண்ட கருப்பொருள் + Pick a theme for Gittyup Gittyup க்கான கருப்பொருள் ஒன்றைத் தேர்ந்தெடுக்கவும் + Default Theme இயல்புநிலை கருப்பொருள் + A consistent bright theme ஒரு நிலையான பிரகாசமான கருப்பொருள் + A consistent look optimal for reducing eye strain கண் அழுத்தத்தை குறைக்க ஒரு சீரான தோற்றம் உகந்தது + System Theme கணினி கருப்பொருள் @@ -4153,86 +5274,108 @@ x (எண்) காட்டப்படும் அதிகபட்ச க ToolBar + Show repository sidebar களஞ்சிய பக்கப்பட்டியைக் காட்டு + Previous முந்தைய + Next அடுத்தது + Fetch எடுக்கவும் + Pull இழு + Merge ஒன்றிணைக்கவும் + Rebase ஒரு நரி + Push தள்ளு + Checkout வெளியேறு + Stash ச்டாச் + Pop Stash பாப் ச்டாச் + Open Terminal முனையத்தைத் திறக்கவும் + Open file manager கோப்பு மேலாளரைத் திறக்கவும் + Configure Settings அமைப்புகளை உள்ளமைக்கவும் + Repository settings களஞ்சிய அமைப்புகள் + Application settings பயன்பாட்டு அமைப்புகள் + + Show Log பதிவைக் காட்டு + Double Tree View இரட்டை மரக் காட்சி + Tree View மரக் காட்சி + Show Starred Commits நட்சத்திரமிட்ட உறுதிமொழிகளைக் காட்டு + Hide Log பதிவை மறை @@ -4240,34 +5383,42 @@ x (எண்) காட்டப்படும் அதிகபட்ச க ToolsPanel + Keep backup of merge files (.orig) ஒன்றிணைக்கும் கோப்புகளை (.orig) காப்புப் பிரதி எடுக்கவும் + External editor: வெளிப்புற ஆசிரியர்: + External diff: வெளிப்புற வேறுபாடு: + External merge: வெளிப்புற இணைப்பு: + Backup files: காப்புப் பிரதி கோப்புகள்: + Terminal emulator command: டெர்மினல் எமுலேட்டர் கட்டளை: + File manager command: கோப்பு மேலாளர் கட்டளை: + Configure கட்டமைக்கவும் @@ -4275,6 +5426,7 @@ x (எண்) காட்டப்படும் அதிகபட்ச க TreeModel + Submodule துணைத் தொகுதி @@ -4282,30 +5434,38 @@ x (எண்) காட்டப்படும் அதிகபட்ச க TreeView + Directory அடைவு + File கோப்பு + Remove or discard %1? % 1ஐ அகற்றவா அல்லது நிராகரிக்கவா? + Are you sure you want to remove or discard all changes in '%1'? '% 1' இல் உள்ள அனைத்து மாற்றங்களையும் நீக்க அல்லது நிராகரிக்க விரும்புகிறீர்களா? + This action cannot be undone. இந்தச் செயலைச் செயல்தவிர்க்க முடியாது. + + Discard நிராகரி + discard நிராகரிக்கவும் @@ -4313,14 +5473,17 @@ x (எண்) காட்டப்படும் அதிகபட்ச க TreeWidget + Search: தேடல்: + Regex வழக்கவெளி + Case Sensitive கேச் சென்சிட்டிவ் @@ -4328,10 +5491,12 @@ x (எண்) காட்டப்படும் அதிகபட்ச க UpToDateDialog + Already Up-to-date ஏற்கனவே புதுப்பித்த நிலையில் உள்ளது + %1 is already up-to-date. You have version %2. % 1 ஏற்கனவே புதுப்பித்த நிலையில் உள்ளது. உங்களிடம் பதிப்பு% 2 உள்ளது. @@ -4339,42 +5504,53 @@ x (எண்) காட்டப்படும் அதிகபட்ச க UpdateDialog + Update %1 % 1ஐப் புதுப்பிக்கவும் + + <h3>A new version of %1 is available!</h3><p>%1 %2 is now available - you have %3. The new version will be soon available in your package manager. Just update your system.</p><b>Release Notes:</b> <h3>%1 இன் புதிய பதிப்பு உள்ளது!</h3><p>%1 %2 இப்போது கிடைக்கிறது - உங்களிடம் %3 உள்ளது. புதிய பதிப்பு விரைவில் உங்கள் தொகுப்பு நிர்வாகியில் கிடைக்கும். உங்கள் கணினியைப் புதுப்பிக்கவும்.</p><b>வெளியீட்டுக் குறிப்புகள்:</b> + <h3>A new version of %1 is available!</h3><p>%1 %2 is now available - you have %3. Would you like to download it now?</p><b>Release Notes:</b> <h3>%1 இன் புதிய பதிப்பு உள்ளது!</h3><p>%1 %2 இப்போது கிடைக்கிறது - உங்களிடம் %3 உள்ளது. அதை இப்போது பதிவிறக்க விரும்புகிறீர்களா?</p><b>வெளியீட்டுக் குறிப்புகள்:</b> + <h3>A new version of %1 is available!</h3><p>%1 %2 is now available - you have %3.</p><p>If you downloaded the flatpak package over a package manager or from flathub.org <br/>you don't have to install manually a new version. It will be available within the next <br/>days during your system update: <code>flatpak update</code></p><b>Release Notes:</b> <h3>%1 இன் புதிய பதிப்பு கிடைக்கிறது!</h3><p>%1 %2 இப்போது கிடைக்கிறது - உங்களிடம் %3 உள்ளது.</p><p>நீங்கள் பிளாட்பேக் தொகுப்பை தொகுப்பு மேலாளர் மூலமாகவோ அல்லது flathub.org இலிருந்து பதிவிறக்கம் செய்திருந்தால் <br/>நீங்கள் புதிய பதிப்பை கைமுறையாக நிறுவ வேண்டியதில்லை. இது அடுத்த <br/>நாட்களில் உங்கள் சிச்டம் அப்டேட்டின் போது கிடைக்கும்: <code>flatpak update</code></p><b>வெளியீட்டு குறிப்புகள்:</b> + Automatically download and install updates புதுப்பிப்புகளை தானாகவே பதிவிறக்கி நிறுவவும் + Install Update புதுப்பிப்பை நிறுவவும் + Remind Me Later எனக்கு பிறகு நினைவூட்டு + Skip This Version இந்த பதிப்பைத் தவிர்க்கவும் + Ok சரி + Donate நன்கொடை @@ -4382,18 +5558,22 @@ x (எண்) காட்டப்படும் அதிகபட்ச க UpdatePanel + Check for updates automatically புதுப்பிப்புகளைத் தானாகவே சரிபார்க்கவும் + Automatically download and install updates புதுப்பிப்புகளை தானாகவே பதிவிறக்கி நிறுவவும் + Check Now இப்போது சரிபார்க்க + Software Update: மென்பொருள் புதுப்பிப்பு: @@ -4401,14 +5581,17 @@ x (எண்) காட்டப்படும் அதிகபட்ச க UpdateSubmodulesDialog + Recursive சுழல்நிலை + Init Init + Update புதுப்பிப்பு @@ -4416,54 +5599,54 @@ x (எண்) காட்டப்படும் அதிகபட்ச க Updater + Installer failed to start நிறுவி தொடங்குவதில் தோல்வி - The disk image failed to mount successfully - வட்டு படத்தை வெற்றிகரமாக ஏற்ற முடியவில்லை - - - The existing bundle could not be moved to the trash - ஏற்கனவே உள்ள மூட்டை குப்பைக்கு நகர்த்த முடியவில்லை - - - The new bundle could not be copied into place - புதிய தொகுப்பை நகலெடுக்க முடியவில்லை - - + + Helper application failed to start உதவி பயன்பாடு தொடங்குவதில் தோல்வி + Update Failed புதுப்பித்தல் தோல்வியடைந்தது + Unable to check for updates புதுப்பிப்புகளைச் சரிபார்க்க முடியவில்லை + Unable to download update புதுப்பிப்பைப் பதிவிறக்க முடியவில்லை + Unable to open temporary file தற்காலிக கோப்பை திறக்க முடியவில்லை + Unable to install update புதுப்பிப்பை நிறுவ முடியவில்லை + Some windows failed to close. You can download the binary manually from %1 சில சன்னல்களை மூட முடியவில்லை. நீங்கள் % 1 இலிருந்து பைனரியை கைமுறையாக பதிவிறக்கம் செய்யலாம் + Unknown install error அறியப்படாத நிறுவல் பிழை + + Installer script failed: %1 நிறுவி ச்கிரிப்ட் தோல்வியடைந்தது: % 1 @@ -4471,90 +5654,112 @@ x (எண்) காட்டப்படும் அதிகபட்ச க WindowPanel + Add New Theme புதிய கருப்பொருள் சேர்க்கவும் + Edit Current Theme தற்போதைய கருப்பொருள் திருத்தவும் + Create Theme கருப்பொருள் உருவாக்கவும் + Theme Name கருப்பொருள் பெயர் + Restart? மீண்டும் தொடங்கவா? + The application must be restarted for the theme change to take effect. கருப்பொருள் மாற்றம் நடைமுறைக்கு வர, பயன்பாடு மறுதொடக்கம் செய்யப்பட வேண்டும். + Do you want to restart now? இப்போது மீண்டும் தொடங்க வேண்டுமா? + Restart மறுதொடக்கம் + Later பின்னர் + Show full repository path முழு களஞ்சிய பாதையைக் காட்டு + Hide automatically தானாக மறை + Open submodules in tabs துணை தொகுதிகளை தாவல்களில் திறக்கவும் + Open all repositories in tabs அனைத்து களஞ்சியங்களையும் தாவல்களில் திறக்கவும் + Hide Menubar மெனுபாரை மறை + Show Avatars அவதாரங்களைக் காட்டு + Show Window Maximized when opened திறக்கும் போது பெரிதாக்கப்பட்ட சாளரத்தைக் காட்டு + Theme: தீம்: + Title: தலைப்பு: + Log: பதிவு: + Tabs: தாவல்கள்: + View: காண்க: + Prompt: உடனடி: @@ -4562,22 +5767,29 @@ x (எண்) காட்டப்படும் அதிகபட்ச க _FileWidget::Header + + Use Theirs: Delete அவற்றைப் பயன்படுத்தவும்: நீக்கு + + Use Ours: Delete எங்களுடையது: நீக்கு + both: %1 இரண்டும்:% 1 + ours: %1 எங்களுடையது:% 1 + theirs: %1 அவர்களுடையது:% 1 diff --git a/l10n/gittyup_zh_CN.ts b/l10n/gittyup_zh_CN.ts index d978f4a24..51bd93c15 100644 --- a/l10n/gittyup_zh_CN.ts +++ b/l10n/gittyup_zh_CN.ts @@ -28,39 +28,31 @@ Privacy 隐私 - - Usage reporting has been disabled. Restart the application for changes to take effect. - 使用情况报告已被禁用。请重启应用程序以使更改生效。 - - - Usage Reporting Disabled - 使用情况报告已禁用 - Account - + Connection failed 连接失败 - + <b>Note:</b> Basic authentication is not supported if you have two-factor authentication enabled. Use a <a href='https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/'>personal access token</a> in the password field instead. <b>注意：</b> 如果启用了双重身份验证，则不支持基本身份验证。在密码字段中使用<a href='https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/'>个人访问令牌</a>代替。 - + <b>Note:</b> Only Basic authentication is currently supported <b>Note:</b> 目前仅支持基本认证 - + <b>Note:</b> Basic authentication is not supported. Use a <a href='https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html'>personal access token</a> in the password field instead. <b>注意：</b> 不支持基本身份验证。在密码字段中使用<a href='https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html'>个人访问令牌</a>代替。 - + Authentication failed 验证失败 @@ -158,162 +150,162 @@ AdvancedSearchWidget - + Author: 作者： - + Author name 作者姓名 - + Email: 电子邮件： - + Author email 作者电子邮件 - + Message: 信息： - + Commit message 提交讯息 - + Date: 日期： - + Specific commit date 具体提交日期 - + After: 之后： - + Commits after date 在此日期之后提交 - + Before: 之前： - + Commits before date 在此日期之前提交 - + File: 文件： - + File name 文件名称 - + Path: 路径： - + File path 文件路径 - + Scope: 范围： - + Hunk header text 补丁片段的头信息 - + Context: 内容： - + Diff context (white) 差异内容（白色） - + Addition: 追加： - + Diff addition (green) 差异追加（绿色） - + Deletion: 删除： - + Diff deletion (red) 差异删除（红色） - + Comment: 注释： - + Source code comment 源代码注释 - + String: 字符串： - + Source code string literal 源代码字符串文字 - + Identifier: 识别： - + Source code identifier 源代码标识符 - + Search 搜索 - + Return 返回 @@ -349,12 +341,12 @@ Application - + SSL Errors SSL错误 - + Failed to set up SSL session. Do you want to ignore these errors? 无法设置SSL会话。您要忽略这些错误吗？ @@ -362,59 +354,45 @@ AuthorCommitterDate - + Author/Committer: 作者/提交者： - + Author: 作者： - + Committer: 提交者： - - Beanstalk - - Connection failed - 连接失败 - - - - Bitbucket - - Connection failed - 连接失败 - - BlameEditor - + Untitled 无标题 - + Not Tracked 未追踪 - + HEAD 头 - + Working Copy 工作副本 - + Save File 保存文件 @@ -422,12 +400,12 @@ BlameMargin - + Not Committed 未提交 - + Invalid Signature 签名无效 @@ -546,27 +524,27 @@ CommitDetail - + Copy 复制 - + Range: 范围： - + Id: ID： - + initial commit 初次提交 - + Parents: 父级： @@ -624,181 +602,165 @@ CommitEditor - + T 提示 - + <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 中止变基操作（rebasing） - + Continue rebasing 继续变基操作（rebasing） - + Abort Merge 中止合并（Merge） - + %1 %1 - + %1 and %2 %1 和 %2 - + %1, %2, and %3 %1, %2, 和 %3 - + Merge 合并 - + Revert 还原 - + Cherry-pick 拣选操作 - + Rebase 变基（Rebase） - + Abort %1 中止%1 - + Commit Rebase 提交变基（Rebase） - Update %1 - 更新%1 - - - Update %1 and %2 - 更新%1和%2 - - - Update %1, %2, and %3 - 更新%1，%2和%3 - - - Update %1, %2, and %3 more files... - 更新%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,131 +768,123 @@ CommitList - + Remove Untracked Files 删除未跟踪的文件 - + Apply 应用 - + Pop 填充（Pop） - + Drop 丢弃（Drop） - + Unstar 取消星标 - + Star 星标 - + Add Tag... 添加标签... - + New Branch... 新建分支... - Delete Tag %1 - 删除标签%1 - - - Delete Branch %1 - 删除分支%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 +892,12 @@ CommitModel - + Uncommitted changes 未提交的更改 - + Checking for uncommitted changes 检查未提交的更改 @@ -951,7 +905,7 @@ CommitToolBar - + Show All Branches 显示所有分支 @@ -961,42 +915,47 @@ 显示选定的分支 - + + Show Selected Branch, First Parent Only + + + + Sort by Date 按日期排序 - + Sort Topologically 拓扑排序 - + Show Graph 显示图 - + Show Clean Status 显示清理状态 - + Compact Mode 紧凑模式 - + Show Author 显示作者 - + Show Date 显示日期 - + Show Id 显示Id号 @@ -1004,56 +963,89 @@ ConfigDialog - + Esc 退出 - + General 一般 - + Diff 比较 - + Remotes 远程 - + Branches 分支 - + Submodules 子模块 - + Search 搜索 - + Plugins 插件 - + LFS LFS - + Edit Config File... 编辑配置文件... + + CredentialHelper + + + Caching the credentials in the RAM. Required to enter credentials on every startup + + + + + Storing the credentials unencrypted on disk, protected only by filesystem permissions <a href="https://git-scm.com/docs/git-credential-store">git-credential-store</a> + + + + + MacOS credential manager + + + + + Windows credential manager + + + + + Secret Service D-Bus client library + + + + + Prefer <a href="https://wiki.gnome.org/Projects/Libsecret">libsecret</a> over gnome-keyring if available + + + DateSelectionGroupWidget @@ -1104,10 +1096,6 @@ Add %1 account 添加%1个帐户 - - View getting started videos - 查看入门视频 - Contact us for support @@ -1147,17 +1135,17 @@ 推送 - + Push canceled. 推送已取消。 - + Unable to push to %1 - %2 无法推送到%1-%2 - + The branch is not fully merged. Deleting it may cause some commits to be lost. 分支未完全合并。删除它可能会导致某些提交丢失。 @@ -1195,22 +1183,22 @@ 推送 - + Push canceled. 推送已取消。 - + Unable to push to %1 - %2 无法推送到%1-%2 - + Delete Tag 删除标签 - + delete tag 删除标签 @@ -1218,25 +1206,25 @@ DetailView - - + + Author: 作者： - + reset 重置 - + Here you can set the author used for committing These settings will not be saved permanently 在这里，您可以设置用于提交的作者 这些设置不会永久保存 - + Email: 电子邮件： @@ -1244,57 +1232,57 @@ These settings will not be saved permanently DiffPanel - + lines 线 - + System Locale 系统区域设置 - + Wrap lines 自动换行 - + Context lines: 内容行： - + Wrap lines: 自动换行： - + Character Encoding: 字符编码： - + Ignore Whitespace (-w) 忽略空格（-w） - + Added files 添加的文件 - + Deleted files 删除的文件 - + Whitespace: 空格： - + Auto Collapse: 自动收合： @@ -1302,10 +1290,15 @@ These settings will not be saved permanently DiffTool - + External Diff 外部比较 + + + External Diff to Working Copy + + DiffTreeModel @@ -1318,12 +1311,12 @@ These settings will not be saved permanently DiffView - + Add new file 追加新文件 - + Or drag files here to copy into the repository 或将文件拖到此处以复制到仓库中 @@ -1403,57 +1396,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: 追踪边际： @@ -1525,409 +1518,345 @@ These settings will not be saved permanently 所选文件没有%1版本。 - + + Bash Not Found 找不到Bash - + + Bash was not found on your PATH. 在您的PATH上找不到Bash。 - + + Bash is required to execute external tools. Bash是执行外部工具所必需的。 - + Stage 暂存 - + Unstage 取消暂存 - + Discard Changes 放弃更改 - + Discard Changes? 您确定要放弃更改吗？ - + Are you sure you want to discard changes in the selected files? 您确定要放弃所选文件中的更改吗？ - + This action cannot be undone. 此操作无法撤消。 - + (Submodule) （子模块） - + %1 files %1个文件 - + Discard 丢弃 - + discard 丢弃 - + Remove Untracked Files 删除未跟踪的文件 - + Ignore 忽略 - + Checkout 检出 - + Unlock 解除锁定 - + Lock 锁定 - + Copy File Name 复制文件名 - + Filter History 筛选记录 - + Navigate to 导航至 - + Next Revision 下一个修订 - + next 下一个 - + Previous Revision 上一个修订 - + previous 上一个 - + Unset Executable 未设置可执行文件 - + Set Executable 设置可执行 - + Save Selected Version as ... 将所选版本另存为... - + Select new file directory 选择新文件目录 - + Saving files 正在保存文件 - + Saving files of selected version to disk 将所选版本的文件保存到磁盘上 - + Save file 保存文件 - + Invalid Blob 无效的二进制对象 - + Open this version 打开此版本 - + Opening file 正在打开文件 - + Open 打开 - + open file 打开文件 - + Blob is invalid. 二进制对象是无效的。 - - + + Unable to checkout bare repositories 无法检出裸仓库 - + Unable to open files from bare repository 无法从裸存储库中打开文件 - + The file is already in the current working directory 文件已在当前工作目录中 - + edit 编辑 - + diff 比较 - + merge 合并 - + External Tool Not Found 找不到外部工具 - + Failed to execute external %1 tool. 无法执行外部%1工具。 - - FileList - - Sort By - 排序方式 - - - Select - 选择 - - - Name - 名称 - - - Status - 状态 - - - Ignore Whitespace (-w) - 忽略空格（-w） - - - Added - 添加的 - - - Deleted - 删除的 - - - Modified - 修改的 - - - Renamed - 更名的 - - - Copied - 复制的 - - - Ignored - 忽略的 - - - Untracked - 未追踪的 - - - Unreadable - 不可读 - - - Conflicted - 矛盾的 - - - Unmodified - 未修改的 - - - Type Change - 类型变更 - - FileWidget - + LFS LFS - - + + Unlock 解除锁定 - - + + Lock 锁定 - - + + Show Object 显示对象 - + Edit File 编辑文件 - + Discard File 丢弃文件 - + Directory 目录 - + File 文件 - + Remove %1? 删除%1？ - + Discard Changes? 您确定要放弃更改吗？ - + Are you sure you want to remove '%1'? 您确定要删除'%1'吗？ - + Are you sure you want to discard all changes in '%1'? 您确定要放弃'%1'中的所有更改吗？ - + This action cannot be undone. 此操作无法撤消。 - + Remove %1 删除%1 - + Discard Changes 放弃更改 - + Discard 丢弃 - + discard 丢弃 - - + + Collapse File 收合文件 - - + + Expand File 展开文件 - + Show Pointer 显示指针 @@ -1968,128 +1897,122 @@ These settings will not be saved permanently GeneralPanel - - + + Fetch every 获取每个 - - + + minutes 分 - - + + Push after each commit 每次提交后推送 - Update submodules after pull - 拉取后更新子模块 - - - - + + Prune when fetching 获取时清除 - + No translation 没有翻译 - + Store credentials in secure storage 将凭证存储在安全存储中 - Allow collection of usage data - 允许收集使用情况数据 - - - - + + Update submodules after pull and clone 在拉取和克隆后更新子模块 - + <a href='view'>View privacy policy</a> <a href='view'>查看隐私政策</a> - - + + User name: 用户名： - - + + User email: 用户电子邮件： - - + + Automatic actions: 自动动作： - - + + Language: 语言： - + Credentials: 证书： - + Credential store type: 凭据存储类型： - + + Available Credential stores: + + + + Only allow a single running instance 仅允许单个正在运行的实例 - + Single instance: 单个实例： - Usage reporting: - 使用情况报告： + + No credential store set + - - - GitHub - Connection failed - 连接失败 + + No credential store is set. Go to the application settings to set the desired credential store + - Failed to authenticate with GitHub! - 无法通过GitHub进行身份验证！ + + + - Successfully authenticated with GitHub! - 已通过GitHub成功认证！ + + Available Credential stores + GitLab - - Connection failed - 连接失败 - Authentication failed @@ -2099,7 +2022,7 @@ These settings will not be saved permanently Header - + Filter %1 筛选%1 @@ -2128,26 +2051,26 @@ These settings will not be saved permanently HunkWidget + - Save 保存 + - Undo 撤消 + - Use Ours 使用我们的 + - Use Theirs 用他们的 @@ -2176,19 +2099,11 @@ These settings will not be saved permanently Discard selected lines 放弃所选行 - - Discard Hunk? - 您确定要放弃补丁片段吗？ - Are you sure you want to remove '%1'? 您确定要删除'%1'吗？ - - Are you sure you want to discard the hunk starting at line %1 in '%2'? - 您确定要舍弃'%2'中从行%1开始的块吗？ - This action cannot be undone. @@ -2279,12 +2194,12 @@ These settings will not be saved permanently LfsPanel - + Initialize LFS 初始化LFS - + Specify a glob pattern for tracking large files. Generally, large files are greater than 500kB, change frequently, @@ -2309,92 +2224,92 @@ Examples - + Pattern: 模式： - + Track 跟踪 - + days 天 - + Fetch LFS objects from all references for the past 从过去的所有引用中获取LFS对象 - + reference days or 参照天数或 - + commit days 提交天数 - + View Environment 查看环境 - + git-lfs env (read only) git-lfs env（只读） - + Deinitialize LFS 取消初始化LFS - + Deinitialize LFS? 您确定要取消初始化LFS吗？ - + Are you sure you want uninstall LFS from this repository? 您确定要从此仓库卸载LFS吗？ - + Deinitialize 取消初始化 - + Server URL: 服务器地址URL： - + Prune Offset: 清除偏移： - + Fetch Recent: 获取最近： - + Advanced: 高级： - + Included patterns: 包含的规则： - + Excluded patterns: 忽略的规则： @@ -2478,7 +2393,7 @@ Examples LogView - + Copy 复制 @@ -2486,59 +2401,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 变基 @@ -2560,28 +2475,16 @@ Examples New Window 新建窗口 - - Ctrl+Meta+N - Ctrl+Meta+N - Clone Repository... 克隆仓库... - - Ctrl+Shift+N - Ctrl+Shift+N - Initialize New Repository... 初始化新仓库... - - Ctrl+Alt+N - Ctrl+Alt+N - Open Repository... @@ -2672,10 +2575,6 @@ Examples Show Double Tree View 显示双树视图 - - Ctrl+E - Ctrl+E - View @@ -2728,37 +2627,21 @@ Examples Stage All 暂存全部 - - Ctrl++ - Ctrl++ - Unstage All 取消暂存全部 - - Ctrl+- - Ctrl+- - Commit 提交 - - Ctrl+Shift+C - Ctrl+Shift+C - Amend Commit 修改提交 - - Ctrl+Shift+A - Ctrl+Shift+A - Git LFS @@ -2789,64 +2672,36 @@ Examples Fetch 获取 - - Ctrl+Shift+Alt+F - Ctrl+Shift+Alt+F - Fetch All 获取全部 - - Ctrl+Shift+Alt+A - Ctrl+Shift+Alt+A - Fetch From... 获取自... - - Ctrl+Shift+F - Ctrl+Shift+F - Pull 拉取 - - Ctrl+Shift+Alt+L - Ctrl+Shift+Alt+L - Pull From... 拉取自... - - Ctrl+Shift+L - Ctrl+Shift+L - Push 推送 - - Ctrl+Shift+Alt+P - Ctrl+Shift+Alt+P - Push To... 推送至... - - Ctrl+Shift+P - Ctrl+Shift+P - Branch @@ -2872,46 +2727,26 @@ Examples Checkout Current 检出（Checkout）当前 - - Ctrl+Shift+Alt+H - Ctrl+Shift+Alt+H - Checkout... 检出（Checkout）... - - Ctrl+Shift+H - Ctrl+Shift+H - Merge... 合并（Merge）... - - Ctrl+Shift+M - Ctrl+Shift+M - Rebase... 变基（Rebase）... - - Ctrl+Shift+R - Ctrl+Shift+R - Squash... 聚合（Squash）... - - Ctrl+Shift+Q - Ctrl+Shift+Q - Abort Merge @@ -2932,19 +2767,11 @@ Examples Update All 更新全部 - - Ctrl+Shift+Alt+U - Ctrl+Shift+Alt+U - Update... 更新... - - Ctrl+Shift+U - Ctrl+Shift+U - Open @@ -2965,19 +2792,11 @@ Examples Stash... 备份未提交修改到贮藏区 - - Ctrl+Shift+T - Ctrl+Shift+T - Pop Stash 应用备份并从贮藏区删除 - - Ctrl+Shift+Alt+T - Ctrl+Shift+Alt+T - History @@ -3013,10 +2832,6 @@ Examples Show Repository Chooser... 显示仓库选择器... - - Ctrl+Shift+O - Ctrl+Shift+O - Tools @@ -3097,10 +2912,6 @@ Examples Hide Log 隐藏日志 - - Show Diff View - 显示差异视图 - Merge @@ -3199,12 +3010,12 @@ Examples MiscPanel - + Path to SSH config file: SSH配置文件的路径： - + Path to default / fallback SSH key file: 默认/后备SSH密钥文件的路径： @@ -3317,7 +3128,7 @@ Examples PullRequestButton - + Create Pull Request 新建拉取请求 @@ -3403,7 +3214,7 @@ Examples 工作区文件 - + Your global GIT configuration is invalid, Gittyup won't run properly until this is fixed 你的全局Git配置无效，修复此问题前Gittyup将无法正常运行 @@ -3466,17 +3277,17 @@ Would you like to fix the merge conflict and continue? ReferenceModel - + Branches 分支 - + Remotes 远程 - + Tags 标签 @@ -3484,57 +3295,57 @@ Would you like to fix the merge conflict and continue? ReferenceView - + Branch 分支 - + Remote 远程 - + Tag 标签 - + Checkout 检出 - + Rename 重命名 - + Delete 删除 - + Push Tag to %1 将标签推送到%1 - + New Local Branch 新建本地分支 - + Merge... 合并... - + Rebase... 变基... - + Squash... 聚合（Squash）... @@ -3542,7 +3353,7 @@ Would you like to fix the merge conflict and continue? RefreshButton - + Refresh 刷新 @@ -3550,7 +3361,7 @@ Would you like to fix the merge conflict and continue? RemoteButton - + 999+ 999+ @@ -3558,59 +3369,59 @@ Would you like to fix the merge conflict and continue? RemoteCallbacks - + remote: %1 远程：%1 - + failed to execute pre-push hook: bash not found 无法执行pre-push钩子：未找到bash - + failed to execute pre-push hook: %1 无法执行pre-push钩子：%1 - + HTTPS Credentials HTTPS凭证 - + SSH Passphrase SSH密码 - + Username: 用户名： - + Password: 密码： - + Passphrase: 密码短语： - - + + authentication canceled 身份验证已取消 - + From %1 从%1 - - + + To %1 至%1 @@ -3762,17 +3573,17 @@ Would you like to fix the merge conflict and continue? RemotesPanel - + Delete Remote? 您确定要删除远程吗？ - + Are you sure you want to delete '%1'? 您确定要删除'%1'吗？ - + Delete 删除 @@ -3846,10 +3657,6 @@ Would you like to fix the merge conflict and continue? Search 搜索 - - The indexer worker process crashed. If this problem persists please contact us at support@gitahead.com. - 索引器工作进程崩溃。如果此问题仍然存在，请通过support@gitahead.com与我们联系。 - Indexer Crashed @@ -4088,8 +3895,8 @@ was added to %1 - - + + <i>no remote</i> <i>没有远程</i> @@ -4100,7 +3907,7 @@ was added to %1 - + Fetch canceled. 获取已取消。 @@ -4116,212 +3923,213 @@ was added to %1 - - + + 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 应用 - There was a merge conflict. The rebase has been aborted - 有合并冲突。 变基已中止 - - - + %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. @@ -4330,412 +4138,388 @@ This reverts commit %2. 这将还原提交%2。 - + <i>detached HEAD</i> <i>游离的头</i> - + %1 on %2 %2上的%1 - + Cherry-pick 拣选操作 - Force Push? - 强制推送？ - - - + 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>。 - You may want to integrate remote commits first by <a href='action:pull'>pulling</a>. Then <a href='action:push'>push</a> again. - 您可能想先通过<a href='action:pull'> pulling </a>集成远程分支上的提交。然后再次<a href='action:push'> 推送 </a>。 - - - If you really want the remote to lose commits, you may be able to <a href='action:push?force=true'>force push</a>. - 如果您确实希望远程分支丢失提交，则可以<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 - + %1 to %2 update ref %1至%2 - - - - - - + + + + + + Reset 重置 - Amend? - 修改？ - - - Reset? - 重置？ - - - Are you sure you want to amend '%1'? - 您确定要修改'%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 更新子模块 @@ -4745,112 +4529,112 @@ This reverts commit %2. 索引器工作进程已崩溃。如果此问题持续出现，请通过<TODO: replace.support@gitahead.com>联系我们。 - + Please resolve conflicts before continue 请在继续之前解决冲突 - + Conflict 冲突 - + Rebase finished 变基已完成 - + Force Push to %1? 是否强制推送到%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. 你可以先点击<a href='action:pull'>拉取</a>合并远程提交，然后再次点击 <a href='action:push?to=%1'>推送</a>。 - + 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>. 如果你真的想让远程仓库丢失提交记录，也许可以<a href='action:push?to=%1&force=true'>强制推送</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以便将仓库恢复到之前的状态。 @@ -4858,12 +4642,12 @@ This reverts commit %2. Repository - + Unknown error 未知错误 - + git-lfs not found 找不到git-lfs @@ -4879,32 +4663,32 @@ This reverts commit %2. SearchPanel - + Enable indexing 启用索引 - + terms 条款 - + lines 行 - + Limit commits to: 限制提交到： - + Diff context: 差异内容： - + Remove Index 删除索引 @@ -4912,32 +4696,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 提示暂存大文件 @@ -4945,67 +4729,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 终端 @@ -5036,89 +4820,89 @@ This reverts commit %2. SideBar - + Close 关闭 - - - + + + Remove 删除 - + Authorize 授权 - + Clone Repository 克隆仓库 - + Open Existing Repository 打开现有仓库 - + Open Repository 打开仓库 - + Initialize New Repository 初始化新仓库 - + Add %1 Account 添加%1帐户 - + <p>Are you sure you want to remove the remote repository association for %1?</p><p>The local clone itself will not be affected.</p> <p>确定要删除%1的远程仓库关联吗？</p><p>本地克隆本身不会受到影响。</p> - + Remove Repository Association? 删除仓库关联？ - + Clear All Recent 清除所有最近的 - + Show Full Path 显示完整路径 - + Filter Non-existent Paths 过滤不存在​​的路径 - + Refresh Remote Accounts 刷新远程帐户 - + Show Full Name 显示全名 - + <p>Are you sure you want to remove the %1 account for '%2'?</p><p>Only the account association will be removed. Remote configurations and local clones will not be affected.</p> <p>确定要删除“%2”的%1个帐户吗？</p><p>仅会删除帐户关联。远程配置和本地克隆将不受影响。</p> - + Remove Account? 删除帐户？ @@ -5265,12 +5049,12 @@ This reverts commit %2. 取消初始化子模块？ - + The submodule working directory contains uncommitted changes that will be lost if you continue. 子模块工作目录包含未提交的更改，如果您继续，这些更改将丢失。 - + Deinitialize 取消初始化 @@ -5393,23 +5177,23 @@ x (number) determines the number of maximum files shown TerminalPanel - - + + Install 安装 - + Name: 名称: - + Location: 位置： - + Uninstall 卸载 @@ -5417,42 +5201,38 @@ x (number) determines the number of maximum files shown TextEdit - + Replace... 替换... - + Replace All... 替换全部... - + Ignore 忽略 - + Ignore All 忽略全部 - + Add to User Dictionary 添加到用户字典 - + Do not Ignore 不忽略 ThemeDialog - - Native Theme - 原生主题 - A flexible look matching system colors @@ -5492,112 +5272,108 @@ x (number) determines the number of maximum files shown ToolBar - + Show repository sidebar 显示仓库侧栏 - + Previous 退回 - + Next 前进 - + Fetch 获取 - + Pull 拉取 - + Merge 合并 - + Rebase 变基 - + Push 推送 - + Checkout 检出 - + Stash 备份未提交修改到贮藏区 - + Pop Stash 应用备份并从贮藏区删除 - + Open Terminal 打开终端 - + Open file manager 打开文件管理器 - + Configure Settings 配置设定 - + Repository settings 存储库设置 - + Application settings 应用程序设置 - - + + Show Log 显示日志 - + Double Tree View 双树状视图 - Diff View - 差异视图 - - - + Tree View 树状视图 - + Show Starred Commits 显示加注星标的提交 - + Hide Log 隐藏日志 @@ -5605,42 +5381,42 @@ x (number) determines the number of maximum files shown ToolsPanel - + Keep backup of merge files (.orig) 保留合并文件（.orig）的备份 - + External editor: 外部编辑器： - + External diff: 外部差异比较： - + External merge: 外部合并： - + Backup files: 备份文件： - + Terminal emulator command: 终端模拟器命令： - + File manager command: 文件管理器命令： - + Configure 配置 @@ -5780,22 +5556,22 @@ x (number) determines the number of maximum files shown UpdatePanel - + Check for updates automatically 自动检查更新 - + Automatically download and install updates 自动下载并安装更新 - + Check Now 现在检查 - + Software Update: 软件更新： @@ -5826,24 +5602,8 @@ x (number) determines the number of maximum files shown 安装程序无法启动 - - The disk image failed to mount successfully - 磁盘映像安装失败 - - - - The existing bundle could not be moved to the trash - 现有的包无法移至垃圾箱 - - - - The new bundle could not be copied into place - 新的包无法复制到位 - - - - - + + Helper application failed to start 帮助应用程序无法启动 @@ -5858,37 +5618,33 @@ x (number) determines the number of maximum files shown 无法检查更新 - + Unable to download update 无法下载更新 - + Unable to open temporary file 无法打开临时文件 - + Unable to install update 无法安装更新 - + Some windows failed to close. You can download the binary manually from %1 一些窗口无法关闭。您可以从%1手动下载二进制文件 - Some windows failed to close - 一些窗口无法关闭 - - - + Unknown install error 未知的安装错误 - - + + Installer script failed: %1 安装脚本失败：%1 @@ -5896,112 +5652,112 @@ x (number) determines the number of maximum files shown WindowPanel - + Add New Theme 添加新主题 - + Edit Current Theme 编辑当前主题 - + Create Theme 创建主题 - + Theme Name 主题名称 - + Restart? 重启？ - + The application must be restarted for the theme change to take effect. 必须重启应用程序，主题更改才能生效。 - + Do you want to restart now? 您要立即重启吗？ - + Restart 重启 - + Later 推后 - + Show full repository path 显示完整的仓库路径 - + Hide automatically 自动隐藏 - + Open submodules in tabs 在标签页中打开子模块 - + Open all repositories in tabs 在标签页中打开所有仓库 - + Hide Menubar 隐藏菜单栏 - + Show Avatars 显示头像 - + Show Window Maximized when opened 打开时最大化显示窗口 - + Theme: 主题： - + Title: 标题： - + Log: 日志： - + Tabs: 标签页： - + View: 查看： - + Prompt: 提示： @@ -6009,29 +5765,29 @@ x (number) determines the number of maximum files shown _FileWidget::Header - - + + Use Theirs: Delete 以他们的删除操作为准 - - + + Use Ours: Delete 以我们的删除操作为准 - + both: %1 两者：%1 - + ours: %1 我们的：%1 - + theirs: %1 他们的：%1